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

[orbot/master] handle new local action for v3 onion names updating;
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 0ef3500ef9239e54b782c53efe643bf7a3bb1d3b Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Dec 20 14:55:34 2021 -0500 handle new local action for v3 onion names updating; also don't allow rapid stop/starts to avoid crashes --- .../org/torproject/android/OrbotMainActivity.java | 64 ++++++++++++++-------- 1 file changed, 42 insertions(+), 22 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index 2310b3b8..ba40d5c5 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -179,6 +179,26 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan break; } + case TorServiceConstants.LOCAL_ACTION_V3_NAMES_UPDATED: + if (lastInsertedOnionServiceRowId == -1) break; // another app did not request an onion service + ContentResolver cr = getContentResolver(); + String where = OnionServiceContentProvider.OnionService._ID + "=" + lastInsertedOnionServiceRowId; + Cursor v3Cursor = cr.query(OnionServiceContentProvider.CONTENT_URI, OnionServiceContentProvider.PROJECTION, + where, null, null); + if (v3Cursor == null || v3Cursor.getCount() != 1 || !v3Cursor.moveToFirst()) { + if (v3Cursor != null) v3Cursor.close(); + OrbotMainActivity.this.setResult(RESULT_CANCELED); + OrbotMainActivity.this.finish(); + return; + } + String hostname = v3Cursor.getString(v3Cursor.getColumnIndex(OnionServiceContentProvider.OnionService.DOMAIN)); + v3Cursor.close(); + if (TextUtils.isEmpty(hostname)) break; + Intent response = new Intent(); + response.putExtra(INTENT_EXTRA_REQUESTED_V3_HOSTNAME, hostname); + OrbotMainActivity.this.setResult(RESULT_OK, response); + OrbotMainActivity.this.finish(); + break; case TorServiceConstants.ACTION_STATUS: { lastStatusIntent = intent; @@ -260,10 +280,29 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan startService(intent); } + private boolean waitingToStop = false; + private void stopTor() { - if (mBtnVPN.isChecked()) sendIntentToService(ACTION_STOP_VPN); - sendIntentToService(ACTION_STOP); + if (torStatus.equals(TorServiceConstants.STATUS_ON)) + { + if (mBtnVPN.isChecked()) sendIntentToService(ACTION_STOP_VPN); + sendIntentToService(ACTION_STOP); + } + else if (torStatus.equals(STATUS_STARTING)) { + + if (!waitingToStop) { + waitingToStop = true; + updateStatus("...", STATUS_STOPPING); + mStatusUpdateHandler.postDelayed(() -> { + + if (mBtnVPN.isChecked()) sendIntentToService(ACTION_STOP_VPN); + sendIntentToService(ACTION_STOP); + waitingToStop = false; + + }, 3000); + } + } SnowfallView sv = findViewById(R.id.snowflake_view); sv.setVisibility(View.GONE); @@ -874,26 +913,7 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan break; - case TorServiceConstants.STATUS_V3_NAMES_UPDATED: - if (lastInsertedOnionServiceRowId == -1) break; // another app did not request an onion service - ContentResolver cr = getContentResolver(); - String where = OnionServiceContentProvider.OnionService._ID + "=" + lastInsertedOnionServiceRowId; - Cursor v3Cursor = cr.query(OnionServiceContentProvider.CONTENT_URI, OnionServiceContentProvider.PROJECTION, - where, null, null); - if (v3Cursor == null || v3Cursor.getCount() != 1 || !v3Cursor.moveToFirst()) { - if (v3Cursor != null) v3Cursor.close(); - setResult(RESULT_CANCELED); - finish(); - return; - } - String hostname = v3Cursor.getString(v3Cursor.getColumnIndex(OnionServiceContentProvider.OnionService.DOMAIN)); - v3Cursor.close(); - if (TextUtils.isEmpty(hostname)) break; - Intent response = new Intent(); - response.putExtra(INTENT_EXTRA_REQUESTED_V3_HOSTNAME, hostname); - setResult(RESULT_OK, response); - finish(); - return; + } }

