December 2021 - tor-commits - lists.torproject.org

[orbot/master] Merge pull request #436 from bitmold/clear_bandwidth_on_stop
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 37d7388e520d87afc4e224775f4b1cd66ddd6467 Merge: 8bfad5e3 50c411f1 Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Thu Feb 4 16:41:51 2021 -0500 Merge pull request #436 from bitmold/clear_bandwidth_on_stop When tor stops, stop showing wrong bandwidth stats .../main/java/org/torproject/android/OrbotMainActivity.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)

1 0

[orbot/master] Merge branch 'bitmold-v3onions'
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 75bebd89726033ba6322deb38e6ea1decd522f36 Merge: 2fb2ed69 ecb5a930 Author: n8fr8 <nathan(a)guardianproject.info> Date: Thu Feb 4 16:40:04 2021 -0500 Merge branch 'bitmold-v3onions' app/src/main/AndroidManifest.xml | 33 +- .../java/org/torproject/android/MainConstants.java | 15 - .../org/torproject/android/OrbotMainActivity.java | 153 ++++--- .../ui/hiddenservices/ClientCookiesActivity.java | 12 +- .../ui/hiddenservices/HiddenServicesActivity.java | 24 +- .../hiddenservices/adapters/OnionListAdapter.java | 7 +- .../ui/hiddenservices/backup/BackupUtils.java | 175 +++++++- .../backup/{ZipIt.java => ZipUtilities.java} | 14 +- .../ui/hiddenservices/dialogs/AddCookieDialog.java | 6 +- .../dialogs/CookieActionsDialog.java | 2 +- .../ui/hiddenservices/dialogs/HSActionsDialog.java | 4 +- .../ui/hiddenservices/dialogs/HSDeleteDialog.java | 6 +- .../permissions/PermissionManager.java | 14 +- .../providers/HSContentProvider.java | 6 +- .../ui/onboarding/CustomBridgesActivity.java | 6 +- .../OnionServiceActionsDialogFragment.java | 94 ++++ .../ui/v3onionservice/OnionServiceActivity.java | 178 ++++++++ .../OnionServiceContentProvider.java | 110 +++++ .../OnionServiceCreateDialogFragment.java | 98 +++++ .../ui/v3onionservice/OnionServiceDatabase.java | 37 ++ .../OnionServiceDeleteDialogFragment.java | 40 ++ .../ui/v3onionservice/OnionV3ListAdapter.java | 53 +++ .../ClientAuthActionsDialogFragment.java | 42 ++ .../clientauth/ClientAuthActivity.java | 142 ++++++ .../clientauth/ClientAuthBackupDialogFragment.java | 90 ++++ .../clientauth/ClientAuthContentProvider.java | 104 +++++ .../clientauth/ClientAuthCreateDialogFragment.java | 95 ++++ .../clientauth/ClientAuthDatabase.java | 30 ++ .../clientauth/ClientAuthDeleteDialogFragment.java | 36 ++ .../clientauth/ClientAuthListAdapter.java | 49 +++ app/src/main/res/layout/activity_v3auth.xml | 45 ++ .../main/res/layout/dialog_add_v3_client_auth.xml | 34 ++ app/src/main/res/menu/orbot_main.xml | 137 +++--- app/src/main/res/values/dimens.xml | 1 + app/src/main/res/values/strings.xml | 18 +- .../java/org/torproject/android/core/DiskUtils.kt | 11 +- .../torproject/android/service/OrbotService.java | 486 +++++++++------------ .../android/service/TorServiceConstants.java | 3 +- 38 files changed, 1884 insertions(+), 526 deletions(-)

1 0

