August 2020 - tor-commits - lists.torproject.org

[orbot/master] for #382 don't set textview value if it is nulled
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit 6893c07b0e69e6eb0ee0d76937fb3974b689ba59 Author: n8fr8 <nathan(a)guardianproject.info> Date: Thu Aug 20 09:16:04 2020 -0400 for #382 don't set textview value if it is nulled --- .../ui/onboarding/BridgeWizardActivity.java | 24 ++++++++++++++-------- 1 file changed, 15 insertions(+), 9 deletions(-) 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 f0b06b2b..8585c29c 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 @@ -171,9 +171,12 @@ public class BridgeWizardActivity extends AppCompatActivity { private class HostTester extends AsyncTask<String, Void, Boolean> { @Override protected void onPreExecute() { - // Pre Code - mTvStatus.setVisibility(View.VISIBLE); - mTvStatus.setText(mBtDirect.isChecked() ? R.string.testing_tor_direct : R.string.testing_bridges); + + if (mTvStatus != null) { + // Pre Code + mTvStatus.setVisibility(View.VISIBLE); + mTvStatus.setText(mBtDirect.isChecked() ? R.string.testing_tor_direct : R.string.testing_bridges); + } } @Override @@ -195,12 +198,15 @@ public class BridgeWizardActivity extends AppCompatActivity { @Override protected void onPostExecute(Boolean result) { // Post Code - runningHostTest = null; - if (result) { - int stringRes = mBtDirect.isChecked() ? R.string.testing_tor_direct_success : R.string.testing_bridges_success; - mTvStatus.setText(stringRes); - } else { - mTvStatus.setText(R.string.testing_bridges_fail); + if (mTvStatus != null) + { + runningHostTest = null; + if (result) { + int stringRes = mBtDirect.isChecked() ? R.string.testing_tor_direct_success : R.string.testing_bridges_success; + mTvStatus.setText(stringRes); + } else { + mTvStatus.setText(R.string.testing_bridges_fail); + } } } }

1 0

[orbot/master] update version code to 1631100200
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit d07dcb7ea5d6479ca5cf5c0a497837b4dc3961bf Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Aug 24 16:03:56 2020 -0400 update version code to 1631100200 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index b861c0d2..ad196031 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -77,7 +77,7 @@ android { minSdkVersion 16 applicationId 'org.torproject.android' targetSdkVersion 29 - versionCode 1631100100 + versionCode 1631100200 versionName getVersionName() archivesBaseName = "Orbot-$versionName" }

1 0

[orbot/master] update changelog
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit 1f7158355dc3e4810b37560901e92c4de7e6ba28 Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Aug 24 16:07:45 2020 -0400 update changelog --- CHANGELOG | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 5fb6d5a9..e8a21554 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,9 +1,29 @@ +/** 16.3.1-BETA-2-tor-0.4.3.6 / 24 August 2020 / d07dcb7ea5d6479ca5cf5c0a497837b4dc3961bf **/ + +d07dcb7e (HEAD -> master, tag: 16.3.1-BETA-2-tor-0.4.3.6, tag: 16.3.1-BETA-1-tor-0.4.3.6) update version code to 1631100200 +4cebceda (origin/master, origin/HEAD) update default bridges and bridge tester +2eaa192c a few more checks to handle null intents +6893c07b for #382 don't set textview value if it is nulled +e183d443 for #381 make sure apps array is not null +c9cb5bb3 don't create a new handler for restarting main activity +b750d107 start fixing mbps to Mbps etc for #378 +d6b6d5cb ensure textview is not null for #379 +3087f77b fixes for #285 reset dormant state on start / resume more info at: https://gitlab.torproject.org/tpo/core/tor/-/issues/40097w +74fce069 update jtorctl to 0.4 and add more tor DataDirectory corruption debug capabilties +cd0c2c88 update tor to 0.4.3.6 +9d1f98a0 Merge pull request #375 from bitmold/prelollipop_vpn_ui +04b622d5 (newport/master) set Java compat to 1.8 for app-mini +15b7d79b Merge branch 'master' of github.com:guardianproject/orbot +07592383 update CHANGELOG for 16.3.1 BETA 1 +c54427f3 Removed "Tor-Enabled Apps" UI from devices < Lollipop as the VPN is either on ("full device") or not This is extra information that could confuse users running older versions of Android +19e53226 Small String Fixes: +233abf8e Start tor/VPN when VPN permissions are first granted and VPN switch is set to on (orbot starts everytime the switch is pressed on, just wasn't after the initial time you grant VPN permissions) /** 16.3.1-BETA-1-tor-0.4.2.7 / 4 August 2020 / 853c7c3641bcd82b92cfd95510cd838db56aa888 **/ 853c7c36 (HEAD -> master, tag: 16.3.1-BETA-1-tor-0.4.2.7) update version to 1631100100 -ffe21c4c (origin/master, origin/HEAD) Merge branch 'bitmold-bridge_wiz_rotation_fix' +ffe20c4c (origin/master, origin/HEAD) Merge branch 'bitmold-bridge_wiz_rotation_fix' 3b796cf6 (bitmold-bridge_wiz_rotation_fix) Merge branch 'bridge_wiz_rotation_fix' of https://github.com/bitmold/orbot into bitmold-bridge_wiz_rotation_fix 3bcb7625 (newport/master) Merge branch 'master' of github.com:guardianproject/orbot c3001186 Merge branch 'bitmold-vpn_disable'

