- tor-commits - lists.torproject.org

[orbot/master] update CHANGELOG for 16.4.0-RC-1-tor-0.4.4.6
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 735b9c685f0b29cc51247068ccfcc5fa5844b1e1 Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Jan 12 13:00:04 2021 -0500 update CHANGELOG for 16.4.0-RC-1-tor-0.4.4.6 --- CHANGELOG | 229 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 229 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 0e0e7fad..85725b45 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,232 @@ +/** 16.4.0-RC-1-tor-0.4.4.6 / 12 January 2021 **/ + +(This one's for Karsten, and his life well lived) + +787ca9ac (HEAD -> master) update version code to 1640100100 +da6c6396 (origin/master, origin/HEAD) Merge pull request #426 from weblate/weblate-guardianproject-orbot +9a1e989c Translated using Weblate (French) +9c92c051 Translated using Weblate (Icelandic) +971c922e Merge pull request #425 from weblate/weblate-guardianproject-orbot +82b46da3 Translated using Weblate (Chinese (Simplified)) +6cdd6b16 Translated using Weblate (Ukrainian) +e56c1996 Translated using Weblate (Turkish) +54da4b06 Translated using Weblate (Portuguese (Brazil)) +45ee05ba (newport/master) Merge pull request #423 from eighthave/lint +12991047 fix lint Typo: internett -> Internett +17756860 add .weblate to support wlc command line tool +37a88fd5 fix lint DefaultLocale: ensure that ASCII chars are lowercased +d3bc187d fix lint Typo: Correio Eletrónico ->Correio Eletrônico +d8d61dc5 fix lint Typo: bem vindo -> bem-vindo +16d0253a fix lint Typo: ultimo --> último +5fe955e8 ignore lint SetWorldReadable for the native unpackers +b2c7bf0d enable useful lint checks, which will fail the build +d4423fe9 (public/master) Merge branch 'eighthave-weblate' +8d6d2214 (eighthave-weblate) fix fastlane whitespace +fa6b241d remove translations for source strings that have been remove +5475fa20 standardize ellipses to … using a script +8d5ec6f5 sync gradle wrapper and add download verification +b70a2715 Translated using Weblate (Portuguese) +f5479b2d Translated using Weblate (French) +230c8baf Translated using Weblate (French) +d540aed8 Translated using Weblate (Spanish) +4c5c7782 Translated using Weblate (Spanish) +272b6a18 Translated using Weblate (Lithuanian) +8577ef8f Translated using Weblate (Norwegian Bokmål) +06e730a0 Translated using Weblate (French) +c7c99d13 Translated using Weblate (Turkish) +ec2384ca Translated using Weblate (Icelandic) +30d9a43d Translated using Weblate (Persian) +81bbf864 Translated using Weblate (German) +d63c23f5 Translated using Weblate (Chinese (Simplified)) +b6061833 Translated using Weblate (Ukrainian) +ab311c62 Translated using Weblate (Portuguese (Brazil)) +81fe3e00 Translated using Weblate (Norwegian Bokmål) +c8b11ee6 Translated using Weblate (Hebrew) +e48a9c30 Translated using Weblate (French) +06d34640 Translated using Weblate (Chinese (Simplified)) +38ebf0d2 Translated using Weblate (Portuguese) +727b1844 Translated using Weblate (Portuguese) +ba2bae87 Translated using Weblate (Polish) +6d70f872 Translated using Weblate (Chinese (Simplified)) +7aeb070b Translated using Weblate (Ukrainian) +647d15d4 Translated using Weblate (Ukrainian) +9c2a751b Translated using Weblate (Thai) +564fa95a Translated using Weblate (Ukrainian) +cd74e0ee Translated using Weblate (Ukrainian) +adc7dec8 Translated using Weblate (Portuguese (Brazil)) +4678b77e Translated using Weblate (Portuguese (Brazil)) +01fcf106 Translated using Weblate (Thai) +2221c99f Translated using Weblate (Thai) +4b317e79 Translated using Weblate (Spanish) +f8d64ef6 Translated using Weblate (Spanish) +79a8827b Translated using Weblate (Portuguese (Portugal)) +6c554314 Translated using Weblate (Polish) +7927cba7 Translated using Weblate (Chinese (Simplified)) +70356060 Translated using Weblate (Polish) +29dd1245 Translated using Weblate (Chinese (Simplified)) +fcf51b0f Translated using Weblate (Polish) +5545af95 Translated using Weblate (Bengali (Bangladesh)) +6c9bc83e Translated using Weblate (Bengali (Bangladesh)) +4f9b6d42 Translated using Weblate (Chinese (Simplified)) +a488e623 Translated using Weblate (Chinese (Simplified)) +bbf3601c Translated using Weblate (Portuguese) +83ec252e Translated using Weblate (Portuguese (Portugal)) +3b36db97 Translated using Weblate (Hebrew) +3d70d5ad Translated using Weblate (Russian) +63d884f6 Translated using Weblate (Polish) +48dbe3d9 Translated using Weblate (Polish) +080cd120 Translated using Weblate (Polish) +71ba74b0 Translated using Weblate (Portuguese (Portugal)) +8b665f0f Translated using Weblate (Vietnamese) +9a3fd3b7 Translated using Weblate (Slovak) +ada5c029 Weblate translations +9b58fc70 Translated using Weblate (German) +14c3a77c Translated using Weblate (English (United Kingdom)) +662cf539 Translated using Weblate (Hindi) +02fd9cd0 Translated using Weblate (Hindi) +0dbc3895 Translated using Weblate (Portuguese (Portugal)) +949542b0 Translated using Weblate (Portuguese (Portugal)) +d1a15b8a Translated using Weblate (Bengali) +0d5701bb Translated using Weblate (Bengali) +6743424f Translated using Weblate (Dutch) +2f0222f6 Translated using Weblate (Bengali (Bangladesh)) +eaafc34d Translated using Weblate (Chinese (Simplified)) +90e6e762 Translated using Weblate (Turkish) +3b4f7102 Translated using Weblate (Turkish) +a9314eea Translated using Weblate (Portuguese (Brazil)) +5b488229 Translated using Weblate (Turkish) +04568d59 Translated using Weblate (Portuguese (Brazil)) +04a5463f Translated using Weblate (Croatian) +11e7af0d Translated using Weblate (Portuguese (Brazil)) +82425d2e Translated using Weblate (Turkish) +b843d208 Translated using Weblate (Turkish) +a8b1bf6e Translated using Weblate (Italian) +c6de87f0 Translated using Weblate (Finnish) +5f3087c5 Translated using Weblate (Ukrainian) +c75e612d Translated using Weblate (Icelandic) +452848c1 Translated using Weblate (Slovak) +fdec4705 Translated using Weblate (Ukrainian) +a9eb2a3b Translated using Weblate (Chinese (Simplified)) +9cff48c2 Translated using Weblate (Norwegian Bokmål) +80d0f1c3 Translated using Weblate (Chinese (Simplified)) +c1b49098 Translated using Weblate (Chinese (Simplified)) +4c0afb19 Translated using Weblate (Swedish) +0b7a7a28 Translated using Weblate (Spanish) +ea85dd27 Translated using Weblate (Dutch) +800ff78f Translated using Weblate (Arabic) +7dfe4df7 Translated using Weblate (Italian) +3218c65e Translated using Weblate (Macedonian) +9ab2fc5b Translated using Weblate (Hebrew) +c3c3779a Translated using Weblate (Hindi) +8f8851d8 Translated using Weblate (Hungarian) +82a4aa06 Translated using Weblate (Icelandic) +d7368e62 Translated using Weblate (Catalan) +55a5e2c4 Translated using Weblate (Japanese) +e11fb471 Translated using Weblate (Ukrainian) +1153914f Translated using Weblate (Basque) +336c8442 Translated using Weblate (Greek) +d2e50d10 Translated using Weblate (German) +1516415c Translated using Weblate (Turkish) +39aa4e83 Translated using Weblate (Galician) +5c1a5936 Translated using Weblate (French) +31bb528b Translated using Weblate (Chinese (Simplified)) +0bb0b13f Translated using Weblate (French) +6cb4a0d9 Translated using Weblate (French) +3f0ba8bc Translated using Weblate (French) +ccd15479 Translated using Weblate (French) +42870712 Translated using Weblate (Turkish) +0ee88fff Translated using Weblate (Norwegian Bokmål) +032c4f8b Translated using Weblate (German) +1e4b4182 Translated using Weblate (Portuguese (Portugal)) +285517d8 Translated using Weblate (Icelandic) +828bfde3 Translated using Weblate (Spanish) +f59046b1 Translated using Weblate (Spanish) +3eed58bf Translated using Weblate (Norwegian Bokmål) +a85d358e Translated using Weblate (Norwegian Bokmål) +e9b9e801 Translated using Weblate (Chinese (Simplified)) +0164840f Translated using Weblate (Portuguese (Portugal)) +407abb6e Translated using Weblate (Slovenian) +d67ff1ad Translated using Weblate (Slovak) +8e7acfe4 Translated using Weblate (Korean) +0baf81ef Translated using Weblate (Finnish) +16673346 Translated using Weblate (Persian) +53668053 Translated using Weblate (Swedish) +10948a07 Translated using Weblate (French) +93eaf864 Translated using Weblate (Spanish) +61b4f8ec Translated using Weblate (Dutch) +29c36ffe Translated using Weblate (Indonesian) +1ca1bf3f Translated using Weblate (Arabic) +b3ca0922 Translated using Weblate (Italian) +216f8f10 Translated using Weblate (Amharic) +4330d59a Translated using Weblate (Swahili) +6de2a091 Translated using Weblate (Afrikaans) +6daa2e6b Translated using Weblate (Polish) +cbe08863 Translated using Weblate (Hindi) +10e9b8d7 Translated using Weblate (Hungarian) +c4777493 Translated using Weblate (Croatian) +b15696e0 Translated using Weblate (Vietnamese) +cc5de0e1 Translated using Weblate (Czech) +3b568069 Translated using Weblate (Catalan) +8e26dbd8 Translated using Weblate (Japanese) +7a7cfc77 Translated using Weblate (Ukrainian) +833ef7d8 Translated using Weblate (Bulgarian) +b7dba6bf Translated using Weblate (Romanian) +d3a12f11 Translated using Weblate (Russian) +80b617c4 Translated using Weblate (Estonian) +c2ef8d65 Translated using Weblate (Greek) +3ab34a19 Translated using Weblate (German) +31ad21c0 Translated using Weblate (Portuguese (Brazil)) +cffecb5f Translated using Weblate (Thai) +8c98a79a Translated using Weblate (Lithuanian) +0bd88853 Translated using Weblate (Turkish) +d1a33ef4 Translated using Weblate (Norwegian Bokmål) +41817951 Translated using Weblate (Polish) +f03ba787 Translated using Weblate (Catalan) +4f025bda Translated using Weblate (German) +16ffdfaa Translated using Weblate (German) +6dad0b00 Translated using Weblate (German) +30e073c9 Translated using Weblate (German) +3eded015 Translated using Weblate (German) +4e3360e8 Translated using Weblate (Polish) +ac881cb5 Translated using Weblate (Norwegian Bokmål) +3d519707 Translated using Weblate (Norwegian Bokmål) +9978127f Translated using Weblate (Portuguese (Portugal)) +36881e8e Translated using Weblate (Italian) +b9facd2e Translated using Weblate (Turkish) +2f684889 Translated using Weblate (Portuguese (Portugal)) +beb4b254 Translated using Weblate (Italian) +a3f7ff7e Translated using Weblate (Japanese) +4ba23d7e Translated using Weblate (Turkish) +f72b993f Translated using Weblate (Spanish) +8a109a3d Translated using Weblate (Swedish) +1f0c7e3c Translated using Weblate (Swedish) +990ceb5a Translated using Weblate (German) +328ad53c Merge branch 'tladesignz-master' +e7f0feb6 (tladesignz-master) Fixed meek server URL to reach MOAT service. +16010aa0 Update to latest IPtProxy, which fixes cert issues with the meek-azure bridge. +f000d58b Fixed compiler warnings. +cb5f1c4e Issue #370: Improved MOAT implementation. Use Meek directly instead of via Tor with the newly available IPtProxy. +d0aa2e01 Update to latest Android API 30. Update dependencies. +a11e73a9 Merge remote-tracking branch 'upstream/master' +eeb31422 fix "try" typo from merge +9be60c28 Merge branch 'master' of github.com:guardianproject/orbot +47b7b805 Merge branch 'dev_snowflake_new' +626a341d stopTor just invokes stopTorAsync so i got rid of it +4a2e8b14 (origin/dev_snowflake_new, dev_snowflake_new) more improvements to bridge PT init logic +b2fb0e74 clean-up logic for setting PT bridge lines +bbe63e4e (dev_snowflake) enable selection of Snowflake from bridge wizard activity +f675a7f1 enable start/stop of Snowflake client +fa18797f add snowflake entry to built in bridges +051a5791 remove local IPtProxy; use jitpack dependency instead +823f4646 Merge branch 'master' of github.com:guardianproject/orbot +7e7007e3 Merge pull request #417 from bitmold/correct_bandwidth_labels +590d440d Correct data-rate units, Fixes #378 +f9d5fcf5 Removed very outdated text/graphics from "docs" folder. Moved svg icon from root of repo into docs folder +cabca2a7 Removed outdated repository files, made README a markdown file. It would make sense to eventually populate README.md with instructions about how to use the app, how to get involved with the project etc +4a5aad92 Merge remote-tracking branch 'upstream/master' + + + /** 16.3.3-RC-1-tor-0.4.3.6 / 20 November 2020 **/ daa2e7b4 (HEAD -> master) update version code to 1633300100 e88c84aa (origin/master, origin/HEAD) remove quotes from string

1 0

[orbot/master] closes #424
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 3ea17c5befae9b4fb72fc602e908308633b936b2 Author: bim <dsnake(a)protonmail.com> Date: Thu Jan 28 11:44:56 2021 -0500 closes #424 --- .../torproject/android/ui/hiddenservices/backup/BackupUtils.java | 6 ++---- .../android/ui/hiddenservices/dialogs/AddCookieDialog.java | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java index e67a8113..a10dd7ff 100644 --- a/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java +++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java @@ -47,10 +47,8 @@ public class BackupUtils { return zipFile.getPath(); } - // returns true if domain is v2 onion address or v3 onion address - public static boolean isOnionAddressValid(String onionToTest) { - if (onionToTest.matches("([a-z0-9]{16}).onion")) return true; - return onionToTest.matches("([a-z0-9]{56}).onion"); + public static boolean isV2OnionAddressValid(String onionToTest) { + return onionToTest.matches("([a-z0-9]{16}).onion"); } private String[] createFilesForZipping(int port) { diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/AddCookieDialog.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/AddCookieDialog.java index b00c29db..a0e584c4 100644 --- a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/AddCookieDialog.java +++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/AddCookieDialog.java @@ -76,7 +76,7 @@ public class AddCookieDialog extends DialogFragment { String onion = etOnion.getText().toString(); String cookie = etCookie.getText().toString(); if (TextUtils.isEmpty(onion.trim()) || TextUtils.isEmpty(cookie.trim())) return false; - return BackupUtils.isOnionAddressValid(onion); + return BackupUtils.isV2OnionAddressValid(onion); } private void saveData(String domain, String cookie) {

1 0

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

22 Dec '21

commit ed6a33790e3b36f2998567a9174ce7cfd8bbefcf Author: n8fr8 <nathan(a)guardianproject.info> Date: Thu Jan 14 12:41:50 2021 -0500 update fastlane changelog for 1640300200 --- fastlane/metadata/android/en-US/changelogs/1640300200.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fastlane/metadata/android/en-US/changelogs/1640300200.txt b/fastlane/metadata/android/en-US/changelogs/1640300200.txt new file mode 100644 index 00000000..9bb69ac0 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/1640300200.txt @@ -0,0 +1,4 @@ +* added Snowflake bridge support +* updated Obfs4 and Meek bridge support +* improved speed of "Request new bridges" feature +* Update Tor to 0.4.4.6

1 0

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

22 Dec '21

commit db7dd6d5afb6bc4d1c15abd66d8bda5b2854cbf9 Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Jan 18 21:20:35 2021 -0500 update to version code 1640300301 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 2b0718b5..e5d6ca08 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -81,7 +81,7 @@ android { minSdkVersion 16 applicationId 'org.torproject.android' targetSdkVersion 29 - versionCode 1640300201 + versionCode 1640300301 versionName getVersionName() archivesBaseName = "Orbot-$versionName"

1 0

[orbot/master] Backup/Restore for V3 Working on Legacy Orbots with WRITE_EXTERNAL_STORAGE
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit e4a5d02f3cc3205a6629cb0758d6a9b255be9183 Author: bim <dsnake(a)protonmail.com> Date: Fri Nov 27 14:19:49 2020 -0500 Backup/Restore for V3 Working on Legacy Orbots with WRITE_EXTERNAL_STORAGE --- .../ui/hiddenservices/HiddenServicesActivity.java | 2 +- .../ui/hiddenservices/backup/BackupUtils.java | 12 ++++++++++ .../ui/v3onionservice/OnionServicesActivity.java | 26 ++++++++++++++++++++-- 3 files changed, 37 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java index 7a943093..886bd27d 100644 --- a/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java +++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java @@ -120,7 +120,7 @@ public class HiddenServicesActivity extends AppCompatActivity { new AlertDialog.Builder(this) .setTitle(R.string.restore_backup) - .setItems(fileNames, (dialog, which) -> new BackupUtils(HiddenServicesActivity.this).restoreZipBackupV2Legacy(files[which])) + .setItems(fileNames, (dialog, which) -> new BackupUtils(this).restoreZipBackupV2Legacy(files[which])) .show(); } diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java index 96ffdf5c..e81f73a9 100644 --- a/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java +++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java @@ -270,6 +270,18 @@ public class BackupUtils { Toast.makeText(mContext, R.string.error, Toast.LENGTH_LONG).show(); } + public void restoreZipBackupV3Legacy(File zipFile) { + String backupName = zipFile.getName(); + ZipIt zip = new ZipIt(null, null, mResolver); + String v3Dir = backupName.substring(0, backupName.lastIndexOf('.')); + File v3Path = new File(getV3BasePath().getAbsolutePath(), v3Dir); + if (zip.unzipLegacy(v3Path.getAbsolutePath(), zipFile)) + extractConfigFromUnzippedBackupV3(backupName); + else + Toast.makeText(mContext, R.string.error, Toast.LENGTH_LONG).show(); + } + + public void restoreZipBackupV2(Uri zipUri) { Cursor returnCursor = mResolver.query(zipUri, null, null, null, null); int nameIndex = returnCursor.getColumnIndex(OpenableColumns.DISPLAY_NAME); diff --git a/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServicesActivity.java b/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServicesActivity.java index eed43a71..a51ef37c 100644 --- a/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServicesActivity.java +++ b/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServicesActivity.java @@ -11,7 +11,9 @@ import android.view.Menu; import android.view.MenuItem; import android.widget.ListView; import android.widget.RadioButton; +import android.widget.Toast; +import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; @@ -22,6 +24,8 @@ import org.torproject.android.core.DiskUtils; import org.torproject.android.core.LocaleHelper; import org.torproject.android.ui.hiddenservices.backup.BackupUtils; +import java.io.File; + public class OnionServicesActivity extends AppCompatActivity { static final String BUNDLE_KEY_ID = "id", BUNDLE_KEY_PORT = "port", BUNDLE_KEY_DOMAIN = "domain"; @@ -78,13 +82,31 @@ public class OnionServicesActivity extends AppCompatActivity { if (DiskUtils.supportsStorageAccessFramework()) { Intent readFileIntent = DiskUtils.createReadFileIntent("application/zip"); startActivityForResult(readFileIntent, REQUEST_CODE_READ_ZIP_BACKUP); - } else { // 16, 17, 18 - + } else { // APIs 16, 17, 18 + doRestoreLegacy(); } } return super.onOptionsItemSelected(item); } + private void doRestoreLegacy() { // APIs 16, 17, 18 + File backupDir = DiskUtils.getOrCreateLegacyBackupDir(getString(R.string.app_name)); + File[] files = backupDir.listFiles((dir, name) -> name.toLowerCase().endsWith(".zip")); + if (files == null) return; + if (files.length == 0) { + Toast.makeText(this, R.string.create_a_backup_first, Toast.LENGTH_LONG).show(); + return; + } + + CharSequence[] fileNames = new CharSequence[files.length]; + for (int i = 0; i < files.length; i++) fileNames[i] = files[i].getName(); + + new AlertDialog.Builder(this) + .setTitle(R.string.restore_backup) + .setItems(fileNames, (dialog, which) -> new BackupUtils(this).restoreZipBackupV3Legacy(files[which])) + .show(); + } + @Override protected void onActivityResult(int requestCode, int result, Intent data) { super.onActivityResult(requestCode, result, data);

1 0

[orbot/master] small activity label cleanups (less java)
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 6057148cec699c1c68126adc8c5f409f0f25f984 Author: bim <dsnake(a)protonmail.com> Date: Wed Feb 3 10:54:23 2021 -0500 small activity label cleanups (less java) --- app/src/main/AndroidManifest.xml | 11 +++++++---- .../java/org/torproject/android/ui/AppManagerActivity.java | 1 - .../android/ui/onboarding/BridgeWizardActivity.java | 2 -- .../android/ui/onboarding/CustomBridgesActivity.java | 2 -- .../org/torproject/android/ui/onboarding/MoatActivity.java | 2 -- 5 files changed, 7 insertions(+), 11 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a6afb24c..a9db7611 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -76,12 +76,11 @@ <activity android:name=".core.ui.SettingsPreferencesActivity" - android:label="@string/app_name" android:theme="@style/Theme.AppCompat" /> <activity android:name=".ui.AppManagerActivity" - android:label="@string/app_name" + android:label="@string/apps_mode" android:theme="@style/Theme.AppCompat" /> <activity @@ -108,12 +107,16 @@ <activity android:name=".ui.onboarding.BridgeWizardActivity" - android:configChanges="orientation|screenSize" /> + android:configChanges="orientation|screenSize" + android:label="@string/bridges" /> <activity + android:label="@string/request_bridges" android:name=".ui.onboarding.MoatActivity" android:windowSoftInputMode="stateHidden" /> - <activity android:name=".ui.onboarding.CustomBridgesActivity" /> + <activity + android:name=".ui.onboarding.CustomBridgesActivity" + android:label="@string/use_custom_bridges" /> <provider android:name=".ui.hiddenservices.providers.HSContentProvider" diff --git a/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java index 5d2493a4..9ad0a09f 100644 --- a/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java +++ b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java @@ -66,7 +66,6 @@ public class AppManagerActivity extends AppCompatActivity implements OnClickList pMgr = getPackageManager(); this.setContentView(R.layout.layout_apps); - setTitle(R.string.apps_mode); getSupportActionBar().setDisplayHomeAsUpEnabled(true); listApps = findViewById(R.id.applistview); progressBar = findViewById(R.id.progressBar); diff --git a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java index 465d8c58..2f29300d 100644 --- a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java +++ b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java @@ -94,8 +94,6 @@ public class BridgeWizardActivity extends AppCompatActivity { mTvStatus.setText(savedInstanceState.getString(BUNDLE_KEY_TV_STATUS_TEXT, "")); } - setTitle(getString(R.string.bridges)); - findViewById(R.id.btnMoat).setOnClickListener(v -> { cancelHostTestIfRunning(); startActivityForResult(new Intent(BridgeWizardActivity.this, MoatActivity.class), MOAT_REQUEST_CODE); diff --git a/app/src/main/java/org/torproject/android/ui/onboarding/CustomBridgesActivity.java b/app/src/main/java/org/torproject/android/ui/onboarding/CustomBridgesActivity.java index 6d7817df..a8eeb30f 100644 --- a/app/src/main/java/org/torproject/android/ui/onboarding/CustomBridgesActivity.java +++ b/app/src/main/java/org/torproject/android/ui/onboarding/CustomBridgesActivity.java @@ -73,8 +73,6 @@ public class CustomBridgesActivity extends AppCompatActivity implements View.OnC actionBar.setDisplayHomeAsUpEnabled(true); } - setTitle(getString(R.string.use_custom_bridges)); - ((TextView) findViewById(R.id.tvDescription)).setText(getString(R.string.in_a_browser, URL_TOR_BRIDGES)); findViewById(R.id.btCopyUrl).setOnClickListener(this); diff --git a/app/src/main/java/org/torproject/android/ui/onboarding/MoatActivity.java b/app/src/main/java/org/torproject/android/ui/onboarding/MoatActivity.java index 7431965d..756a9f5c 100644 --- a/app/src/main/java/org/torproject/android/ui/onboarding/MoatActivity.java +++ b/app/src/main/java/org/torproject/android/ui/onboarding/MoatActivity.java @@ -120,8 +120,6 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe actionBar.setDisplayHomeAsUpEnabled(true); } - setTitle(getString(R.string.request_bridges)); - mIvCaptcha = findViewById(R.id.captchaIv); mProgressBar = findViewById(R.id.progressBar); mEtSolution = findViewById(R.id.solutionEt);

1 0

[orbot/master] increment version code to republish to play
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit de3599c1c85b27eee09bb8124a3885f5e784dfc9 Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Jan 18 21:16:27 2021 -0500 increment version code to republish to play --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index ad68c44c..2b0718b5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -81,7 +81,7 @@ android { minSdkVersion 16 applicationId 'org.torproject.android' targetSdkVersion 29 - versionCode 1640300200 + versionCode 1640300201 versionName getVersionName() archivesBaseName = "Orbot-$versionName"

1 0

[orbot/master] updated version code 1640300200
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit d9fe43452951e0abb8c3aef5a0217020972e6701 Author: n8fr8 <nathan(a)guardianproject.info> Date: Thu Jan 14 12:39:54 2021 -0500 updated version code 1640300200 --- app/build.gradle | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a5a79524..ad68c44c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -81,8 +81,7 @@ android { minSdkVersion 16 applicationId 'org.torproject.android' targetSdkVersion 29 - versionCode 1633300100 - versionCode 1640100100 + versionCode 1640300200 versionName getVersionName() archivesBaseName = "Orbot-$versionName"

1 0

[orbot/master] small bug where 'snowflake' can appear in a field to paste custom bridge config
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 5bf2ba8941740b836d38eb801259d23c014096dd Author: bim <dsnake(a)protonmail.com> Date: Wed Feb 3 10:43:02 2021 -0500 small bug where 'snowflake' can appear in a field to paste custom bridge config --- .../torproject/android/ui/onboarding/CustomBridgesActivity.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/torproject/android/ui/onboarding/CustomBridgesActivity.java b/app/src/main/java/org/torproject/android/ui/onboarding/CustomBridgesActivity.java index f34a49cc..6d7817df 100644 --- a/app/src/main/java/org/torproject/android/ui/onboarding/CustomBridgesActivity.java +++ b/app/src/main/java/org/torproject/android/ui/onboarding/CustomBridgesActivity.java @@ -80,7 +80,7 @@ public class CustomBridgesActivity extends AppCompatActivity implements View.OnC findViewById(R.id.btCopyUrl).setOnClickListener(this); String bridges = Prefs.getBridgesList().trim(); - if (!Prefs.bridgesEnabled() || bridges.equals("obfs4") || bridges.equals("meek")) { + if (!Prefs.bridgesEnabled() || userHasSetPreconfiguredBridge(bridges)) { bridges = null; } @@ -90,9 +90,7 @@ public class CustomBridgesActivity extends AppCompatActivity implements View.OnC mEtPastedBridges.addTextChangedListener(this); findViewById(R.id.btScanQr).setOnClickListener(this); - findViewById(R.id.btShareQr).setOnClickListener(this); - findViewById(R.id.btEmail).setOnClickListener(this); } @@ -224,4 +222,9 @@ public class CustomBridgesActivity extends AppCompatActivity implements View.OnC intent.setAction(TorServiceConstants.CMD_SIGNAL_HUP); startService(intent); } + + private static boolean userHasSetPreconfiguredBridge(String bridges) { + if (bridges == null) return false; + return bridges.equals("obfs4") || bridges.equals("meek") || bridges.equals("snowflake"); + } }

1 0

[orbot/master] Battery permissions on v3 services
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 85dba3bf440f68ba1036dda596f4adceea1b5d94 Author: bim <dsnake(a)protonmail.com> Date: Sat Nov 28 12:46:28 2020 -0500 Battery permissions on v3 services --- .../android/ui/v3onionservice/OnionServicesActivity.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServicesActivity.java b/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServicesActivity.java index ba06b7c0..64a014e4 100644 --- a/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServicesActivity.java +++ b/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServicesActivity.java @@ -26,6 +26,7 @@ import org.torproject.android.core.DiskUtils; import org.torproject.android.core.LocaleHelper; import org.torproject.android.ui.hiddenservices.backup.BackupUtils; import org.torproject.android.ui.hiddenservices.backup.ZipUtilities; +import org.torproject.android.ui.hiddenservices.permissions.PermissionManager; import java.io.File; @@ -161,8 +162,16 @@ public class OnionServicesActivity extends AppCompatActivity { @Override public void onChange(boolean selfChange) { - mAdapter.changeCursor(mContentResolver.query(OnionServiceContentProvider.CONTENT_URI, OnionServiceContentProvider.PROJECTION, BASE_WHERE_SELECTION_CLAUSE + '1', null, null)); - // todo battery optimization stuff if lollipop or higher and running onion services + filterServices(radioShowUserServices.isChecked()); // updates adapter + if (!PermissionManager.isLollipopOrHigher()) return; + Cursor activeServices = mContentResolver.query(OnionServiceContentProvider.CONTENT_URI, OnionServiceContentProvider.PROJECTION, + OnionServiceContentProvider.OnionService.ENABLED + "=1", null, null); + if (activeServices == null) return; + if (activeServices.getCount() > 0) + PermissionManager.requestBatteryPermissions(OnionServicesActivity.this, getApplicationContext()); + else + PermissionManager.requestDropBatteryPermissions(OnionServicesActivity.this, getApplicationContext()); + activeServices.close(); } }

1 0