[orbot/master] remove unused menu handling code
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 4a8c1863a8b000c776761526abea4d38689965d4 Author: n8fr8 <nathan(a)guardianproject.info> Date: Thu Feb 4 16:49:01 2021 -0500 remove unused menu handling code --- .../org/torproject/android/OrbotMainActivity.java | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index 3a35f881..79668887 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -443,25 +443,6 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan doExit(); // exit app } else if (item.getItemId() == R.id.menu_about) { new AboutDialogFragment().show(getSupportFragmentManager(), AboutDialogFragment.TAG); - } else if (item.getItemId() == R.id.menu_scan) { - IntentIntegrator integrator = new IntentIntegrator(OrbotMainActivity.this); - integrator.initiateScan(); - } else if (item.getItemId() == R.id.menu_share_bridge) { - - String bridges = Prefs.getBridgesList(); - - if (bridges != null && bridges.length() > 0) { - try { - bridges = "bridge://" + URLEncoder.encode(bridges, "UTF-8"); - - IntentIntegrator integrator = new IntentIntegrator(OrbotMainActivity.this); - integrator.shareText(bridges); - - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } - } - } else if (item.getItemId() == R.id.menu_v3_onion_services) { startActivity(new Intent(this, OnionServiceActivity.class)); } else if (item.getItemId() == R.id.menu_v3_onion_client_auth) {

1 0