1 0

[orbot/master] update version code for play beta 1631200100
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit 0e76b61758d04b0bb2680f4dc1bbca31d21e00a8 Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Aug 24 16:39:54 2020 -0400 update version code for play beta 1631200100 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index ad196031..16656dc7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -77,7 +77,7 @@ android { minSdkVersion 16 applicationId 'org.torproject.android' targetSdkVersion 29 - versionCode 1631100200 + versionCode 1631200100 versionName getVersionName() archivesBaseName = "Orbot-$versionName" }

1 0

[orbot/master] remove versioning info in orbotservice build as it conflicts with app
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit 7ccdd01efe061a5e12178fb76e60c4277fd867c4 Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Aug 24 16:50:16 2020 -0400 remove versioning info in orbotservice build as it conflicts with app --- orbotservice/build.gradle | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle index 7667bf35..b32aaecd 100644 --- a/orbotservice/build.gradle +++ b/orbotservice/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.library' android { compileSdkVersion 29 - buildToolsVersion '29.0.0' + buildToolsVersion '29.0.2' sourceSets { main { @@ -13,10 +13,6 @@ android { defaultConfig { minSdkVersion 16 targetSdkVersion 29 - versionCode 16121000 - versionName '16.1.2-BETA-1-tor-0.4.2-5-rc-orbotservice' - archivesBaseName = "OrbotService-$versionName" - } compileOptions { sourceCompatibility JavaVersion.VERSION_1_8

1 0

[orbot/master] Issue #309: Hide refresh option menu item instead of disable, because Android doesn't visualize that adequately.
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit 54f5f31173fb7d0d557e74897e149be1ed01e0ec Author: Benjamin Erhart <berhart(a)netzarchitekten.com> Date: Thu Apr 30 14:59:39 2020 +0200 Issue #309: Hide refresh option menu item instead of disable, because Android doesn't visualize that adequately. Additionally: Fix issue where you couldn't refresh after a network error. --- .../java/org/torproject/android/ui/onboarding/MoatActivity.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 0565c164..a98b4c65 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 @@ -160,7 +160,7 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe @Override public boolean onPrepareOptionsMenu(Menu menu) { - menu.findItem(R.id.menu_refresh).setEnabled(!mRequestInProgress); + menu.findItem(R.id.menu_refresh).setVisible(!mRequestInProgress); return super.onPrepareOptionsMenu(menu); } @@ -348,6 +348,10 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe new Response.ErrorListener() { @Override public void onErrorResponse(VolleyError error) { + mRequestInProgress = false; + invalidateOptionsMenu(); + mProgressBar.setVisibility(View.GONE); + Log.d(MoatActivity.class.getSimpleName(), "Error response."); displayError(error, null);

1 0