1 0

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

22 Dec '21

commit dd723e49596e0e4d470573cf8b2324f3a0f51ec4 Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Dec 20 14:57:33 2021 -0500 update to 1652200100 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 0f5a8b21..44d7466e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -40,7 +40,7 @@ android { minSdkVersion 16 applicationId 'org.torproject.android' targetSdkVersion 29 - versionCode 1652100110 + versionCode 1652200100 versionName getVersionName() archivesBaseName = "Orbot-$versionName"

1 0

[orbot/master] update build info on renaming pdnsd after ndk-build
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit ecd12b0be63337f3f253730ddfe7db577c18b409 Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Jul 9 16:21:21 2021 -0400 update build info on renaming pdnsd after ndk-build --- BUILD.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/BUILD.md b/BUILD.md index b1e9a362..28b636a1 100644 --- a/BUILD.md +++ b/BUILD.md @@ -22,19 +22,19 @@ UNIX: cd orbotservice/src/main ndk-build (located in Android/Sdk/ndk/VERSION/) - mv libs/armeabi-v7a/pdnsd libs/armeabi-v7a/pdnsd.so - mv libs/arm64-v8a/pdnsd libs/arm64-v8a/pdnsd.so - mv libs/x86/pdnsd libs/x86/pdnsd.so - mv libs/x86_64/pdnsd libs/x86_64/pdnsd.so + mv libs/armeabi-v7a/pdnsd libs/armeabi-v7a/libpdnsd.so + mv libs/arm64-v8a/pdnsd libs/arm64-v8a/libpdnsd.so + mv libs/x86/pdnsd libs/x86/libpdnsd.so + mv libs/x86_64/pdnsd libs/x86_64/libpdnsd.so Windows: cd orbotservice\src\main ndk-build.cmd (located in Android\Sdk\ndk\VERSION\) - ren libs\armeabi-v7a\pdnsd pdnsd.so - ren libs\arm64-v8a\pdnsd pdnsd.so - ren libs\x86\pdnsd pdnsd.so - ren libs\x86_64\pdnsd pdnsd.so + ren libs\armeabi-v7a\pdnsd libpdnsd.so + ren libs\arm64-v8a\pdnsd libpdnsd.so + ren libs\x86\pdnsd libpdnsd.so + ren libs\x86_64\pdnsd libpdnsd.so Now build the Android app using Android Studio/gradle @@ -43,4 +43,4 @@ This will produce an unsigned Orbot package APK. To produce a usable package, you'll need to sign the .apk. The basics on signing can be found on the Android developer site: -http://developer.android.com/guide/publishing/app-signing.html \ No newline at end of file +http://developer.android.com/guide/publishing/app-signing.html

1 0

[orbot/master] Translated using Weblate (Sinhala)
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 443f383ab138241884bf24fff6e5640a16f59550 Author: HelaBasa <R45XvezA(a)protonmail.ch> Date: Sun Jul 11 01:23:31 2021 +0200 Translated using Weblate (Sinhala) Currently translated at 34.3% (76 of 221 strings) Co-authored-by: HelaBasa <R45XvezA(a)protonmail.ch> Translate-URL: https://hosted.weblate.org/projects/guardianproject/orbot/si/ Translation: Guardian Project/Orbot --- app/src/main/res/values-si-rLK/strings.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/src/main/res/values-si-rLK/strings.xml b/app/src/main/res/values-si-rLK/strings.xml index 613c38e7..2a490c83 100644 --- a/app/src/main/res/values-si-rLK/strings.xml +++ b/app/src/main/res/values-si-rLK/strings.xml @@ -1,19 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="app_name">Orbot</string> - <string name="app_description">Orbot à¶ºà¶±à· à¶à¶±à·à¶à·à¶à· à¶à·à¶Žà·à·à· à·à¶§ à·à¶©à· à¶à·à¶»à¶à·à·à·à¶à·à¶»à·à· à¶à¶±à·à¶à¶»à·à¶¢à·à¶œà·à¶ºà· à·à·à¶»à·à·à·à¶»à·à¶žà¶§ à¶à¶© à·à¶œà·à·à¶¯à·à¶± à¶±à·à·à¶žà·à¶œà·à· à¶œà¶¶à·à¶¯à·à¶±à·à¶±à·à·à· à¶Žà·à¶»à·à¶à·à·à· à·à·à·à·à·à·à¶à·. à¶à¶º Tor à¶ºà·à·à¶¯à·à¶à¶±à·à¶žà·à¶±à· à¶à¶¶à¶à·à· à¶à¶±à·à¶à¶»à·à¶¢à·à¶œ à¶à¶±à·à¶¯à·à¶±à· à¶à·à·à¶à¶±à¶º à¶à¶»à¶ºà· à¶à¶žà·à¶±à·à¶ž à¶à¶º à¶œà·à·à· à·à¶§à· à·à· à¶à¶±à·à¶à·à¶à· à·à¶žà·à¶±à·à¶à¶» à¶Žà¶»à·à¶à¶±à¶ à·à¶»à·à· à¶à·à¶±à¶ºà¶žà·à¶±à· à¶à¶¶à¶à·à· à¶à¶±à·à¶à¶»à·à¶¢à·à¶œ à¶à¶±à·à¶¯à·à¶±à· à·à¶à·à· à¶à¶¶à·à¶à¶±à·. Tor à¶ºà¶±à· </string> - <string name="status_starting_up">Orbot à¶à¶»à¶žà·à¶· à¶à¶»à¶žà·à¶±à·âŠ</string> - <string name="status_activated">Tor à¶¢à·à¶œà¶ºà¶§ à·à¶¶à·à¶¯à·à¶ºà·</string> - <string name="status_disabled">Orbot à¶à·âà¶»à·à¶ºà·à·à·à¶»à·à·à¶ à¶à¶» à¶à¶ </string> - <string name="menu_settings">à·à·à¶§à·à·à¶žà·</string> + <string name="app_name">à¶à¶»à·à¶¶à·à¶§à·</string> + <string name="app_description">à¶à¶»à·à¶¶à·à¶§à· à¶ºà¶±à· à¶à¶±à·à¶à¶»à·à¶¢à·à¶œà¶º à·à¶©à·à¶à· à¶à¶»à¶à·à·à·à¶à· à¶·à·à·à·à¶à· à¶à·à¶»à·à¶žà¶§ à¶à¶±à·à¶à·à¶à· à¶ºà·à¶¯à·à¶žà· à·à¶œà¶§ à¶¶à¶œà¶º à¶œà¶¶à· à¶¯à·à¶± à¶±à·à¶žà·à¶œà· à¶Žà·à¶»à¶à¶œà·à·à· à¶ºà·à¶¯à·à¶žà¶à·. à¶à¶»à·à¶¶à¶§à· à¶à¶±à·à¶à¶»à·à¶¢à·à¶œ à¶à¶žà¶±à·à¶à¶žà¶±à¶º à·à¶à¶à·à¶à·à¶à¶à¶±à¶º à¶à·à¶»à·à¶žà¶§ à¶§à·à¶»à· à¶·à·à·à·à¶à· à¶à¶»à¶± à¶à¶à¶» à¶Žà·à·à· à¶à¶º à¶œà·à· à¶Žà·à¶»à· à¶Žà¶»à·à¶à¶«à¶ à¶žà·à¶œà·à·à¶à· à·à¶»à·à· à¶Žà·à¶±à·à¶± à·à·à¶žà·à¶±à· à·à·à¶à·à·à¶žà¶§ à¶œà¶à· à¶à¶»à¶ºà·. à¶§à·à¶»à· à¶ºà¶±à· à¶±à·à·à¶žà·à¶œà· à¶žà·à¶¯à·à¶à·à¶à¶à¶ºà¶à· à·à¶± à¶à¶à¶» à¶Žà·à¶¯à·à¶à¶œà·à¶ à¶±à·à¶¯à·à· à·à· à¶Žà·à¶¯à·à¶à¶œà·à¶à¶à·à·à¶º, à·à·à·à·à·à·à· à¶à¶§à¶ºà·à¶à· à·à·âà¶ºà·à¶Žà·à¶»à·à¶ à¶à·âà¶»à·à¶ºà·à¶à·à¶»à¶à¶žà· à·à· à·à¶¶à·à¶³à·à¶ºà ·à·à¶±à·à¶ à¶§ à¶à¶à·à·à¶± à¶à¶»à·à¶¢à¶±, à·à· à¶¢à¶±à¶Žà¶¯ à¶à¶»à¶à·à·à·à· à¶œà·à· à·à·à¶³à·à¶±à·à·à·à¶± à¶Žà·âà¶»à·à·à· à·à·à·à·à¶œà·à·à¶«à¶º à¶ºà¶±à·à¶¯à· à¶¢à·à¶œ à¶Žà·âà¶»à·à·à¶à·à·à¶« à¶à¶à·à¶» à·à¶œà¶§ à¶à¶»à·à·à·à· à·à·à¶§à·à¶žà¶§ à¶à¶¶à¶§ à·à·à·à¶º à·à¶± à·à·à·à·à¶ à¶¢à·à¶œà¶ºà¶à·.</string> + <string name="status_starting_up">à¶à¶»à·à¶¶à·à¶§à· à¶à¶»à¶¹à·à¶žà·à¶±à·âŠ</string> + <string name="status_activated">à¶§à·à¶»à· à¶¢à·à¶œà¶ºà¶§ à·à¶žà·à¶¶à¶±à·à¶°à¶ºà·</string> + <string name="status_disabled">à¶à¶»à·à¶¶à·à¶§à· à¶à·âà¶»à·à¶ºà·à·à·à¶»à·à·à¶ à¶à¶» à¶à¶</string> + <string name="menu_settings">à·à·à¶à·à·à¶žà·</string> <string name="menu_log">à¶œà·à¶à¶º </string> <string name="menu_start">à¶à¶»à¶¹à¶±à·à¶±</string> <string name="menu_stop">à¶±à·à¶à·à·à¶±à·à¶±</string> - <string name="menu_about">à¶Žà·à·à·à¶¶à¶¯</string> + <string name="menu_about">à¶Žà·à·à·à¶¶à¶³à·</string> <string name="main_layout_download">à¶¶à·à¶à¶±à·à¶±</string> <string name="main_layout_upload">à¶à¶©à·à¶à¶ à¶à¶»à¶±à·à¶± </string> - <string name="button_about">à¶Žà·à·à·à¶¶à¶¯</string> - <string name="menu_exit">à¶à·à¶à· à·à¶±à·à¶±</string> + <string name="button_about">à¶Žà·à·à·à¶¶à¶³à·</string> + <string name="menu_exit">à¶Žà·à¶§à·à¶±à·à¶±</string>  <string name="wizard_details">Orbot à¶Žà·à·à·à¶¶à¶¯ à¶à¶à·à¶žà· à·à·à·à·à¶à¶» </string>

1 0

[orbot/master] Only enable pdnsd debug output when debug logging is enabled
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 93bf7b24b14d74e1b628b3ac544f62b1c2b1ed46 Author: Tad <tad(a)spotco.us> Date: Sat Jul 10 05:14:39 2021 -0400 Only enable pdnsd debug output when debug logging is enabled --- .../torproject/android/service/vpn/OrbotVpnManager.java | 17 ++++++++++++----- orbotservice/src/main/res/values/pdnsd.xml | 1 + 2 files changed, 13 insertions(+), 5 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 7e991ace..447031b7 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 @@ -79,16 +79,18 @@ public class OrbotVpnManager implements Handler.Callback { private final File filePdnsd; private boolean isRestart = false; private final VpnService mService; + private final SharedPreferences prefs; public OrbotVpnManager(VpnService service) { mService = service; + prefs = Prefs.getSharedPrefs(mService.getApplicationContext()); filePdnsd = CustomNativeLoader.loadNativeBinary(service.getApplicationContext(), PDNSD_BIN, new File(service.getFilesDir(), PDNSD_BIN)); Tun2Socks.init(); } - public static File makePdnsdConf(Context context, File fileDir, String torDnsHost, int torDnsPort, String pdnsdHost, int pdnsdPort) throws IOException { + public static File makePdnsdConf(Context context, File fileDir, String torDnsHost, int torDnsPort, String pdnsdHost, int pdnsdPort, String pdnsdDebug) throws IOException { String conf = String.format(context.getString(R.string.pdnsd_conf), - torDnsHost, torDnsPort, fileDir.getAbsolutePath(), pdnsdHost, pdnsdPort); + torDnsHost, torDnsPort, fileDir.getAbsolutePath(), pdnsdHost, pdnsdPort, pdnsdDebug); Log.d(TAG, "pdsnd conf:" + conf); @@ -335,7 +337,6 @@ public class OrbotVpnManager implements Handler.Callback { @TargetApi(Build.VERSION_CODES.LOLLIPOP) private void doLollipopAppRouting(VpnService.Builder builder) throws NameNotFoundException { - SharedPreferences prefs = Prefs.getSharedPrefs(mService.getApplicationContext()); ArrayList<TorifiedApp> apps = TorifiedApp.getApps(mService, prefs); @@ -360,10 +361,16 @@ public class OrbotVpnManager implements Handler.Callback { } private void startDNS(String pdnsPath, String torDnsHost, int torDnsPort, String pdnsdHost, int pdnsdPort) throws IOException, TimeoutException { + String debugEnabledCmd = ""; + String debugEnabledConf = "off"; + if (prefs.getBoolean(PREF_ENABLE_LOGGING, false)) { + debugEnabledCmd = "-g"; + debugEnabledConf = "on"; + } - File fileConf = makePdnsdConf(mService, mService.getFilesDir(), torDnsHost, torDnsPort, pdnsdHost, pdnsdPort); + File fileConf = makePdnsdConf(mService, mService.getFilesDir(), torDnsHost, torDnsPort, pdnsdHost, pdnsdPort, debugEnabledConf); - String[] cmdString = {pdnsPath, "-c", fileConf.toString(), "-g", "-v2"}; + String[] cmdString = {pdnsPath, "-c", fileConf.toString(), debugEnabledCmd, "-v2"}; ProcessBuilder pb = new ProcessBuilder(cmdString); pb.redirectErrorStream(true); Process proc = pb.start(); diff --git a/orbotservice/src/main/res/values/pdnsd.xml b/orbotservice/src/main/res/values/pdnsd.xml index 3b5bb7ad..38b7c5a2 100644 --- a/orbotservice/src/main/res/values/pdnsd.xml +++ b/orbotservice/src/main/res/values/pdnsd.xml @@ -12,6 +12,7 @@ global { timeout=10; daemon=on; pid_file="%3$s/pdnsd.pid"; + debug=%6$d; } server {

1 0

[orbot/master] Fixup 93bf7b24
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit dbaf06be4533e301b0c91d553ec4203e23c2e057 Author: Tad <tad(a)spotco.us> Date: Mon Jul 12 15:58:07 2021 -0400 Fixup 93bf7b24 --- .../main/java/org/torproject/android/service/vpn/OrbotVpnManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ac68020a..9ebc869d 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 @@ -363,7 +363,7 @@ public class OrbotVpnManager implements Handler.Callback { private void startDNS(String pdnsPath, String torDnsHost, int torDnsPort, String pdnsdHost, int pdnsdPort) throws IOException, TimeoutException { String debugEnabledCmd = ""; String debugEnabledConf = "off"; - if (prefs.getBoolean(PREF_ENABLE_LOGGING, false)) { + if (Prefs.useDebugLogging()) { debugEnabledCmd = "-g"; debugEnabledConf = "on"; }

1 0

[orbot/master] Merge pull request #495 from SkewedZeppelin/fixup
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit df0cfc8096f6bc11a30fbff5b448d3c7fadca002 Merge: cb9bd46e dbaf06be Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Tue Jul 13 11:27:53 2021 -0400 Merge pull request #495 from SkewedZeppelin/fixup Fixup 93bf7b24 .../main/java/org/torproject/android/service/vpn/OrbotVpnManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[orbot/master] Merge pull request #493 from weblate/weblate-guardianproject-orbot
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 283b281c2145cd11ecf3e5c3cbd8a413c25e49dc Merge: df0cfc80 443f383a Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Tue Jul 13 11:29:03 2021 -0400 Merge pull request #493 from weblate/weblate-guardianproject-orbot Translations update from Weblate app/src/main/res/values-si-rLK/strings.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)

1 0

[orbot/master] add UI feedback when Snowflake Proxy mode is enabled
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 055900d9d27d1f3d933a40dd26ad1d88f594b758 Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Jul 13 12:11:50 2021 -0400 add UI feedback when Snowflake Proxy mode is enabled --- app/build.gradle | 4 +++- .../org/torproject/android/OrbotMainActivity.java | 16 +++++++++++++++- app/src/main/res/layout/layout_main.xml | 22 +++++++++++++++++++--- app/src/main/res/values/strings.xml | 1 + 4 files changed, 38 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 9b8997bd..1d365f24 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -127,7 +127,7 @@ repositories { dependencies { implementation project(':orbotservice') - implementation 'com.google.android.material:material:1.3.0' + implementation 'com.google.android.material:material:1.4.0' implementation 'pl.bclogic:pulsator4droid:1.0.3' implementation 'com.github.apl-devs:appintro:v4.2.2' implementation project(path: ':appcore') @@ -136,6 +136,8 @@ dependencies { implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0' implementation 'com.android.volley:volley:1.2.0' implementation 'com.github.tladesignz:IPtProxy:1.0.0' + + implementation 'com.github.jetradarmobile:android-snowfall:1.2.1' } // Map for the version code that gives each ABI a value. diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index 4f0143d3..df899d70 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -51,6 +51,8 @@ import androidx.core.view.GravityCompat; import androidx.drawerlayout.widget.DrawerLayout; import androidx.localbroadcastmanager.content.LocalBroadcastManager; +import com.jetradarmobile.snowfall.SnowfallView; + import org.torproject.android.core.Languages; import org.torproject.android.core.LocaleHelper; import org.torproject.android.core.ui.Rotate3dAnimation; @@ -283,6 +285,10 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan sendIntentToService(ACTION_STOP); + SnowfallView sv = findViewById(R.id.snowflake_view); + sv.setVisibility(View.GONE); + sv.stopFalling(); + } private void doLayout() { @@ -945,12 +951,20 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan if (Prefs.beSnowflakeProxy()) { lblStatus.setText(getString(R.string.status_activated)+"\n" - + "❄❄You are a snowflake❄❄"); + + getString(R.string.snowflake_proxy_enabled)); + + SnowfallView sv = findViewById(R.id.snowflake_view); + sv.setVisibility(View.VISIBLE); + sv.restartFalling(); } else { lblStatus.setText(getString(R.string.status_activated)); + SnowfallView sv = findViewById(R.id.snowflake_view); + sv.setVisibility(View.GONE); + sv.stopFalling(); + } diff --git a/app/src/main/res/layout/layout_main.xml b/app/src/main/res/layout/layout_main.xml index e8eba5eb..5cba751e 100644 --- a/app/src/main/res/layout/layout_main.xml +++ b/app/src/main/res/layout/layout_main.xml @@ -15,19 +15,33 @@ android:layout_height="wrap_content" android:minHeight="?attr/actionBarSize" /> + + <FrameLayout + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <com.jetradarmobile.snowfall.SnowfallView + android:id="@+id/snowflake_view" + android:visibility="gone" + android:layout_width="match_parent" + android:layout_height="match_parent"/> + <androidx.drawerlayout.widget.DrawerLayout android:id="@+id/drawer_layout" android:layout_width="match_parent" android:layout_height="match_parent"> <ScrollView - android:layout_width="wrap_content" - android:layout_height="wrap_content"> + + android:layout_width="match_parent" + android:layout_height="match_parent" + > <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content"> + <FrameLayout android:id="@+id/frameMain" android:layout_width="match_parent" @@ -274,11 +288,13 @@ android:layout_height="wrap_content" android:gravity="center" android:orientation="horizontal" + android:minHeight="200dp" android:padding="3dp" /> </LinearLayout> </RelativeLayout> + </ScrollView> @@ -308,7 +324,7 @@ </LinearLayout> </androidx.drawerlayout.widget.DrawerLayout> - + </FrameLayout> </LinearLayout> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 94cfc800..e4ccff7d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -268,6 +268,7 @@ <string name="be_a_snowflake_title_limit">Snowflake Proxy Limits</string> <string name="be_a_snowflake_desc_limit">Only when device is plugged in and on wifi</string> + <string name="snowflake_proxy_enabled">SNOWFLAKE PROXY MODE ENABLED</string> </resources>

1 0

[orbot/master] enable snowflake mode for orbotTV
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 7023cd27e8aaffa3ac36f989ce9bd3b79e1aca50 Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Jul 13 12:28:01 2021 -0400 enable snowflake mode for orbotTV --- app-tv/build.gradle | 3 ++ .../torproject/android/tv/TeeveeMainActivity.java | 50 ++++++++++++++++++++++ app-tv/src/main/res/layout/layout_main.xml | 27 +++++++++++- app-tv/src/main/res/values/strings.xml | 1 + 4 files changed, 79 insertions(+), 2 deletions(-) diff --git a/app-tv/build.gradle b/app-tv/build.gradle index b7121d8b..6d3250b5 100644 --- a/app-tv/build.gradle +++ b/app-tv/build.gradle @@ -137,6 +137,9 @@ dependencies { // leanback-tab is an add-on that provides customized TabLayout to be used as the top navigation bar. implementation "androidx.leanback:leanback-tab:1.1.0-beta01" + //add snowflake fun + implementation 'com.github.jetradarmobile:android-snowfall:1.2.1' + } // Map for the version code that gives each ABI a value. diff --git a/app-tv/src/main/java/org/torproject/android/tv/TeeveeMainActivity.java b/app-tv/src/main/java/org/torproject/android/tv/TeeveeMainActivity.java index 0c0b2d5c..ef76c824 100644 --- a/app-tv/src/main/java/org/torproject/android/tv/TeeveeMainActivity.java +++ b/app-tv/src/main/java/org/torproject/android/tv/TeeveeMainActivity.java @@ -48,6 +48,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.google.zxing.integration.android.IntentIntegrator; import com.google.zxing.integration.android.IntentResult; +import com.jetradarmobile.snowfall.SnowfallView; import net.freehaven.tor.control.TorControlCommands; import org.json.JSONArray; @@ -98,6 +99,7 @@ public class TeeveeMainActivity extends Activity implements OrbotConstants, OnLo private TextView uploadText = null; private TextView mTxtOrbotLog = null; private Switch mBtnVPN = null; + private Switch mBtnSnowflake = null; /* Some tracking bits */ private String torStatus = null; //latest status reported from the tor service private Intent lastStatusIntent; // the last ACTION_STATUS Intent received @@ -326,6 +328,9 @@ public class TeeveeMainActivity extends Activity implements OrbotConstants, OnLo Intent intent = new Intent(TeeveeMainActivity.this, OrbotService.class); stopService(intent); + SnowfallView sv = findViewById(R.id.snowflake_view); + sv.setVisibility(View.GONE); + sv.stopFalling(); } private void doLayout() { @@ -379,6 +384,33 @@ public class TeeveeMainActivity extends Activity implements OrbotConstants, OnLo } }); + mBtnSnowflake = findViewById(R.id.btnSnowflake); + mBtnSnowflake.setFocusable(true); + mBtnSnowflake.setFocusableInTouchMode(true); + + mBtnSnowflake.setOnFocusChangeListener(new View.OnFocusChangeListener() { + @Override + public void onFocusChange(View v, boolean hasFocus) { + + if (hasFocus) + v.setBackgroundColor(getColor(R.color.dark_purple)); + else + { + v.setBackgroundColor(getColor(R.color.med_gray)); + } + } + }); + + + boolean beASnowflake = Prefs.beSnowflakeProxy(); + mBtnSnowflake.setChecked(beASnowflake); + + mBtnSnowflake.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { + @Override + public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + Prefs.setBeSnowflakeProxy(isChecked); + } + }); rv = findViewById(R.id.rv); LinearLayoutManager llm = new LinearLayoutManager(this); @@ -791,6 +823,24 @@ public class TeeveeMainActivity extends Activity implements OrbotConstants, OnLo Log.d(TAG, "autoStartFromIntent finish"); } + if (Prefs.beSnowflakeProxy()) + { + + + SnowfallView sv = findViewById(R.id.snowflake_view); + sv.setVisibility(View.VISIBLE); + sv.restartFalling(); + + } + else + { + SnowfallView sv = findViewById(R.id.snowflake_view); + sv.setVisibility(View.GONE); + sv.stopFalling(); + + + } + } else if (torStatus == TorServiceConstants.STATUS_STARTING) { diff --git a/app-tv/src/main/res/layout/layout_main.xml b/app-tv/src/main/res/layout/layout_main.xml index a6bdd5f2..e4e07441 100644 --- a/app-tv/src/main/res/layout/layout_main.xml +++ b/app-tv/src/main/res/layout/layout_main.xml @@ -5,12 +5,23 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/light_gray" + android:background="@color/light_purple" xmlns:app="http://schemas.android.com/apk/res-auto"> + <FrameLayout + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <com.jetradarmobile.snowfall.SnowfallView + android:id="@+id/snowflake_view" + android:visibility="gone" + android:layout_width="match_parent" + android:layout_height="match_parent"/> + <RelativeLayout android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + > <androidx.recyclerview.widget.RecyclerView @@ -18,6 +29,8 @@ android:layout_height="wrap_content" android:id="@+id/rv" android:layout_marginBottom="60dp" + + /> @@ -90,7 +103,16 @@ android:lines="1" /> + <Switch + android:id="@+id/btnSnowflake" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/snowflake_mode" + android:layout_margin="9dp" + android:layout_gravity="center" + app:switchPadding="3dp" + /> </LinearLayout> @@ -130,6 +152,7 @@ android:fontFamily="monospace" /> </LinearLayout> + </FrameLayout> </LinearLayout> diff --git a/app-tv/src/main/res/values/strings.xml b/app-tv/src/main/res/values/strings.xml index 36d5041a..f4b1ffdb 100644 --- a/app-tv/src/main/res/values/strings.xml +++ b/app-tv/src/main/res/values/strings.xml @@ -244,4 +244,5 @@ <string name="wifi_only">Wifi only</string> <string name="keep_your_apps_from_using_mobile_data">Only allow connection over wifi (coming soon!)</string> <string name="remove">Remove</string> + <string name="snowflake_mode">Snowflake</string> </resources>

1 0