tor-commits December 2021

tor-commits@lists.torproject.org

15 participants
1464 discussions

[orbot/master] lower threshold for showing bandwidth to 0 as smaller bw events were being missed
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 8e5dd0ff976712c7612681d1f7f3408559717f3c Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed Dec 22 10:03:07 2021 -0500 lower threshold for showing bandwidth to 0 as smaller bw events were being missed - data display looked like it was often inactive --- .../src/main/java/org/torproject/android/service/TorEventHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java b/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java index 0b49b461..9cc48499 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java @@ -16,7 +16,7 @@ import java.util.StringTokenizer; */ public class TorEventHandler implements EventHandler, TorServiceConstants { - private final static int BW_THRESDHOLD = 10000; + private final static int BW_THRESDHOLD = 0; private final OrbotService mService; private long lastRead = -1; private long lastWritten = -1;

1 0

[orbot/master] don't always expect a status with every log update; clean up other UI handling of status and log
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit bb0531a0e68155f8be9594a6c45458939ff4641e Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed Dec 22 10:01:15 2021 -0500 don't always expect a status with every log update; clean up other UI handling of status and log --- .../org/torproject/android/OrbotMainActivity.java | 155 +++++++++++---------- 1 file changed, 80 insertions(+), 75 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index 86043921..d4925e84 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -150,6 +150,7 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan @Override public void onReceive(Context context, Intent intent) { String action = intent.getAction(); + String status = intent.getStringExtra(TorServiceConstants.EXTRA_STATUS); if (action == null) return; @@ -157,7 +158,10 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan case TorServiceConstants.LOCAL_ACTION_LOG: { Message msg = mStatusUpdateHandler.obtainMessage(STATUS_UPDATE); msg.obj = intent.getStringExtra(TorServiceConstants.LOCAL_EXTRA_LOG); - msg.getData().putString("status", intent.getStringExtra(TorServiceConstants.EXTRA_STATUS)); + + if (!TextUtils.isEmpty(status)) + msg.getData().putString("status", status); + mStatusUpdateHandler.sendMessage(msg); break; @@ -173,7 +177,9 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan msg.getData().putLong("lastWritten", lastWritten); msg.getData().putLong("totalWritten", totalWritten); msg.getData().putLong("totalRead", totalRead); - msg.getData().putString("status", intent.getStringExtra(TorServiceConstants.EXTRA_STATUS)); + + if (!TextUtils.isEmpty(status)) + msg.getData().putString("status", status); mStatusUpdateHandler.sendMessage(msg); @@ -203,7 +209,9 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan lastStatusIntent = intent; Message msg = mStatusUpdateHandler.obtainMessage(STATUS_UPDATE); - msg.getData().putString("status", intent.getStringExtra(TorServiceConstants.EXTRA_STATUS)); + + if (!TextUtils.isEmpty(status)) + msg.getData().putString("status", status); mStatusUpdateHandler.sendMessage(msg); break; @@ -214,6 +222,9 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan msg.getData().putInt("socks", intent.getIntExtra(OrbotService.EXTRA_SOCKS_PROXY_PORT, -1)); msg.getData().putInt("http", intent.getIntExtra(OrbotService.EXTRA_HTTP_PROXY_PORT, -1)); + if (!TextUtils.isEmpty(status)) + msg.getData().putString("status", status); + mStatusUpdateHandler.sendMessage(msg); break; @@ -291,7 +302,7 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan if (mBtnVPN.isChecked()) sendIntentToService(ACTION_STOP_VPN); sendIntentToService(ACTION_STOP); } - else if (torStatus.equals(STATUS_STARTING)) { + else if (torStatus.equals(STATUS_STARTING)||torStatus.equals(STATUS_STOPPING)) { if (!waitingToStop) { waitingToStop = true; @@ -324,6 +335,7 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan lblStatus = findViewById(R.id.lblStatus); lblStatus.setOnClickListener(v -> mDrawer.openDrawer(GravityCompat.END)); + lblStatus.setText(String.format("Tor v%s", OrbotService.BINARY_TOR_VERSION)); lblPorts = findViewById(R.id.lblPorts); @@ -745,7 +757,7 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan requestTorStatus(); if (torStatus == null) - updateStatus("", TorServiceConstants.STATUS_STOPPING); + updateStatus("", STATUS_OFF); else updateStatus(null, torStatus); @@ -807,7 +819,7 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan * Update the layout_main UI based on the status of {@link OrbotService}. * {@code torServiceMsg} must never be {@code null} */ - private synchronized void updateStatus(String torServiceMsg, String newTorStatus) { + private void updateStatus(String torServiceMsg, String newTorStatus) { if (!TextUtils.isEmpty(torServiceMsg)) { if (torServiceMsg.contains(TorServiceConstants.LOG_NOTICE_HEADER)) { @@ -817,105 +829,98 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan mTxtOrbotLog.append(torServiceMsg + '\n'); } - if (torStatus == null || (newTorStatus != null && newTorStatus.equals(torStatus))) { - torStatus = newTorStatus; - return; - } else { - torStatus = newTorStatus; - } - - if (torStatus == null) { - return; - } - - switch (torStatus) { - case TorServiceConstants.STATUS_ON: + if (!TextUtils.isEmpty(newTorStatus)) { + if (torStatus == null || (newTorStatus != null && newTorStatus.equals(torStatus))) { + torStatus = newTorStatus; + return; + } else { + torStatus = newTorStatus; + } - imgStatus.setImageResource(R.drawable.toron); - mBtnStart.setText(R.string.menu_stop); - mPulsator.stop(); + switch (torStatus) { + case TorServiceConstants.STATUS_ON: - if (Prefs.beSnowflakeProxy()) - { - lblStatus.setText(getString(R.string.status_activated)+"\n" - + getString(R.string.snowflake_proxy_enabled)); + imgStatus.setImageResource(R.drawable.toron); - SnowfallView sv = findViewById(R.id.snowflake_view); - sv.setVisibility(View.VISIBLE); - sv.restartFalling(); + mBtnStart.setText(R.string.menu_stop); + mPulsator.stop(); - } - else - { - lblStatus.setText(getString(R.string.status_activated)); - SnowfallView sv = findViewById(R.id.snowflake_view); - sv.setVisibility(View.GONE); - sv.stopFalling(); + if (Prefs.beSnowflakeProxy()) { + lblStatus.setText(getString(R.string.status_activated) + "\n" + + 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(); + } - // if new onion hostnames are generated, update local DB - sendIntentToService(TorServiceConstants.ACTION_UPDATE_ONION_NAMES); + // if new onion hostnames are generated, update local DB + sendIntentToService(TorServiceConstants.ACTION_UPDATE_ONION_NAMES); + if (autoStartFromIntent) { + autoStartFromIntent = false; + Intent resultIntent = lastStatusIntent; - if (autoStartFromIntent) { - autoStartFromIntent = false; - Intent resultIntent = lastStatusIntent; + if (resultIntent == null) + resultIntent = new Intent(ACTION_START); - if (resultIntent == null) - resultIntent = new Intent(ACTION_START); + resultIntent.putExtra( + TorServiceConstants.EXTRA_STATUS, + torStatus == null ? TorServiceConstants.STATUS_OFF : torStatus + ); - resultIntent.putExtra( - TorServiceConstants.EXTRA_STATUS, - torStatus == null ? TorServiceConstants.STATUS_OFF : torStatus - ); + setResult(RESULT_OK, resultIntent); - setResult(RESULT_OK, resultIntent); + finish(); + } - finish(); - } + break; - break; + case TorServiceConstants.STATUS_STARTING: - case TorServiceConstants.STATUS_STARTING: + imgStatus.setImageResource(R.drawable.torstarting); - imgStatus.setImageResource(R.drawable.torstarting); + if (torServiceMsg != null) { + if (torServiceMsg.contains(TorServiceConstants.LOG_NOTICE_BOOTSTRAPPED)) + lblStatus.setText(torServiceMsg); + } else { + lblStatus.setText(getString(R.string.status_starting_up)); + } - if (torServiceMsg != null) { - if (torServiceMsg.contains(TorServiceConstants.LOG_NOTICE_BOOTSTRAPPED)) - lblStatus.setText(torServiceMsg); - } else { - lblStatus.setText(getString(R.string.status_starting_up)); - } + mBtnStart.setText("..."); - mBtnStart.setText("..."); + break; - break; + case TorServiceConstants.STATUS_STOPPING: - case TorServiceConstants.STATUS_STOPPING: + if (torServiceMsg != null && torServiceMsg.contains(TorServiceConstants.LOG_NOTICE_HEADER)) + lblStatus.setText(torServiceMsg); - if (torServiceMsg != null && torServiceMsg.contains(TorServiceConstants.LOG_NOTICE_HEADER)) + imgStatus.setImageResource(R.drawable.torstarting); lblStatus.setText(torServiceMsg); - imgStatus.setImageResource(R.drawable.torstarting); - lblStatus.setText(torServiceMsg); - - break; + break; - case TorServiceConstants.STATUS_OFF: + case TorServiceConstants.STATUS_OFF: - imgStatus.setImageResource(R.drawable.toroff); - lblStatus.setText(String.format("Tor v%s", OrbotService.BINARY_TOR_VERSION)); - mBtnStart.setText(R.string.menu_start); - mPulsator.start(); - resetBandwidthStatTextviews(); + imgStatus.setImageResource(R.drawable.toroff); + lblStatus.setText(String.format("Tor v%s", OrbotService.BINARY_TOR_VERSION)); + mBtnStart.setText(R.string.menu_start); + mPulsator.start(); + resetBandwidthStatTextviews(); - break; + break; + } } }

1 0

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

22 Dec '21

commit 5a1e7a9c0b24ca3c40cf33412b4d68610e340cc9 Merge: c208274e f1f4750c Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed Dec 22 16:49:46 2021 -0500 Merge branch 'master' of github.com:guardianproject/orbot .../android/ui/v3onionservice/OnionServiceDeleteDialogFragment.java | 4 +++- .../src/main/java/org/torproject/android/service/OrbotService.java | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-)