[orbot/master] Issue #309: Also disable CAPTCHA solution EditText, as long as there's no CAPTCHA to solve and while letting it check.
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit e1425d3a217ffd5ed8f5d087994f6179a70e0850 Author: Benjamin Erhart <berhart(a)netzarchitekten.com> Date: Thu Apr 30 15:10:27 2020 +0200 Issue #309: Also disable CAPTCHA solution EditText, as long as there's no CAPTCHA to solve and while letting it check. --- .../main/java/org/torproject/android/ui/onboarding/MoatActivity.java | 4 ++++ 1 file changed, 4 insertions(+) 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 7dfc4745..697ca032 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 @@ -139,6 +139,7 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe } else { mIvCaptcha.setVisibility(View.GONE); + mEtSolution.setEnabled(false); mBtRequest.setEnabled(false); mOriginalBridges = Prefs.getBridgesList(); @@ -257,6 +258,7 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe mIvCaptcha.setImageBitmap(BitmapFactory.decodeByteArray(mCaptcha, 0, mCaptcha.length)); mIvCaptcha.setVisibility(View.VISIBLE); mEtSolution.setText(null); + mEtSolution.setEnabled(true); mBtRequest.setEnabled(true); } catch (JSONException e) { @@ -323,6 +325,7 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe mRequestInProgress = true; invalidateOptionsMenu(); mProgressBar.setVisibility(View.VISIBLE); + mEtSolution.setEnabled(false); mBtRequest.setEnabled(false); mQueue.add(request); @@ -421,6 +424,7 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe } mProgressBar.setVisibility(View.GONE); + mEtSolution.setEnabled(mIvCaptcha.getVisibility() == View.VISIBLE); mBtRequest.setEnabled(mIvCaptcha.getVisibility() == View.VISIBLE); if (!isFinishing()) {

1 0

[orbot/master] Issue #309: Fixed potential crash, when activity went away.
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit 3bfaa8ad0d6bacce552a13b30d7f9349675a0563 Author: Benjamin Erhart <berhart(a)netzarchitekten.com> Date: Thu Apr 30 14:48:13 2020 +0200 Issue #309: Fixed potential crash, when activity went away. --- .../org/torproject/android/ui/onboarding/MoatActivity.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) 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 f4e3a107..0565c164 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 @@ -419,10 +419,12 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe mProgressBar.setVisibility(View.GONE); mBtRequest.setEnabled(mIvCaptcha.getVisibility() == View.VISIBLE); - new AlertDialog.Builder(this) - .setTitle(R.string.error) - .setMessage(TextUtils.isEmpty(detail) ? exception.getLocalizedMessage() : detail) - .setNegativeButton(R.string.btn_cancel, null) - .show(); + if (!isFinishing()) { + new AlertDialog.Builder(this) + .setTitle(R.string.error) + .setMessage(TextUtils.isEmpty(detail) ? exception.getLocalizedMessage() : detail) + .setNegativeButton(R.string.btn_cancel, null) + .show(); + } } }

1 0

[orbot/master] Issue #309: Activate newly required bridges, fixed accidental reset through Tor status notification.
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit 3ac5a7018bd293b7b357dabce0b48b102a5c2f4c Author: Benjamin Erhart <berhart(a)netzarchitekten.com> Date: Thu Apr 30 15:29:20 2020 +0200 Issue #309: Activate newly required bridges, fixed accidental reset through Tor status notification. --- .../java/org/torproject/android/ui/onboarding/MoatActivity.java | 7 +++++++ 1 file changed, 7 insertions(+) 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 697ca032..89a20eec 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 @@ -309,6 +309,8 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe Prefs.setBridgesList(sb.toString()); Prefs.putBridgesEnabled(true); + sendIntentToService(TorServiceConstants.CMD_SIGNAL_HUP); + mSuccess = true; setResult(RESULT_OK); finish(); @@ -381,6 +383,11 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe private void setUp(String host, int port, String status) { Log.d(MoatActivity.class.getSimpleName(), "Tor status=" + status); + // Ignore after successful bridge request. + if (mSuccess) { + return; + } + switch (status) { case TorServiceConstants.STATUS_OFF: // We need the Meek bridge.

1 0

[orbot/master] Issue #309: Error alert button should say "OK" instead of "Cancel", since there's nothing to cancel, really, just to acknowledge the error.
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit ff7cbcf2c7d58417d12b755f81ce189d939ea9c8 Author: Benjamin Erhart <berhart(a)netzarchitekten.com> Date: Thu Apr 30 15:03:18 2020 +0200 Issue #309: Error alert button should say "OK" instead of "Cancel", since there's nothing to cancel, really, just to acknowledge the error. --- .../main/java/org/torproject/android/ui/onboarding/MoatActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a98b4c65..7dfc4745 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 @@ -427,7 +427,7 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe new AlertDialog.Builder(this) .setTitle(R.string.error) .setMessage(TextUtils.isEmpty(detail) ? exception.getLocalizedMessage() : detail) - .setNegativeButton(R.string.btn_cancel, null) + .setNegativeButton(R.string.btn_okay, null) .show(); } }

1 0