May 2018 - tor-commits - lists.torproject.org

[orbot/master] update tor vpn values to 192.168.200 base
by n8fr8＠torproject.org 12 May '18

12 May '18

commit 89906a28f55edd891daad4f92920ff28b3683c90 Author: n8fr8 <nathan(a)freitas.net> Date: Sat May 12 00:45:43 2018 -0400 update tor vpn values to 192.168.200 base some people might have conflicts with 10.10.10 base VPN --- .../main/java/org/torproject/android/service/vpn/OrbotVpnManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java b/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java index e19b8847..e5419f3c 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java +++ b/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java @@ -297,8 +297,8 @@ public class OrbotVpnManager implements Handler.Callback { final String vpnName = "OrbotVPN"; final String localhost = "127.0.0.1"; - final String virtualGateway = "10.10.10.1"; - final String virtualIP = "10.10.10.2"; + final String virtualGateway = "192.168.200.1"; + final String virtualIP = "192.168.200.2"; final String virtualNetMask = "255.255.255.0"; final String dummyDNS = "1.1.1.1"; //this is intercepted by the tun2socks library, but we must put in a valid DNS to start final String defaultRoute = "0.0.0.0";

1 0

[orbot/master] fix country selector spinner bug with phantom selections
by n8fr8＠torproject.org 12 May '18

12 May '18

commit f702a0e462a79774405ac8bee55cdcf82d32772d Author: n8fr8 <nathan(a)freitas.net> Date: Sat May 12 00:39:16 2018 -0400 fix country selector spinner bug with phantom selections --- .../main/java/org/torproject/android/OrbotMainActivity.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index e3fd1a40..4e50dd53 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -367,8 +367,6 @@ public class OrbotMainActivity extends AppCompatActivity } - boolean firstTimeCountrySelect = true; - private void setCountrySpinner () { String currentExit = Prefs.getExitNodes(); @@ -403,14 +401,17 @@ public class OrbotMainActivity extends AppCompatActivity spnCountries.setSelection(selIdx,true); spnCountries.setOnItemSelectedListener(new OnItemSelectedListener() { + + int mOldPosition = spnCountries.getSelectedItemPosition(); + @Override public void onItemSelected(AdapterView<?> parentView, View selectedItemView, int position, long id) { // your code here - if (firstTimeCountrySelect) { - firstTimeCountrySelect = false; + if (mOldPosition == position) return; - } + + mOldPosition = position; //new position! String country = null;

1 0

[orbot/master] go back to one manifest will all perms
by n8fr8＠torproject.org 12 May '18

12 May '18

commit be1f73ee9ab67c5a574cf31b442a889266f2678e Author: n8fr8 <nathan(a)freitas.net> Date: Fri May 11 23:01:54 2018 -0400 go back to one manifest will all perms --- app/src/main/AndroidManifest.xml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 813afabf..71e64e1a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -7,10 +7,14 @@ <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> + <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> + <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> + <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />  + it's a good idea to explicitly include this declaration. --> <uses-feature android:name="android.hardware.touchscreen" android:required="false" /> + <application android:name=".OrbotApp" android:allowBackup="false" @@ -21,7 +25,8 @@ android:icon="@drawable/ic_launcher" android:label="@string/app_name" android:theme="@style/DefaultTheme" - tools:replace="android:allowBackup"> + tools:replace="android:allowBackup" + > <activity android:name=".OrbotMainActivity" android:excludeFromRecents="true" @@ -51,7 +56,7 @@ </intent-filter> </activity> -  +  <activity android:name=".service.util.DummyActivity" android:allowTaskReparenting="true" @@ -79,7 +84,7 @@ android:name=".service.TorService" android:enabled="true" android:permission="android.permission.BIND_VPN_SERVICE" - android:stopWithTask="false" /> + android:stopWithTask="false"></service> <service android:name=".service.vpn.TorVpnService" android:enabled="true" @@ -153,12 +158,6 @@ android:name=".ui.hiddenservices.providers.CookieContentProvider" android:authorities="org.torproject.android.ui.hiddenservices.providers.cookie" android:exported="false" /> - - <activity android:name=".ui.onboarding.OnboardingActivity" /> - <activity - android:name=".ui.onboarding.BridgeWizardActivity" - android:label="@string/title_activity_bridge_wizard" - android:theme="@style/DefaultTheme"/> </application> </manifest> \ No newline at end of file

1 0

[orbot/master] add NEWNYM feature back into main app screen
by n8fr8＠torproject.org 12 May '18

12 May '18

commit 8ebd53835ac9381e82e7aa6d4066d3cccad6fcbd Author: n8fr8 <nathan(a)freitas.net> Date: Fri May 11 23:02:22 2018 -0400 add NEWNYM feature back into main app screen --- .../org/torproject/android/OrbotMainActivity.java | 26 ++++++++++++++++++++-- app/src/main/res/menu/orbot_main.xml | 10 ++++++++- 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index c8a329c3..6fc5c456 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -25,6 +25,7 @@ import org.torproject.android.service.util.TorServiceUtils; import org.torproject.android.settings.LocaleHelper; import org.torproject.android.settings.SettingsPreferences; import org.torproject.android.ui.AppManagerActivity; +import org.torproject.android.ui.Rotate3dAnimation; import org.torproject.android.ui.onboarding.BridgeWizardActivity; import org.torproject.android.ui.onboarding.OnboardingActivity; import org.torproject.android.ui.hiddenservices.ClientCookiesActivity; @@ -75,6 +76,7 @@ import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.view.View.OnLongClickListener; +import android.view.animation.AccelerateInterpolator; import android.widget.AdapterView; import android.widget.AdapterView.OnItemSelectedListener; import android.widget.ArrayAdapter; @@ -432,8 +434,12 @@ public class OrbotMainActivity extends AppCompatActivity @Override public boolean onOptionsItemSelected(MenuItem item) { - - if (item.getItemId() == R.id.menu_settings) + + if (item.getItemId() == R.id.menu_newnym) + { + requestNewTorIdentity(); + } + else if (item.getItemId() == R.id.menu_settings) { Intent intent = new Intent(OrbotMainActivity.this, SettingsPreferences.class); startActivityForResult(intent, REQUEST_SETTINGS); @@ -1316,6 +1322,22 @@ public class OrbotMainActivity extends AppCompatActivity }**/ + private static final float ROTATE_FROM = 0.0f; + private static final float ROTATE_TO = 360.0f*4f;// 3.141592654f * 32.0f; + + private void requestNewTorIdentity () + { + sendIntentToService (TorServiceConstants.CMD_NEWNYM); + + Rotate3dAnimation rotation = new Rotate3dAnimation(ROTATE_FROM, ROTATE_TO, imgStatus.getWidth()/2f,imgStatus.getWidth()/2f,20f,false); + rotation.setFillAfter(true); + rotation.setInterpolator(new AccelerateInterpolator()); + rotation.setDuration((long) 2*1000); + rotation.setRepeatCount(0); + imgStatus.startAnimation(rotation); + lblStatus.setText(getString(R.string.newnym)); + } + private void addAppShortcuts () { LinearLayout llBoxShortcuts = (LinearLayout)findViewById(R.id.boxAppShortcuts); diff --git a/app/src/main/res/menu/orbot_main.xml b/app/src/main/res/menu/orbot_main.xml index deed1a61..f965514c 100644 --- a/app/src/main/res/menu/orbot_main.xml +++ b/app/src/main/res/menu/orbot_main.xml @@ -21,7 +21,15 @@ xmlns:yourapp="http://schemas.android.com/apk/res-auto" > - <item android:id="@+id/menu_settings" + + <item android:id="@+id/menu_newnym" + android:title="@string/newnym" + android:icon="@drawable/ic_refresh_white_24dp" + yourapp:showAsAction="always" + /> + + + <item android:id="@+id/menu_settings" android:title="@string/menu_settings" android:icon="@drawable/ic_action_settings" yourapp:showAsAction="never"

1 0

[orbot/master] make sure all the activities we need are included
by n8fr8＠torproject.org 12 May '18

12 May '18

commit be61431834dc94a5845b8d25739bf321e1e00e1a Author: n8fr8 <nathan(a)freitas.net> Date: Sat May 12 00:25:14 2018 -0400 make sure all the activities we need are included --- app/src/main/AndroidManifest.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 71e64e1a..56db8266 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -154,6 +154,9 @@ android:value=".OrbotMainActivity" /> </activity> + <activity android:name=".ui.onboarding.OnboardingActivity"/> + <activity android:name=".ui.onboarding.BridgeWizardActivity"/> + <provider android:name=".ui.hiddenservices.providers.CookieContentProvider" android:authorities="org.torproject.android.ui.hiddenservices.providers.cookie"

1 0

[orbot/master] add more releae build crunching compression
by n8fr8＠torproject.org 12 May '18

12 May '18

commit 265caa8d3739e31c14e769c1135016ad580e3b87 Author: n8fr8 <nathan(a)freitas.net> Date: Wed May 9 13:47:04 2018 -0400 add more releae build crunching compression --- app/build.gradle | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/build.gradle b/app/build.gradle index da6d9ff8..3c106337 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,10 +17,15 @@ android { buildTypes { release { minifyEnabled true + shrinkResources true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' } } + aaptOptions { + cruncherEnabled = false + } + flavorDimensions "free" productFlavors {

1 0

[orbot/master] ensure pluggable transports are updated and set to executable
by n8fr8＠torproject.org 12 May '18

12 May '18

commit 3bbf7a173849b06036be8dd63bb01655e7555055 Author: n8fr8 <nathan(a)freitas.net> Date: Sat May 12 00:32:27 2018 -0400 ensure pluggable transports are updated and set to executable --- .../service/util/OtherResourceInstaller.java | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/orbotservice/src/main/java/org/torproject/android/service/util/OtherResourceInstaller.java b/orbotservice/src/main/java/org/torproject/android/service/util/OtherResourceInstaller.java index 9584e9b0..672d6411 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/util/OtherResourceInstaller.java +++ b/orbotservice/src/main/java/org/torproject/android/service/util/OtherResourceInstaller.java @@ -65,27 +65,27 @@ public class OtherResourceInstaller implements TorServiceConstants { public boolean installResources () throws IOException, FileNotFoundException, TimeoutException { - InputStream is; File outFile; - String cpuPath = "armeabi"; - - if (Build.CPU_ABI.contains("x86")) - cpuPath = "x86"; - if (!installFolder.exists()) installFolder.mkdirs(); - // is = context.getAssets().open(cpuPath + '/' + OBFSCLIENT_ASSET_KEY + MP3_EXT); - is = new FileInputStream(new File(getNativeLibraryDir(context),OBFSCLIENT_ASSET_KEY + ".so")); + File libBinary = new File(getNativeLibraryDir(context),OBFSCLIENT_ASSET_KEY + ".so"); outFile = new File(installFolder, OBFSCLIENT_ASSET_KEY); - streamToFile(is,outFile, false, true); + + if ((!outFile.exists()) || (libBinary.lastModified() > outFile.lastModified())) { + streamToFile(new FileInputStream(libBinary), outFile, false, true); + } + setExecutable(outFile); -// is = context.getAssets().open(cpuPath + '/' + PDNSD_ASSET_KEY + MP3_EXT); - is = new FileInputStream(new File(getNativeLibraryDir(context),PDNSD_ASSET_KEY + ".so")); + libBinary = new File(getNativeLibraryDir(context),PDNSD_ASSET_KEY + ".so"); outFile = new File(installFolder, PDNSD_ASSET_KEY); - streamToFile(is,outFile, false, true); + + if ((!outFile.exists()) || (libBinary.lastModified() > outFile.lastModified())) { + streamToFile(new FileInputStream(libBinary), outFile, false, true); + } + setExecutable(outFile);

1 0

[orbot/master] handle phantom selection of country exit
by n8fr8＠torproject.org 12 May '18

12 May '18

commit af1d9337586e218c7791fc4e9a26fd64ab0891cd Author: n8fr8 <nathan(a)freitas.net> Date: Fri May 11 23:24:21 2018 -0400 handle phantom selection of country exit - also support custom exit override issue --- .../org/torproject/android/OrbotMainActivity.java | 118 +++++++++++++-------- 1 file changed, 71 insertions(+), 47 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index 6fc5c456..e3fd1a40 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -360,57 +360,79 @@ public class OrbotMainActivity extends AppCompatActivity }); - String currentExit = Prefs.getExitNodes(); - int selIdx = -1; - - ArrayList<String> cList = new ArrayList<String>(); - cList.add(0, getString(R.string.vpn_default_world)); - - for (int i = 0; i < TorServiceConstants.COUNTRY_CODES.length; i++) - { - Locale locale = new Locale("",TorServiceConstants.COUNTRY_CODES[i]); - cList.add(locale.getDisplayCountry()); - - if (currentExit.contains(TorServiceConstants.COUNTRY_CODES[i])) - selIdx = i+1; - } - - spnCountries = (Spinner)findViewById(R.id.spinnerCountry); - ArrayAdapter<String> adapter = new ArrayAdapter<String>(this,android.R.layout.simple_spinner_item, cList); - spnCountries.setAdapter(adapter); - - if (selIdx != -1) - spnCountries.setSelection(selIdx); - - spnCountries.setOnItemSelectedListener(new OnItemSelectedListener() { - @Override - public void onItemSelected(AdapterView<?> parentView, View selectedItemView, int position, long id) { - // your code here - - String country = null; - - if (position == 0) - country = ""; - else - country = '{' + TorServiceConstants.COUNTRY_CODES[position-1] + '}'; - - Intent torService = new Intent(OrbotMainActivity.this, TorService.class); - torService.setAction(TorServiceConstants.CMD_SET_EXIT); - torService.putExtra("exit",country); - startService(torService); - - } - - @Override - public void onNothingSelected(AdapterView<?> parentView) { - // your code here - } + spnCountries = (Spinner)findViewById(R.id.spinnerCountry); + setCountrySpinner(); - }); + mPulsator = (PulsatorLayout) findViewById(R.id.pulsator); + } - mPulsator = (PulsatorLayout) findViewById(R.id.pulsator); + boolean firstTimeCountrySelect = true; + + private void setCountrySpinner () + { + String currentExit = Prefs.getExitNodes(); + if (currentExit.length() > 4) + { + //someone put a complex value in, so let's disable + ArrayList<String> cList = new ArrayList<String>(); + cList.add(0, currentExit); + ArrayAdapter<String> adapter = new ArrayAdapter<String>(this, android.R.layout.simple_spinner_item, cList); + spnCountries.setAdapter(adapter); + + spnCountries.setEnabled(false); + } + else { + int selIdx = -1; + + ArrayList<String> cList = new ArrayList<String>(); + cList.add(0, getString(R.string.vpn_default_world)); + + for (int i = 0; i < TorServiceConstants.COUNTRY_CODES.length; i++) { + Locale locale = new Locale("", TorServiceConstants.COUNTRY_CODES[i]); + cList.add(locale.getDisplayCountry()); + if (currentExit.contains(TorServiceConstants.COUNTRY_CODES[i])) + selIdx = i + 1; + } + + ArrayAdapter<String> adapter = new ArrayAdapter<String>(this, android.R.layout.simple_spinner_item, cList); + spnCountries.setAdapter(adapter); + + if (selIdx > 0) + spnCountries.setSelection(selIdx,true); + + spnCountries.setOnItemSelectedListener(new OnItemSelectedListener() { + @Override + public void onItemSelected(AdapterView<?> parentView, View selectedItemView, int position, long id) { + // your code here + + if (firstTimeCountrySelect) { + firstTimeCountrySelect = false; + return; + } + + String country = null; + + if (position == 0) + country = ""; + else + country = '{' + TorServiceConstants.COUNTRY_CODES[position - 1] + '}'; + + Intent torService = new Intent(OrbotMainActivity.this, TorService.class); + torService.setAction(TorServiceConstants.CMD_SET_EXIT); + torService.putExtra("exit", country); + startService(torService); + + } + + @Override + public void onNothingSelected(AdapterView<?> parentView) { + // your code here + } + + }); + } } @Override @@ -1026,6 +1048,8 @@ public class OrbotMainActivity extends AppCompatActivity mBtnBridges.setChecked(Prefs.bridgesEnabled()); mBtnVPN.setChecked(Prefs.useVpn()); + setCountrySpinner(); + requestTorStatus(); if (torStatus == null)

1 0

[orbot/master] update to build 16020011 16.0.2-BETA-1
by n8fr8＠torproject.org 12 May '18

12 May '18

commit 0b74afbee745502d9766285a2ffdf9fb52c80197 Author: n8fr8 <nathan(a)freitas.net> Date: Sat May 12 00:49:14 2018 -0400 update to build 16020011 16.0.2-BETA-1 with tor 0.3.3.5-rc --- app/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 9e55cdde..1b23a441 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,7 +5,7 @@ android { buildToolsVersion '27.0.3' defaultConfig { applicationId "org.torproject.android" - minSdkVersion 14 + minSdkVersion 16 targetSdkVersion 27 } lintOptions { @@ -44,8 +44,8 @@ android { minSdkVersion 16 applicationId 'org.torproject.android' targetSdkVersion 27 - versionCode 16010011 - versionName '16.0.1-BETA-1' + versionCode 16020011 + versionName '16.0.2-BETA-1' } }

1 0

[orbot/master] centered app selection GridView in VPN UI
by n8fr8＠torproject.org 12 May '18

12 May '18

commit e3f9397aceb8ed74b0b29af40682b7433ca32969 Author: lexi <bird.s.lex(a)gmail.com> Date: Mon Feb 26 13:45:46 2018 -0500 centered app selection GridView in VPN UI --- app/src/main/res/layout/layout_apps.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/res/layout/layout_apps.xml b/app/src/main/res/layout/layout_apps.xml index ac967fe3..b04887e1 100644 --- a/app/src/main/res/layout/layout_apps.xml +++ b/app/src/main/res/layout/layout_apps.xml @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> -<RelativeLayout +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - xmlns:android="http://schemas.android.com/apk/res/android" android:duplicateParentState="true"> - <GridView + <GridView android:id="@+id/applistview" android:layout_width="match_parent" android:layout_height="match_parent" - android:numColumns="4" - android:layout_alignParentTop="true" > + android:layout_alignParentTop="true" + android:gravity="center" + android:numColumns="4"> </GridView> -</RelativeLayout> \ No newline at end of file +</FrameLayout> \ No newline at end of file

1 0