1 0

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

22 Dec '21

commit f1f4750cca067841c4281f46162e8bdcfad7d51c Merge: 06e2b8d4 5792d666 Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Wed Dec 22 10:09:10 2021 -0500 Merge pull request #562 from guardianproject/empty_notification Fixes #398 empty notification .../src/main/java/org/torproject/android/service/OrbotService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

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

22 Dec '21

commit 6643573104df605d849446a232fd9e1fa5dcb9b9 Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed Dec 22 16:54:23 2021 -0500 update changelog --- CHANGELOG | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index e209b446..88bd2ce3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,78 @@ +/** 16.5.2-RC-3 22 Dec 2021 **/ + +7b68f362 (HEAD -> master) update to 1652200300 +5a1e7a9c (origin/master, origin/HEAD) Merge branch 'master' of github.com:guardianproject/orbot +f1f4750c Merge pull request #562 from guardianproject/empty_notification +c208274e (origin/dev_fix_service_leak, dev_fix_service_leak) update tor-android to 0.4.6.9 +69429002 don't always send status with every log entry and update - also slightly change where "stopSelf()" is called in stopTor +8e5dd0ff lower threshold for showing bandwidth to 0 as smaller bw events were being missed - data display looked like it was often inactive +594f2976 need to differentiate OrbotService status messages from TorService as it was confusing OrbotMain - collision between status action namespace +bb0531a0 don't always expect a status with every log update; clean up other UI handling of status and log +5792d666 (origin/empty_notification) Fixes #398 empty notification +f47aff18 unbinding from tor service will stop tor; don't need to use conn to do it - also removed old commented out code - also removed making conn and other vars null on service issues, not necessary +06e2b8d4 Small bug with deleting unconfigured v3s +da416283 conn may be null, but service may be bound, so make sure it is unbound here +ec7200b7 (tag: 16.5.2-RC-2-tor.0.4.6.8) update to 1652200200 +c7200b7 (HEAD -> master) update to 1652200200 +816c5825 (origin/master, origin/HEAD) disable MOAT and Snowflake on SDK < 28 since they don't currently work +03470d46 simplify snowflake strings +06851dd1 register local v3 name receiver +9770ce87 removed new translations for strings that were removed from orbot +b2001961 add comment about how snowlfake bridges may sometimes take a minute +1ed8efd0 Merge pull request #558 from guardianproject/tor-android-0.4.6.8 +dd723e49 (tag: 16.5.2-RC-1-tor.0.4.6.8, ghdev/master) update to 1652200100 +0ef3500e handle new local action for v3 onion names updating; also don't allow rapid stop/starts to avoid crashes +ac3d1baf move v3 onion name status to a "local action" instead +1d47994f update tor to 0.4.6.8w +5615b751 Merge pull request #542 from weblate/weblate-guardianproject-orbot +172b0234 Merge branch 'master' into weblate-guardianproject-orbot +65640ebb Merge branch 'external_app_request_v3' +1682f7cb (external_app_request_v3) if someone stops during starting, conn could be null +0e59b55c Merge branch 'master' into external_app_request_v3 +03ef5ef9 Merge branch 'ipt_1_3_0' +06453716 (origin/tor-android-0.4.6.8, tor-android-0.4.6.8) tor-android 0.4.6.7 -> 0.4.6.8 +d8f6ebb3 (origin/external_app_request_v3) fixed status bug reported in #556 +0c77144e (origin/ipt_1_3_0, ipt_1_3_0) add support for snowflake with amp rendezvous +bdee3957 removed faulty bridge wizard from bridges page...paving the way to add a new bridge here... +50ef12d3 Snowflake proxy uses defaults in IPtProxy, displays cute toast when user connects. activity text for snowflake proxy isn't in ALL CAPS anymore +843effd9 Snowflake animations had a bug; they'd appear if tor connects and the pref is set to true even if proxy wasn't enabled (because bridges were...) +0123927a Interface for #540 +798ef6eb Experimental show snowflake toast when client connects to proxy... +c984dcc5 Closes #554, IPtProxy 1.3.0 added +34f4de6d Merge pull request #551 from guardianproject/fix_549_no_snowflake_and_bridge_ui +9cf66800 for now, disable snowflake proxy limiting +1abfd73f Translated using Weblate (Vietnamese) +3d8182ec Translated using Weblate (Chinese (Simplified)) +32753b41 Translated using Weblate (Ukrainian) +2f23db85 Translated using Weblate (Turkish) +41cf5d37 Translated using Weblate (Portuguese (Brazil)) +5bd6165d Translated using Weblate (Lithuanian) +57f2f7fd Translated using Weblate (Persian) +a8057ced Translated using Weblate (Vietnamese) +171ceac1 Translated using Weblate (Indonesian) +a1d04487 made setEnabled() call null safe +3fbda179 removed unused v2 constant from OrbotService +2637e1f0 return val of pluggableTransportsInstall always the same + never used +2cc79c18 Fixes #549 snowflake preferences are greyed on when bridges are in use also added string res for snowflake proxy category so it can be localized +f989be3e removed unused FileProvider.xml mentioned in #540 +afc97fe9 Update BUILD.md +8e5cc3a7 Merge pull request #543 from tladesignz/master +80e92e9d Fixed some random compiler warnings, while reading through the code. +68b3104a Merge branch 'master' of gitlab.com:guardianproject/orbot +84f0be7c (newport/master) Update .gitlab-ci.yml file +c3b64f85 Update .gitlab-ci.yml file +515d0e52 Merge branch 'master' of github.com:guardianproject/orbot +2a114a6a update gitlab CI for Android 30 Java 11 +aa48f6b6 Cleaned up About Dialog: - Gave it andorid material padding so view is centered - Removed redundant "some orbot details" string under "About" - Used consistent colors with other parts of app - Migrated hardcoded english strings to string res so dialog can be better localized +9c23f79d Closes #537 updated some copy too... +266ef254 Merge pull request #535 from syphyr/main +c5dca23d Cleanup dependency implementations and list +ab1c39a7 Correct typo in orbot error message +4c27f85f Fix missing dependencies for app-tv +0393a8f5 Fix typo in dependencies.gradle +4a8ee89f update changelog for 16.5.2 beta 1 +57add48c move libs.versions.toml to dependencies.gradle makes it easier to work with in Android Studio + /** 16.5.2-BETA 1 26 Oct 2021 **/ 57add48c (HEAD -> master, origin/master, origin/HEAD) move libs.versions.toml to dependencies.gradle makes it easier to work with in Android Studio