[orbot/master] removed old obfs4 packaging options from service gradle, not used anymore
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit f6cf158a13db82a5e143c61f80593d9b1ef69596 Author: bim <dsnake(a)protonmail.com> Date: Fri Feb 12 11:30:23 2021 -0500 removed old obfs4 packaging options from service gradle, not used anymore --- orbotservice/build.gradle | 3 --- 1 file changed, 3 deletions(-) diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle index 20f8dd10..e881f448 100644 --- a/orbotservice/build.gradle +++ b/orbotservice/build.gradle @@ -41,9 +41,6 @@ android { lintConfig file("../lint.xml") } - packagingOptions { - exclude 'assets/arm/obfs4proxy' //this is redundant - } } dependencies {

1 0

[orbot/master] small v3 text updates
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit f3bfaa15a5d167809cf4fc988626ecb102053602 Author: bim <dsnake(a)protonmail.com> Date: Sat Feb 6 15:34:22 2021 -0500 small v3 text updates --- .../android/ui/v3onionservice/clientauth/ClientAuthActivity.java | 4 ++-- app/src/main/res/menu/v3_client_auth_menu.xml | 6 ++++++ app/src/main/res/values/strings.xml | 3 ++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/torproject/android/ui/v3onionservice/clientauth/ClientAuthActivity.java b/app/src/main/java/org/torproject/android/ui/v3onionservice/clientauth/ClientAuthActivity.java index b24b81f7..e33ddf78 100644 --- a/app/src/main/java/org/torproject/android/ui/v3onionservice/clientauth/ClientAuthActivity.java +++ b/app/src/main/java/org/torproject/android/ui/v3onionservice/clientauth/ClientAuthActivity.java @@ -101,7 +101,7 @@ public class ClientAuthActivity extends AppCompatActivity { @Override public boolean onOptionsItemSelected(MenuItem item) { - if (item.getItemId() == R.id.menu_restore_backup) { + if (item.getItemId() == R.id.menu_import_auth_priv) { if (DiskUtils.supportsStorageAccessFramework()) { Intent readFileIntent = DiskUtils.createReadFileIntent("text/*"); startActivityForResult(readFileIntent, REQUEST_CODE_READ_ZIP_BACKUP); @@ -134,7 +134,7 @@ public class ClientAuthActivity extends AppCompatActivity { @Override public boolean onCreateOptionsMenu(Menu menu) { - getMenuInflater().inflate(R.menu.hs_menu, menu); + getMenuInflater().inflate(R.menu.v3_client_auth_menu, menu); return true; } diff --git a/app/src/main/res/menu/v3_client_auth_menu.xml b/app/src/main/res/menu/v3_client_auth_menu.xml new file mode 100644 index 00000000..757c17c4 --- /dev/null +++ b/app/src/main/res/menu/v3_client_auth_menu.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + <item + android:id="@+id/menu_import_auth_priv" + android:title="@string/v3_import_auth_private" /> +</menu> \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a624ccc4..89ca6643 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -168,13 +168,14 @@ <string name="v3_hosted_services">Hosted v3 Onion Services</string> <string name="v3_client_auth">v3 Onion Service Client Authorization</string> <string name="v3_client_auth_activity_title">v3 Client Authorization</string> - <string name="v3_key_hash">X25519 Private Key in Base 32</string> + <string name="v3_key_hash">x25519 Private Key in Base 32</string> <string name="v3_onion">v3 .onion Domain</string> <string name="v3_backup_key">Backup Client Authorization Key</string> <string name="v3_backup_key_warning">Warning: This Could Expose Your Key to Other Apps</string> <string name="v3_delete_client_authorization">Delete Client Authorization Key</string> <string name="v3_delete_client_authorization_confirm">Delete Client Authorization</string> <string name="v3_backup_name_hint">Backup filename…</string> + <string name="v3_import_auth_private">Import .auth_private</string> <string name="confirm">Confirm</string> <string name="title_activity_hidden_services">Onion Services</string> <string name="menu_hidden_services">Onion Services</string>

1 0

[orbot/master] Merge branch 'master' of github.com:guardianproject/orbot
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 8f0367cd9084163e1ca8ba08ea7948ab597de078 Merge: 63ea5b12 f6cf158a Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Feb 22 15:07:31 2021 -0500 Merge branch 'master' of github.com:guardianproject/orbot .../android/ui/v3onionservice/clientauth/ClientAuthActivity.java | 4 ++-- app/src/main/res/menu/v3_client_auth_menu.xml | 6 ++++++ app/src/main/res/values/strings.xml | 3 ++- orbotservice/build.gradle | 3 --- 4 files changed, 10 insertions(+), 6 deletions(-)

1 0

[orbot/master] update version to 1641100100
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit f6f0f0325347e438cd7c0c32cf404e8661519bbf Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Feb 22 15:16:16 2021 -0500 update version to 1641100100 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index e5d6ca08..9b2db5d8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -80,8 +80,8 @@ android { dimension "free" minSdkVersion 16 applicationId 'org.torproject.android' - targetSdkVersion 29 - versionCode 1640300301 + targetSdkVersion 30 + versionCode 1641100100 versionName getVersionName() archivesBaseName = "Orbot-$versionName"

1 0

[orbot/master] update changelog for 16.4.1
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 38e95914bb263bfbbb7ab2a6bd0497073f58cc74 Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Feb 22 15:17:37 2021 -0500 update changelog for 16.4.1 --- CHANGELOG | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 85725b45..e3bdc4eb 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,46 @@ +/** 16.4.1 / 22 February 2021 **/ + +f6f0f032 (HEAD -> master) update version to 1641100100 +8f0367cd (origin/master, origin/HEAD) Merge branch 'master' of github.com:guardianproject/orbot +63ea5b12 add experimental snowflake proxy support +75a64760 some lint cleanups +f6cf158a removed old obfs4 packaging options from service gradle, not used anymore +f3bfaa15 small v3 text updates +ca543b5c Merge branch 'bitmold-no_bridge_in_settings' +4a8c1863 (bitmold-no_bridge_in_settings) remove unused menu handling code +2fd6da45 Merge branch 'no_bridge_in_settings' of https://github.com/bitmold/orbot into bitmold-no_bridge_in_settings +37d7388e Merge pull request #436 from bitmold/clear_bandwidth_on_stop +8bfad5e3 Merge pull request #432 from bitmold/unmeterd_vpn_androidQ +75bebd89 Merge branch 'bitmold-v3onions' +ecb5a930 (bitmold-v3onions) Merge branch 'v3onions' of https://github.com/bitmold/orbot into bitmold-v3onions +2fb2ed69 Merge branch 'master' of github.com:guardianproject/orbot +2380ed07 removed QR Codes from main screen, all bridge QR scanning/sharing happens in bridge wizard +729bffd2 Fixes #431 unmetered VpnService on Android Q+ - removed small warnings in OrbotVpnManager.java +50c411f1 When tor stops, stop sohwing wrong bandwidth stats +80e03709 removed bridge config from barebones orbot XML settings, bridges can be configured with more ease from our own interface +f13b53b8 generate nonsense named auth_privates locally when OrbotService is running +64c4a462 UI For Create, Backing up Restoring, etc V3 Client Authorizations +a8b3e167 dialog for adding v3 base32 key hashes +23b86e51 missing netcipher integration stuff +a26c18e1 V3 and V2 onions can coexist, Orbot ready to receive V3s from netcipher +feb3de3b removed unused interface +85dba3bf Battery permissions on v3 services +ec11d9db V3 UI Cleanup, Deprecated Stuff Under Menu + filtering of v3 user/app services +e4a5d02f Backup/Restore for V3 Working on Legacy Orbots with WRITE_EXTERNAL_STORAGE +30e1442f V3 Backup and Restore working with Storage Access Framework +7ce30104 Initial work for V3 UI, DB Stuff, etc +fe69a315 altered code that will break with gradle 5 (resource IDs will be declared non-final in Java) +6057148c small activity label cleanups (less java) +5bf2ba89 small bug where 'snowflake' can appear in a field to paste custom bridge config +3ea17c5b closes #424 +db7dd6d5 (tag: 16.4.0-RC-2a-tor-0.4.4.6) update to version code 1640300301 +de3599c1 increment version code to republish to play +8727fcca remove externals app download links from fastlane metadata +ed6a3379 update fastlane changelog for 1640300200 +d9fe4345 (tag: 16.4.0-RC-2-tor-0.4.4.6) updated version code 1640300200 +d5805b08 update full description +870db533 restore links to youtube video in fastlane play store metadata + /** 16.4.0-RC-1-tor-0.4.4.6 / 12 January 2021 **/ (This one's for Karsten, and his life well lived)

1 0

[orbot/master] add experimental snowflake proxy support
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 63ea5b12f3b24bab739515de1eac87caae7a9090 Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Feb 22 15:07:04 2021 -0500 add experimental snowflake proxy support --- app/src/main/res/values/strings.xml | 2 ++ app/src/main/res/xml/preferences.xml | 9 +++++++++ .../main/java/org/torproject/android/service/OrbotService.java | 9 ++++++--- .../src/main/java/org/torproject/android/service/util/Prefs.java | 9 +++++++++ 4 files changed, 26 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a624ccc4..71e5b004 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -263,4 +263,6 @@ <string name="paste_bridges">Paste Bridges</string> <string name="use_qr_code">Use QR Code</string> <string name="bridge_snowflake">Connect through other Tor peers (experimental)</string> + <string name="be_a_snowflake_title">Run Snowflake Proxy</string> + <string name="be_a_snowflake_desc">Allow other Tor users to connect to Tor through your device</string> </resources> diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 506e9d9b..f273f318 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -291,4 +291,13 @@ android:title="@string/pref_disable_network_title" /> </PreferenceCategory> + <PreferenceCategory android:title="Experimental"> + <CheckBoxPreference + android:defaultValue="false" + android:key="pref_be_a_snowflake" + android:summary="@string/be_a_snowflake_title" + android:title="@string/be_a_snowflake_desc" /> + + </PreferenceCategory> + </PreferenceScreen> diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java index 4aae0cef..2807a2c0 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -351,7 +351,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb return bridgeList.contains("snowflake"); } - private void startSnowflakeProxy() { + private void startSnowflakeClient() { //this is using the current, default Tor snowflake infrastructure IPtProxy.startSnowflake("stun:stun.l.google.com:19302", "https://snowflake-broker.azureedge.net/", "ajax.aspnetcdn.com", null, true, false, true, 3); @@ -361,7 +361,8 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb This is to host a snowflake entrance node / bridge */ private void runSnowflakeProxy () { - + + // @param capacity Maximum concurrent clients. OPTIONAL. Defaults to 10, if 0. // @param broker Broker URL. OPTIONAL. Defaults to https://snowflake-broker.bamsoftware.com/, if empty. // @param relay WebSocket relay URL. OPTIONAL. Defaults to wss://snowflake.bamsoftware.com/, if empty. @@ -1659,8 +1660,10 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb IPtProxy.startObfs4Proxy("DEBUG", false, false); if (useIPtSnowflakeProxy()) - startSnowflakeProxy(); + startSnowflakeClient(); + if (Prefs.beSnowflakeProxy()) + runSnowflakeProxy(); startTor(); replyWithStatus(mIntent); diff --git a/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java b/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java index cc4c9b98..1b2922a7 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java +++ b/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java @@ -20,6 +20,7 @@ public class Prefs { private final static String PREF_OPEN_PROXY_ON_ALL_INTERFACES = "pref_open_proxy_on_all_interfaces"; private final static String PREF_USE_VPN = "pref_vpn"; private final static String PREF_EXIT_NODES = "pref_exit_nodes"; + private final static String PREF_BE_A_SNOWFLAKE = "pref_be_a_snowflake"; private static SharedPreferences prefs; @@ -61,6 +62,14 @@ public class Prefs { return prefs.getString(PREF_DEFAULT_LOCALE, Locale.getDefault().getLanguage()); } + public static boolean beSnowflakeProxy () { + return prefs.getBoolean(PREF_BE_A_SNOWFLAKE,false); + } + + public static void setBeSnowflakeProxy (boolean beSnowflakeProxy) { + putBoolean(PREF_BE_A_SNOWFLAKE,beSnowflakeProxy); + } + public static void setDefaultLocale(String value) { putString(PREF_DEFAULT_LOCALE, value); }

1 0

[orbot/master] some lint cleanups
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 75a64760e8eb25a8555797fd95bac3dd165282f4 Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Feb 22 14:47:17 2021 -0500 some lint cleanups --- .../torproject/android/service/OrbotService.java | 131 ++++++++------------- 1 file changed, 48 insertions(+), 83 deletions(-) diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java index 7f6612a9..4aae0cef 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -42,7 +42,6 @@ import com.jaredrummler.android.shell.CommandResult; import net.freehaven.tor.control.TorControlCommands; import net.freehaven.tor.control.TorControlConnection; -import org.apache.commons.io.FileUtils; import org.torproject.android.service.util.CustomShell; import org.torproject.android.service.util.CustomTorResourceInstaller; import org.torproject.android.service.util.DummyActivity; @@ -72,6 +71,7 @@ import java.util.Collections; import java.util.Date; import java.util.HashMap; import java.util.Iterator; +import java.util.Objects; import java.util.Random; import java.util.StringTokenizer; import java.util.concurrent.ExecutorService; @@ -357,6 +357,28 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb "ajax.aspnetcdn.com", null, true, false, true, 3); } + /* + This is to host a snowflake entrance node / bridge + */ + private void runSnowflakeProxy () { + + // @param capacity Maximum concurrent clients. OPTIONAL. Defaults to 10, if 0. +// @param broker Broker URL. OPTIONAL. Defaults to https://snowflake-broker.bamsoftware.com/, if empty. +// @param relay WebSocket relay URL. OPTIONAL. Defaults to wss://snowflake.bamsoftware.com/, if empty. +// @param stun STUN URL. OPTIONAL. Defaults to stun:stun.stunprotocol.org:3478, if empty. +// @param logFile Name of log file. OPTIONAL +// @param keepLocalAddresses Keep local LAN address ICE candidates. +// @param unsafeLogging Prevent logs from being scrubbed. + + int capacity = 3; + String broker = "https://snowflake-broker.bamsoftware.com/"; + String relay = "wss://snowflake.bamsoftware.com/"; + String stun = "stun:stun.stunprotocol.org:3478"; + String logFile = null; + boolean keepLocalAddresses = true; + boolean unsafeLogging = false; + IPtProxy.startSnowflakeProxy(capacity, broker, relay, stun, logFile, keepLocalAddresses, unsafeLogging); + } /** * if someone stops during startup, we may have to wait for the conn port to be setup, so we can properly shutdown tor */ @@ -429,19 +451,6 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb if (!appCacheHome.exists()) appCacheHome.mkdirs(); - - debug("listing files in DataDirectory: " + appCacheHome.getAbsolutePath()); - Iterator<File> files = FileUtils.iterateFiles(appCacheHome, null, true); - while (files.hasNext()) { - File fileNext = files.next(); - debug(fileNext.getAbsolutePath() - + " length=" + fileNext.length() - + " rw=" + fileNext.canRead() + "/" + fileNext.canWrite() - + " lastMod=" + new Date(fileNext.lastModified()).toLocaleString() - - ); - } - fileTorRc = new File(appBinHome, TORRC_ASSET_KEY); fileControlPort = new File(getFilesDir(), TOR_CONTROL_PORT_FILE); filePid = new File(getFilesDir(), TOR_PID_FILE); @@ -721,11 +730,11 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb try { // STATUS_STARTING is set in onCreate() - if (mCurrentStatus == STATUS_STOPPING) { + if (mCurrentStatus.equals(STATUS_STOPPING)) { // these states should probably be handled better sendCallbackLogMessage("Ignoring start request, currently " + mCurrentStatus); return; - } else if (mCurrentStatus == STATUS_ON && (mLastProcessId != -1)) { + } else if (mCurrentStatus.equals(STATUS_ON) && (mLastProcessId != -1)) { showConnectedToTorNetworkNotification(); sendCallbackLogMessage("Ignoring start request, already started."); // setTorNetworkEnabled (true); @@ -948,7 +957,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb logNotice(getString(R.string.waiting_for_control_port)); - while (conn == null && attempt++ < maxTries && (mCurrentStatus != STATUS_OFF)) { + while (conn == null && attempt++ < maxTries && (!mCurrentStatus.equals(STATUS_OFF))) { try { controlPort = getControlPort(); if (controlPort != -1) { @@ -1127,10 +1136,12 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb try { int iconId = R.drawable.ic_stat_tor; - if (conn != null && mCurrentStatus == STATUS_ON && Prefs.expandedNotifications()) - showToolbarNotification(getString(R.string.newnym), NOTIFY_ID, iconId); + if (conn != null) { + if (mCurrentStatus.equals(STATUS_ON) && Prefs.expandedNotifications()) + showToolbarNotification(getString(R.string.newnym), NOTIFY_ID, iconId); - conn.signal(TorControlCommands.SIGNAL_NEWNYM); + conn.signal(TorControlCommands.SIGNAL_NEWNYM); + } } catch (Exception ioe) { debug("error requesting newnym: " + ioe.getLocalizedMessage()); @@ -1200,52 +1211,6 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb return intent; } - /* - * Another way to do this would be to use the Observer pattern by defining the - * BroadcastReciever in the Android manifest. - */ - - /** - * private final BroadcastReceiver mNetworkStateReceiver = new BroadcastReceiver() { - * - * @Override public void onReceive(Context context, Intent intent) { - * - * if (mCurrentStatus == STATUS_OFF) - * return; - * - * SharedPreferences prefs = Prefs.getSharedPrefs(getApplicationContext()); - * - * boolean doNetworKSleep = prefs.getBoolean(OrbotConstants.PREF_DISABLE_NETWORK, true); - * - * final ConnectivityManager cm = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE); - * final NetworkInfo netInfo = cm.getActiveNetworkInfo(); - * - * boolean newConnectivityState = false; - * int newNetType = -1; - * - * if (netInfo!=null) - * newNetType = netInfo.getType(); - * - * if(netInfo != null && netInfo.isConnected()) { - * // WE ARE CONNECTED: DO SOMETHING - * newConnectivityState = true; - * } - * else { - * // WE ARE NOT: DO SOMETHING ELSE - * newConnectivityState = false; - * } - * - * if (newConnectivityState != mConnectivity) { - * mConnectivity = newConnectivityState; - * - * //if (mConnectivity) - * // newIdentity(); - * } - * - * } - * }; - **/ - private StringBuffer processSettingsImpl(StringBuffer extraLines) throws IOException { logNotice(getString(R.string.updating_settings_in_tor_service)); SharedPreferences prefs = Prefs.getSharedPrefs(getApplicationContext()); @@ -1275,17 +1240,17 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb String proxyPass = prefs.getString("pref_proxy_password", null); if ((proxyHost != null && proxyHost.length() > 0) && (proxyPort != null && proxyPort.length() > 0)) { - extraLines.append(proxyType + "Proxy" + ' ' + proxyHost + ':' + proxyPort).append('\n'); + extraLines.append(proxyType).append("Proxy").append(' ').append(proxyHost).append(':').append(proxyPort).append('\n'); if (proxyUser != null && proxyPass != null) { if (proxyType.equalsIgnoreCase("socks5")) { - extraLines.append("Socks5ProxyUsername" + ' ' + proxyUser).append('\n'); - extraLines.append("Socks5ProxyPassword" + ' ' + proxyPass).append('\n'); + extraLines.append("Socks5ProxyUsername").append(' ').append(proxyUser).append('\n'); + extraLines.append("Socks5ProxyPassword").append(' ').append(proxyPass).append('\n'); } else - extraLines.append(proxyType + "ProxyAuthenticator" + ' ' + proxyUser + ':' + proxyPort).append('\n'); + extraLines.append(proxyType).append("ProxyAuthenticator").append(' ').append(proxyUser).append(':').append(proxyPort).append('\n'); } else if (proxyPass != null) - extraLines.append(proxyType + "ProxyAuthenticator" + ' ' + proxyUser + ':' + proxyPort).append('\n'); + extraLines.append(proxyType).append("ProxyAuthenticator").append(' ').append(proxyUser).append(':').append(proxyPort).append('\n'); } } } @@ -1335,25 +1300,25 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb File fileGeoIP6 = new File(appBinHome, GEOIP6_ASSET_KEY); if (fileGeoIP.exists()) { - extraLines.append("GeoIPFile" + ' ' + fileGeoIP.getCanonicalPath()).append('\n'); - extraLines.append("GeoIPv6File" + ' ' + fileGeoIP6.getCanonicalPath()).append('\n'); + extraLines.append("GeoIPFile" + ' ').append(fileGeoIP.getCanonicalPath()).append('\n'); + extraLines.append("GeoIPv6File" + ' ').append(fileGeoIP6.getCanonicalPath()).append('\n'); } if (!TextUtils.isEmpty(entranceNodes)) - extraLines.append("EntryNodes" + ' ' + entranceNodes).append('\n'); + extraLines.append("EntryNodes" + ' ').append(entranceNodes).append('\n'); if (!TextUtils.isEmpty(exitNodes)) - extraLines.append("ExitNodes" + ' ' + exitNodes).append('\n'); + extraLines.append("ExitNodes" + ' ').append(exitNodes).append('\n'); if (!TextUtils.isEmpty(excludeNodes)) - extraLines.append("ExcludeNodes" + ' ' + excludeNodes).append('\n'); + extraLines.append("ExcludeNodes" + ' ').append(excludeNodes).append('\n'); - extraLines.append("StrictNodes" + ' ' + (enableStrictNodes ? "1" : "0")).append('\n'); + extraLines.append("StrictNodes" + ' ').append(enableStrictNodes ? "1" : "0").append('\n'); try { if (ReachableAddresses) { String ReachableAddressesPorts = prefs.getString(OrbotConstants.PREF_REACHABLE_ADDRESSES_PORTS, "*:80,*:443"); - extraLines.append("ReachableAddresses" + ' ' + ReachableAddressesPorts).append('\n'); + extraLines.append("ReachableAddresses" + ' ').append(ReachableAddressesPorts).append('\n'); } } catch (Exception e) { @@ -1363,14 +1328,14 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb try { if (becomeRelay && (!useBridges) && (!ReachableAddresses)) { - int ORPort = Integer.parseInt(prefs.getString(OrbotConstants.PREF_OR_PORT, "9001")); + int ORPort = Integer.parseInt(Objects.requireNonNull(prefs.getString(OrbotConstants.PREF_OR_PORT, "9001"))); String nickname = prefs.getString(OrbotConstants.PREF_OR_NICKNAME, "Orbot"); String dnsFile = writeDNSFile(); - extraLines.append("ServerDNSResolvConfFile" + ' ' + dnsFile).append('\n'); - extraLines.append("ORPort" + ' ' + ORPort).append('\n'); - extraLines.append("Nickname" + ' ' + nickname).append('\n'); - extraLines.append("ExitPolicy" + ' ' + "reject *:*").append('\n'); + extraLines.append("ServerDNSResolvConfFile").append(' ').append(dnsFile).append('\n'); + extraLines.append("ORPort").append(' ').append(ORPort).append('\n'); + extraLines.append("Nickname").append(' ').append(nickname).append('\n'); + StringBuffer append = extraLines.append("ExitPolicy").append(' ').append("reject *:*").append('\n'); } } catch (Exception e) {

1 0