1 0

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

22 Dec '21

commit 7b68f362fc60a2ccafb3744908752ed4a431dd32 Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed Dec 22 16:53:24 2021 -0500 update to 1652200300 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 40dce522..56fd89be 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -40,7 +40,7 @@ android { minSdkVersion 16 applicationId 'org.torproject.android' targetSdkVersion 29 - versionCode 1652200200 + versionCode 1652200300 versionName getVersionName() archivesBaseName = "Orbot-$versionName"

1 0

[orbot/master] update tor-android to 0.4.6.9
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit c208274e1a4c8a3e297be5664632b2235877227c Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed Dec 22 10:04:15 2021 -0500 update tor-android to 0.4.6.9 --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index 4feeb6e5..1fce0233 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -22,7 +22,7 @@ ext { guardian_jtorctl : "0.4.5.7", ipt_proxy : "1.3.0", portmapper : "2.0.5", - tor_android : "0.4.6.8" + tor_android : "0.4.6.9" ] libs = [

1 0

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

22 Dec '21

commit af5f9ef683ff66e3eb626ce5b4f69445cbe86423 Merge: 384518da 87084b29 Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Sep 28 08:56:59 2021 -0400 Merge branch 'sisbell-509' app-mini/build.gradle | 30 ++++++------ app-tv/build.gradle | 27 +++++------ app/build.gradle | 34 +++++++------ appcore/build.gradle | 10 +--- .../android/core/ExampleInstrumentedTest.kt | 24 ---------- .../org/torproject/android/core/ExampleUnitTest.kt | 17 ------- build.gradle | 1 - commons-device.gradle | 1 - gradle/libs.versions.toml | 55 ++++++++++++++++++++++ gradle/wrapper/gradle-wrapper.properties | 4 +- intentintegrator/build.gradle | 2 +- orbotservice/build.gradle | 19 ++++---- settings.gradle | 9 ++++ 13 files changed, 123 insertions(+), 110 deletions(-)

1 0

[orbot/master] Fixes #523 Onion Site Backup Bags
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 5465fffbe8061f890342241e0fbbabb55e883e2d Author: bim <dsnake(a)protonmail.com> Date: Thu Sep 23 21:53:42 2021 -0400 Fixes #523 Onion Site Backup Bags This bug was introdued when a previous bug fix pertaining to Onion service storage in Orbot was addressed. The old bug made it such that multiple onion services could be hosted that pointed to the same local port on the device. This previous bug fix broke the backup logic for v2 and v3 onion services, which is fixed here. --- .../ui/hiddenservices/HiddenServicesActivity.java | 4 +++- .../ui/hiddenservices/backup/BackupUtils.java | 28 +++++++++++----------- .../ui/hiddenservices/dialogs/HSActionsDialog.java | 3 ++- .../ui/hiddenservices/dialogs/HSDeleteDialog.java | 2 +- .../providers/HSContentProvider.java | 4 +++- .../OnionServiceActionsDialogFragment.java | 5 +++- .../ui/v3onionservice/OnionServiceActivity.java | 3 ++- .../OnionServiceContentProvider.java | 5 ++-- .../OnionServiceDeleteDialogFragment.java | 2 +- 9 files changed, 33 insertions(+), 23 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 7436eb91..147c4e7e 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 @@ -39,7 +39,8 @@ public class HiddenServicesActivity extends AppCompatActivity { BUNDLE_KEY_PORT = "port", BUNDLE_KEY_ONION = "onion", BUNDLE_KEY_AUTH_COOKIE = "auth_cookie", - BUNDLE_KEY_AUTH_COOKIE_VALUE = "auth_cookie_value"; + BUNDLE_KEY_AUTH_COOKIE_VALUE = "auth_cookie_value", + BUNDLE_KEY_PATH = "path"; private static final int REQUEST_CODE_READ_ZIP_BACKUP = 125; private static final String BUNDLE_KEY_SHOW_USER_SERVICES = "show_user_services"; private ContentResolver mResolver; @@ -83,6 +84,7 @@ public class HiddenServicesActivity extends AppCompatActivity { arguments.putString(BUNDLE_KEY_ONION, item.getString(item.getColumnIndex(HSContentProvider.HiddenService.DOMAIN))); arguments.putInt(BUNDLE_KEY_AUTH_COOKIE, item.getInt(item.getColumnIndex(HSContentProvider.HiddenService.AUTH_COOKIE))); arguments.putString(BUNDLE_KEY_AUTH_COOKIE_VALUE, item.getString(item.getColumnIndex(HSContentProvider.HiddenService.AUTH_COOKIE_VALUE))); + arguments.putString(BUNDLE_KEY_PATH, item.getString(item.getColumnIndex(HSContentProvider.HiddenService.PATH))); HSActionsDialog dialog = new HSActionsDialog(); dialog.setArguments(arguments); 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 d6cb091c..64ca1e8d 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 @@ -40,8 +40,8 @@ public class BackupUtils { mResolver = mContext.getContentResolver(); } - public String createV3ZipBackup(String port, Uri zipFile) { - String[] files = createFilesForZippingV3(port); + public String createV3ZipBackup(String port, String relativePath, Uri zipFile) { + String[] files = createFilesForZippingV3(relativePath); ZipUtilities zip = new ZipUtilities(files, zipFile, mResolver); if (!zip.zip()) return null; return zipFile.getPath(); @@ -61,8 +61,8 @@ public class BackupUtils { return backupFile.getPath(); } - public String createV2ZipBackup(int port, Uri zipFile) { - String[] files = createFilesForZippingV2(port); + public String createV2ZipBackup(int port, String relativePath, Uri zipFile) { + String[] files = createFilesForZippingV2(relativePath); ZipUtilities zip = new ZipUtilities(files, zipFile, mResolver); if (!zip.zip()) @@ -72,15 +72,15 @@ public class BackupUtils { } // todo this doesn't export data for onions that orbot hosts which have authentication (not supported yet...) - private String[] createFilesForZippingV3(String port) { - final String v3BasePath = getV3BasePath() + "/v3" + port + "/"; + private String[] createFilesForZippingV3(String relativePath) { + final String v3BasePath = getV3BasePath() + "/" + relativePath + "/"; final String hostnamePath = v3BasePath + "hostname", configFilePath = v3BasePath + configFileName, privKeyPath = v3BasePath + "hs_ed25519_secret_key", pubKeyPath = v3BasePath + "hs_ed25519_public_key"; Cursor portData = mResolver.query(OnionServiceContentProvider.CONTENT_URI, OnionServiceContentProvider.PROJECTION, - OnionServiceContentProvider.OnionService.PORT + "=" + port, null, null); + OnionServiceContentProvider.OnionService.PATH + "=\"" + relativePath + "\"", null, null); JSONObject config = new JSONObject(); try { @@ -109,16 +109,16 @@ public class BackupUtils { return new String[]{hostnamePath, configFilePath, privKeyPath, pubKeyPath}; } - private String[] createFilesForZippingV2(int port) { - File hsBasePath = getHSBasePath(); - String configFilePath = hsBasePath + "/hs" + port + "/" + configFileName; - String hostnameFilePath = hsBasePath + "/hs" + port + "/hostname"; - String keyFilePath = hsBasePath + "/hs" + port + "/private_key"; + private String[] createFilesForZippingV2(String relativePath) { + final String hsBasePath = getHSBasePath() + "/" + relativePath + "/"; + String configFilePath = hsBasePath + configFileName; + String hostnameFilePath = hsBasePath + "hostname"; + String keyFilePath = hsBasePath + "private_key"; Cursor portData = mResolver.query( HSContentProvider.CONTENT_URI, HSContentProvider.PROJECTION, - HSContentProvider.HiddenService.PORT + "=" + port, + HSContentProvider.HiddenService.PATH + "=\"" + relativePath + "\"", null, null ); @@ -193,7 +193,7 @@ public class BackupUtils { Toast.makeText(mContext, R.string.backup_restored, Toast.LENGTH_LONG).show(); } else { // collision, clean up files - for (File file: v3Path.listFiles()) + for (File file : v3Path.listFiles()) file.delete(); v3Path.delete(); Toast.makeText(mContext, mContext.getString(R.string.backup_port_exist, port), Toast.LENGTH_LONG).show(); diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSActionsDialog.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSActionsDialog.java index 5a7165fe..8d319324 100644 --- a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSActionsDialog.java +++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSActionsDialog.java @@ -107,8 +107,9 @@ public class HSActionsDialog extends DialogFragment { } private void attemptToWriteBackup(Uri outputFile) { + String path = getArguments().getString(HiddenServicesActivity.BUNDLE_KEY_PATH); BackupUtils backupUtils = new BackupUtils(getContext()); - String backup = backupUtils.createV2ZipBackup(port, outputFile); + String backup = backupUtils.createV2ZipBackup(port, path, outputFile); Toast.makeText(getContext(), backup != null ? R.string.backup_saved_at_external_storage : R.string.error, Toast.LENGTH_LONG).show(); dismiss(); } diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDeleteDialog.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDeleteDialog.java index f4a96226..065f68e3 100644 --- a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDeleteDialog.java +++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDeleteDialog.java @@ -33,7 +33,7 @@ public class HSDeleteDialog extends DialogFragment { // Delete from internal storage String base = context.getFilesDir().getAbsolutePath() + "/" + TorServiceConstants.HIDDEN_SERVICES_DIR; - File dir = new File(base, "hs" + arguments.getString(HiddenServicesActivity.BUNDLE_KEY_PORT)); + File dir = new File(base, arguments.getString(HiddenServicesActivity.BUNDLE_KEY_PATH)); if (dir.isDirectory()) { String[] children = dir.list(); diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/providers/HSContentProvider.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/providers/HSContentProvider.java index 79b566fd..bc4e16b1 100644 --- a/app/src/main/java/org/torproject/android/ui/hiddenservices/providers/HSContentProvider.java +++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/providers/HSContentProvider.java @@ -24,7 +24,8 @@ public class HSContentProvider extends ContentProvider { HiddenService.AUTH_COOKIE, HiddenService.AUTH_COOKIE_VALUE, HiddenService.CREATED_BY_USER, - HiddenService.ENABLED + HiddenService.ENABLED, + HiddenService.PATH }; private static final String AUTH = "org.torproject.android.ui.hiddenservices.providers"; public static final Uri CONTENT_URI = Uri.parse("content://" + AUTH + "/hs"); @@ -134,6 +135,7 @@ public class HSContentProvider extends ContentProvider { public static final String AUTH_COOKIE_VALUE = "auth_cookie_value"; public static final String CREATED_BY_USER = "created_by_user"; public static final String ENABLED = "enabled"; + public static final String PATH = "filepath"; private HiddenService() { } diff --git a/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServiceActionsDialogFragment.java b/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServiceActionsDialogFragment.java index 17ce59a7..6c1a8e95 100644 --- a/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServiceActionsDialogFragment.java +++ b/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServiceActionsDialogFragment.java @@ -63,6 +63,7 @@ public class OnionServiceActionsDialogFragment extends DialogFragment { private void doBackup(Bundle arguments, Context context) { String filename = "onion_service" + arguments.getString(OnionServiceActivity.BUNDLE_KEY_PORT) + ".zip"; + String relativePath = arguments.getString(OnionServiceActivity.BUNDLE_KEY_PATH); if (arguments.getString(OnionServiceActivity.BUNDLE_KEY_DOMAIN) == null) { Toast.makeText(context, R.string.please_restart_Orbot_to_enable_the_changes, Toast.LENGTH_LONG).show(); return; @@ -85,8 +86,10 @@ public class OnionServiceActionsDialogFragment extends DialogFragment { } private void attemptToWriteBackup(Uri outputFile) { + String port = getArguments().getString(OnionServiceActivity.BUNDLE_KEY_PORT); + String relativePath = getArguments().getString(OnionServiceActivity.BUNDLE_KEY_PATH); BackupUtils backupUtils = new BackupUtils(getContext()); - String backup = backupUtils.createV3ZipBackup(getArguments().getString(OnionServiceActivity.BUNDLE_KEY_PORT), outputFile); + String backup = backupUtils.createV3ZipBackup(port, relativePath, outputFile); Toast.makeText(getContext(), backup != null ? R.string.backup_saved_at_external_storage : R.string.error, Toast.LENGTH_LONG).show(); dismiss(); } diff --git a/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServiceActivity.java b/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServiceActivity.java index 39db0b10..88f05564 100644 --- a/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServiceActivity.java +++ b/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServiceActivity.java @@ -32,7 +32,7 @@ import java.io.File; public class OnionServiceActivity extends AppCompatActivity { - static final String BUNDLE_KEY_ID = "id", BUNDLE_KEY_PORT = "port", BUNDLE_KEY_DOMAIN = "domain"; + static final String BUNDLE_KEY_ID = "id", BUNDLE_KEY_PORT = "port", BUNDLE_KEY_DOMAIN = "domain", BUNDLE_KEY_PATH = "path"; private static final String BASE_WHERE_SELECTION_CLAUSE = OnionServiceContentProvider.OnionService.CREATED_BY_USER + "="; private static final String BUNDLE_KEY_SHOW_USER_SERVICES = "show_user_key"; private static final int REQUEST_CODE_READ_ZIP_BACKUP = 347; @@ -72,6 +72,7 @@ public class OnionServiceActivity extends AppCompatActivity { arguments.putInt(BUNDLE_KEY_ID, item.getInt(item.getColumnIndex(OnionServiceContentProvider.OnionService._ID))); arguments.putString(BUNDLE_KEY_PORT, item.getString(item.getColumnIndex(OnionServiceContentProvider.OnionService.PORT))); arguments.putString(BUNDLE_KEY_DOMAIN, item.getString(item.getColumnIndex(OnionServiceContentProvider.OnionService.DOMAIN))); + arguments.putString(BUNDLE_KEY_PATH, item.getString(item.getColumnIndex(OnionServiceContentProvider.OnionService.PATH))); OnionServiceActionsDialogFragment dialog = new OnionServiceActionsDialogFragment(arguments); dialog.show(getSupportFragmentManager(), OnionServiceActionsDialogFragment.class.getSimpleName()); }); diff --git a/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServiceContentProvider.java b/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServiceContentProvider.java index 61b8540a..c4ae10ec 100644 --- a/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServiceContentProvider.java +++ b/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServiceContentProvider.java @@ -21,7 +21,8 @@ public class OnionServiceContentProvider extends ContentProvider { OnionService.DOMAIN, OnionService.ONION_PORT, OnionService.CREATED_BY_USER, - OnionService.ENABLED + OnionService.ENABLED, + OnionService.PATH }; private static final int ONIONS = 1, ONION_ID = 2; @@ -102,7 +103,7 @@ public class OnionServiceContentProvider extends ContentProvider { public static final String DOMAIN = "domain"; public static final String CREATED_BY_USER = "created_by_user"; public static final String ENABLED = "enabled"; - + public static final String PATH = "filepath"; private OnionService() { // no-op } } diff --git a/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServiceDeleteDialogFragment.java b/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServiceDeleteDialogFragment.java index 71111fe1..1606c2e4 100644 --- a/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServiceDeleteDialogFragment.java +++ b/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServiceDeleteDialogFragment.java @@ -34,7 +34,7 @@ public class OnionServiceDeleteDialogFragment extends DialogFragment { private void doDelete(Bundle arguments, Context context) { context.getContentResolver().delete(OnionServiceContentProvider.CONTENT_URI, OnionServiceContentProvider.OnionService._ID + '=' + arguments.getInt(OnionServiceActivity.BUNDLE_KEY_ID), null); String base = context.getFilesDir().getAbsolutePath() + "/" + TorServiceConstants.ONION_SERVICES_DIR; - DiskUtils.recursivelyDeleteDirectory(new File(base, "v3" + arguments.getString(OnionServiceActivity.BUNDLE_KEY_PORT))); + DiskUtils.recursivelyDeleteDirectory(new File(base, arguments.getString(OnionServiceActivity.BUNDLE_KEY_PATH))); } }

1 0

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

22 Dec '21

commit d3fba5232ef501f459560ee8831ef8547a8df010 Merge: af5f9ef6 3b81a4e0 Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Sep 28 08:59:36 2021 -0400 Merge branch 'fix_519_exit_icon' .../src/main/java/org/torproject/android/service/OrbotService.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits December 2021