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

[orbot/master] Fixes #366 Prevents multiple HostTests from running concurrently and closes any ongoing
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit aa8a53258eb01a0f0467d5f6132f672655264bfc Author: bim <dsnake(a)protonmail.com> Date: Sun Jul 19 14:22:12 2020 -0400 Fixes #366 Prevents multiple HostTests from running concurrently and closes any ongoing network requests once the BridgeWizardActivity loses focus --- app/src/main/AndroidManifest.xml | 7 +++- .../ui/onboarding/BridgeWizardActivity.java | 46 +++++++++++++++++----- 2 files changed, 42 insertions(+), 11 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 43109382..fa7a54d4 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,10 @@ android:name=".ui.onboarding.OnboardingActivity" android:configChanges="orientation|screenSize|screenLayout" /> - <activity android:name=".ui.onboarding.BridgeWizardActivity" /> + <activity + android:name=".ui.onboarding.BridgeWizardActivity" + android:configChanges="orientation|screenSize" /> + <activity android:name=".ui.onboarding.MoatActivity" android:windowSoftInputMode="stateHidden" /> @@ -172,4 +175,4 @@ </application> -</manifest> \ No newline at end of file +</manifest> 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 3fae30d3..27f24164 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 @@ -8,6 +8,7 @@ import android.text.TextUtils; import android.util.Log; import android.view.MenuItem; import android.view.View; +import android.widget.CompoundButton; import android.widget.RadioButton; import android.widget.TextView; @@ -30,6 +31,8 @@ public class BridgeWizardActivity extends AppCompatActivity { private static int MOAT_REQUEST_CODE = 666; private static TextView mTvStatus; + private static HostTester runningHostTest; + private RadioButton mBtDirect; private RadioButton mBtObfs4; private RadioButton mBtMeek; @@ -71,23 +74,27 @@ public class BridgeWizardActivity extends AppCompatActivity { }); mBtObfs4 = findViewById(R.id.btnBridgesObfs4); - mBtObfs4.setOnClickListener(v -> { + mBtObfs4.setOnCheckedChangeListener((buttonView, isChecked) -> { + if (!isChecked) return; Prefs.setBridgesList("obfs4"); Prefs.putBridgesEnabled(true); testBridgeConnection(); }); - mBtMeek = findViewById(R.id.btnBridgesMeek); - mBtMeek.setOnClickListener(v -> { + mBtMeek.setOnCheckedChangeListener((buttonView, isChecked) -> { + if (!isChecked) return; Prefs.setBridgesList("meek"); Prefs.putBridgesEnabled(true); testBridgeConnection(); }); - mBtCustom = findViewById(R.id.btnCustomBridges); - mBtCustom.setOnClickListener(view -> startActivity(new Intent(BridgeWizardActivity.this, CustomBridgesActivity.class))); + mBtCustom.setOnCheckedChangeListener((buttonView, isChecked) -> { + if (isChecked) return; + cancelHostTestIfRunning(); + startActivity(new Intent(BridgeWizardActivity.this, CustomBridgesActivity.class)); + }); } @Override @@ -130,15 +137,19 @@ public class BridgeWizardActivity extends AppCompatActivity { private void testBridgeConnection() { + cancelHostTestIfRunning(); + HostTester hostTester = new HostTester(); if (TextUtils.isEmpty(Prefs.getBridgesList()) || (!Prefs.bridgesEnabled())) { - new HostTester().execute("check.torproject.org", "443"); + hostTester.execute("check.torproject.org", "443"); } else if (Prefs.getBridgesList().equals("meek")) { - new HostTester().execute("meek.azureedge.net", "443", "d2cly7j4zqgua7.cloudfront.net", "443"); + hostTester.execute("meek.azureedge.net", "443", "d2cly7j4zqgua7.cloudfront.net", "443"); } else if (Prefs.getBridgesList().equals("obfs4")) { - new HostTester().execute("85.17.30.79", "443", "154.35.22.9", "443", "192.99.11.54", "443"); + hostTester.execute("85.17.30.79", "443", "154.35.22.9", "443", "192.99.11.54", "443"); } else { + hostTester = null; mTvStatus.setText(""); } + if (hostTester != null) runningHostTest = hostTester; } private class HostTester extends AsyncTask<String, Void, Boolean> { @@ -153,10 +164,10 @@ public class BridgeWizardActivity extends AppCompatActivity { protected Boolean doInBackground(String... host) { // Background Code for (int i = 0; i < host.length; i++) { + if (isCancelled()) return null; String testHost = host[i]; i++; //move to the port int testPort = Integer.parseInt(host[i]); - if (isHostReachable(testHost, testPort, 10000)) { return true; } @@ -168,6 +179,7 @@ public class BridgeWizardActivity extends AppCompatActivity { @Override protected void onPostExecute(Boolean result) { // Post Code + runningHostTest = null; if (result) { mTvStatus.setText(R.string.testing_bridges_success); } else { @@ -184,6 +196,13 @@ public class BridgeWizardActivity extends AppCompatActivity { super.onSaveInstanceState(savedInstanceState); } + @Override + public void onDestroy() { + cancelHostTestIfRunning(); + mTvStatus = null; + super.onDestroy(); + } + @SuppressWarnings("SameParameterValue") private static boolean isHostReachable(String serverAddress, int serverTCPport, int timeoutMS) { boolean connected = false; @@ -216,4 +235,13 @@ public class BridgeWizardActivity extends AppCompatActivity { mBtCustom.setChecked(true); } } + + private static void cancelHostTestIfRunning() { + if (runningHostTest != null) { + runningHostTest.cancel(true); + runningHostTest = null; + } + } + + }

1 0

[orbot/master] Merge branch 'bridge_wiz_rotation_fix' of https://github.com/bitmold/orbot into bitmold-bridge_wiz_rotation_fix
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit 3b796cf63b1293216096aa24af8aa7b28af63655 Merge: 3bcb7625 76a52f7f Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Aug 3 15:04:41 2020 -0400 Merge branch 'bridge_wiz_rotation_fix' of https://github.com/bitmold/orbot into bitmold-bridge_wiz_rotation_fix app/src/main/AndroidManifest.xml | 7 +- .../ui/onboarding/BridgeWizardActivity.java | 118 +++++++++++++++------ .../main/res/layout/activity_custom_bridges.xml | 2 +- app/src/main/res/layout/content_bridge_wizard.xml | 8 ++ app/src/main/res/values/strings.xml | 6 +- 5 files changed, 104 insertions(+), 37 deletions(-)

1 0

[orbot/master] Merge branch 'bitmold-bridge_wiz_rotation_fix'
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit ffe21c4c57c1ed8af955f095ff759e00e8049b64 Merge: 3bcb7625 3b796cf6 Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Aug 3 15:11:26 2020 -0400 Merge branch 'bitmold-bridge_wiz_rotation_fix' app/src/main/AndroidManifest.xml | 7 +- .../ui/onboarding/BridgeWizardActivity.java | 118 +++++++++++++++------ .../main/res/layout/activity_custom_bridges.xml | 2 +- app/src/main/res/layout/content_bridge_wizard.xml | 8 ++ app/src/main/res/values/strings.xml | 6 +- 5 files changed, 104 insertions(+), 37 deletions(-)

1 0

[orbot/master] update CHANGELOG for 16.3.1 BETA 1
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit 075923838da581ae99827e89b7bd3e50875a44ee Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Aug 4 14:18:19 2020 -0400 update CHANGELOG for 16.3.1 BETA 1 --- CHANGELOG | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 0f8637e6..5fb6d5a9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,46 @@ + +/** 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' +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' +76a52f7f Fixes #358 ~ BridgeWizard bridge options are selected correctly when the wizard is opened/closed. ~ Custom Bridges option is behind a button now that is only visible when the radio button is set ~ Some String updates to make it clear a given connection test is for bridges or not +aa8a5325 Fixes #366 Prevents multiple HostTests from running concurrently and closes any ongoing network requests once the BridgeWizardActivity loses focus +e006fce7 Fixes #364 Bridge Wizard status TextView is preserved on device rotation +8990c904 Merge pull request #373 from bitmold/onboarding_rotation_fix +900a7e86 Fixes #304 Onboarding text and slide position are preserved on rotation +992b3108 (bitmold-vpn_disable) When the VPN is disconnected through another app using VpnService or manually by the user turn off the VPN toggle within Orbot +3b708b43 Fixes #368 - if VPN priviliges are removed outside of Orbot, Orbot will appropriately respond and turn off the VPN controls within the app. +53cdad1f Merge branch 'bitmold-vpn_app_icon_fix' +713ef464 (bitmold-vpn_app_icon_fix) Merge branch 'vpn_app_icon_fix' of https://github.com/bitmold/orbot into bitmold-vpn_app_icon_fix +e436e10b Merge branch 'master' of github.com:guardianproject/orbot +86845558 Merge pull request #371 from bitmold/vpn_ui_no_orbot +855bc72d Merge branch 'master' of github.com:guardianproject/orbot +4e425cb0 Merge pull request #372 from bitmold/java8 +af1ab221 Java 8 code cleanup, lambdas over anonymous inner classes. This gets rid of unused imports. Also removed methods in the main app that are not used by the program at all. +db079a4c set compile options to Java 8 +dac9b510 Users can't select Orbot itself through the VPN app manager. It is impossible (explained in #151) + and selecting won't do anyhting but mislead users +c2cb00f1 Merge branch 'master' of github.com:guardianproject/orbot +dc536fcd Merge pull request #350 from bitmold/gitignore_update +e25600d8 Merge pull request #351 from bitmold/patch-1 +0a971129 Merge pull request #362 from bitmold/patch-3 +b3059ecc only show app icons after granting vpn permissioN +137f3be2 Update FUNDING.yml +a9168d2d Merge branch 'master' of github.com:guardianproject/orbot +5f296ccc Merge pull request #361 from bitmold/onionservices_no_click_again +85f6f305 Merge pull request #357 from bitmold/paste_bridges_ET_fix +49404498 Merge pull request #355 from bitmold/auto_kb_bridges_fix +74e773f7 Merge pull request #359 from bitmold/app-mini-builds +88082af9 Fixes #360 "Click again for backup" +b9d2f90d app-mini project builds again +2a389e05 Fixes #356 Can't Scroll through pasted bridges with soft keyboard open +d521ae02 Fixes #354 MOAT Solution Textfield is only enabled when there's a solution. Also do not automatically open up the keyboard when there's nothing to type. +4ef76e06 Update BUILD +fbda0e45 gitignore ndk-build artifacts + /** 16.3.0-RC-1-tor-0.4.2.7 / 30 May 2020 / 9b415d17a0d8086adc5525e395736e5438cf3276 **/ 9b415d17 (HEAD -> master) update version code to 1630200100

1 0

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

24 Aug '20

commit 853c7c3641bcd82b92cfd95510cd838db56aa888 Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Aug 3 15:15:56 2020 -0400 update version to 1631100100 --- app/build.gradle | 2 +- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index d20d85de..b861c0d2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -77,7 +77,7 @@ android { minSdkVersion 16 applicationId 'org.torproject.android' targetSdkVersion 29 - versionCode 1630200100 + versionCode 1631100100 versionName getVersionName() archivesBaseName = "Orbot-$versionName" } diff --git a/build.gradle b/build.gradle index b8ebab92..031c2bfc 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.6.3' + classpath 'com.android.tools.build:gradle:4.0.0' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8b62e5ba..52c10f65 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Apr 16 16:59:02 CEST 2020 +#Mon Aug 03 14:54:01 EDT 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

1 0

[orbot/master] Merge branch 'master' of github.com:guardianproject/orbot
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit 15b7d79b8126178d94d84b425fd13387bc96b628 Merge: 07592383 19e53226 Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Aug 4 14:18:42 2020 -0400 Merge branch 'master' of github.com:guardianproject/orbot .../org/torproject/android/OrbotMainActivity.java | 21 +++++++++------------ app/src/main/res/values/strings.xml | 2 +- app/src/main/res/xml/preferences.xml | 2 +- 3 files changed, 11 insertions(+), 14 deletions(-)

1 0

[orbot/master] Removed "Tor-Enabled Apps" UI from devices < Lollipop as the VPN is either on ("full device") or not
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit c54427f3ca740a44dda7f2cc73a8f7f6dbeef372 Author: bim <dsnake(a)protonmail.com> Date: Tue Aug 4 13:33:27 2020 -0400 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 --- .../org/torproject/android/OrbotMainActivity.java | 15 +- app/src/main/res/layout/layout_main.xml | 629 ++++++++++----------- 2 files changed, 319 insertions(+), 325 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index a3824041..1d2e1493 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -1175,8 +1175,10 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan } private void drawAppShortcuts(boolean showSelectedApps) { - - if (!PermissionManager.isLollipopOrHigher()) return; + if (!PermissionManager.isLollipopOrHigher()) { + findViewById(R.id.boxVpnStatus).setVisibility(View.GONE); + return; + } LinearLayout llBoxShortcuts = findViewById(R.id.boxAppShortcuts); @@ -1205,14 +1207,7 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan params.setMargins(3, 3, 3, 3); iv.setLayoutParams(params); iv.setImageDrawable(pMgr.getApplicationIcon(pkgId)); - - iv.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - openBrowser(URL_TOR_CHECK, false, pkgId); - } - }); - + iv.setOnClickListener(v -> openBrowser(URL_TOR_CHECK, false, pkgId)); llBoxShortcuts.addView(iv); appsAdded++; } catch (Exception e) { diff --git a/app/src/main/res/layout/layout_main.xml b/app/src/main/res/layout/layout_main.xml index 106cf921..ce70f957 100644 --- a/app/src/main/res/layout/layout_main.xml +++ b/app/src/main/res/layout/layout_main.xml @@ -1,342 +1,341 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout android:gravity="center_vertical|center_horizontal" - xmlns:android="http://schemas.android.com/apk/res/android" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/dark_purple" - android:background="@color/dark_purple" - xmlns:app="http://schemas.android.com/apk/res-auto"> - - <androidx.appcompat.widget.Toolbar + android:gravity="center_vertical|center_horizontal" + android:orientation="vertical"> + + <androidx.appcompat.widget.Toolbar android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="?attr/actionBarSize" /> + <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"> -<RelativeLayout - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <FrameLayout - android:layout_width="match_parent" - android:layout_height="250dp" - android:id="@+id/frameMain" - android:visibility="visible" - android:orientation="vertical" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" - android:layout_margin="3dp" - android:background="#11CCCCCC" - android:weightSum="1"> - <pl.bclogic.pulsator4droid.library.PulsatorLayout - android:id="@+id/pulsator" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:paddingTop="20dp" - app:pulse_count="4" - app:pulse_duration="2000" - app:pulse_repeat="0" - app:pulse_color="@color/dark_green" - app:pulse_startFromScratch="false" - app:pulse_interpolator="Linear"> - <ImageView - android:id="@+id/imgStatus" - android:layout_width="match_parent" - android:layout_height="225dp" - android:padding="0dp" - android:layout_margin="0dp" - android:src="@drawable/toroff" /> - - </pl.bclogic.pulsator4droid.library.PulsatorLayout> - <Button - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:id="@+id/btnStart" - android:text="@string/menu_start" - android:layout_gravity="center" - android:background="@android:color/transparent" - android:layout_marginTop="20dp" - /> - </FrameLayout> - - <TextView - android:id="@+id/lblStatus" + android:id="@+id/drawer_layout" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:textSize="14sp" - android:fontFamily="sans-serif-light" - android:lines="1" - android:text="[ ]" - android:maxLines="1" - android:layout_margin="12dp" - android:ellipsize="end" - android:layout_gravity="top|center" - android:gravity="center" - android:layout_below="@+id/frameMain" - /> - - <TextView - android:id="@+id/lblPorts" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:textSize="14sp" - android:fontFamily="sans-serif-light" - android:lines="1" - android:text="@string/default_socks_http" - android:maxLines="1" - android:layout_margin="12dp" - android:ellipsize="end" - android:layout_gravity="top|center" - android:gravity="center" - android:layout_below="@+id/lblStatus" - /> - -<LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:layout_below="@+id/lblPorts" - android:id="@+id/controls" - - > - - <LinearLayout - android:layout_gravity="center" - android:orientation="vertical" - android:layout_width="170dp" - android:layout_height="50dp" - android:background="#11CCCCCC" - android:layout_margin="3dp" - android:layout_weight="1" - > -  - <Spinner - android:id="@+id/spinnerCountry" - android:layout_width="165dp" - android:layout_height="wrap_content" - android:layout_margin="9dp" - - /> - - </LinearLayout> - + android:layout_height="match_parent"> - <LinearLayout - android:layout_gravity="center" - android:orientation="vertical" - android:layout_width="170dp" - android:layout_height="50dp" - android:background="#11CCCCCC" - android:layout_margin="3dp" - android:layout_weight="1" - - > - <androidx.appcompat.widget.SwitchCompat - android:id="@+id/btnVPN" + <ScrollView android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/apps_mode" - android:layout_margin="9dp" - android:layout_gravity="center" - app:switchPadding="3dp" - - /> - </LinearLayout> - -</LinearLayout> - - + android:layout_height="wrap_content"> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:layout_below="@+id/controls" - android:id="@+id/traffic" + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <FrameLayout + android:id="@+id/frameMain" + android:layout_width="match_parent" + android:layout_height="250dp" + android:layout_alignParentStart="true" + android:layout_alignParentLeft="true" + android:layout_margin="3dp" + android:background="#11CCCCCC" + android:orientation="vertical" + android:visibility="visible" + android:weightSum="1"> + + <pl.bclogic.pulsator4droid.library.PulsatorLayout + android:id="@+id/pulsator" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:paddingTop="20dp" + app:pulse_color="@color/dark_green" + app:pulse_count="4" + app:pulse_duration="2000" + app:pulse_interpolator="Linear" + app:pulse_repeat="0" + app:pulse_startFromScratch="false"> + + <ImageView + android:id="@+id/imgStatus" + android:layout_width="match_parent" + android:layout_height="225dp" + android:layout_margin="0dp" + android:padding="0dp" + android:src="@drawable/toroff" /> + + </pl.bclogic.pulsator4droid.library.PulsatorLayout> + + <Button + android:id="@+id/btnStart" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:layout_marginTop="20dp" + android:background="@android:color/transparent" + android:text="@string/menu_start" /> + </FrameLayout> + + <TextView + android:id="@+id/lblStatus" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@+id/frameMain" + android:layout_gravity="top|center" + android:layout_margin="12dp" + android:ellipsize="end" + android:fontFamily="sans-serif-light" + android:gravity="center" + android:lines="1" + android:maxLines="1" + android:text="[ ]" + android:textSize="14sp" /> + + <TextView + android:id="@+id/lblPorts" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@+id/lblStatus" + android:layout_gravity="top|center" + android:layout_margin="12dp" + android:ellipsize="end" + android:fontFamily="sans-serif-light" + android:gravity="center" + android:lines="1" + android:maxLines="1" + android:text="@string/default_socks_http" + android:textSize="14sp" /> + + <LinearLayout + android:id="@+id/controls" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@+id/lblPorts" + android:orientation="horizontal" + + > + + <LinearLayout + android:layout_width="170dp" + android:layout_height="50dp" + android:layout_gravity="center" + android:layout_margin="3dp" + android:layout_weight="1" + android:background="#11CCCCCC" + android:orientation="vertical"> +  + <Spinner + android:id="@+id/spinnerCountry" + android:layout_width="165dp" + android:layout_height="wrap_content" + android:layout_margin="9dp" + + /> + + </LinearLayout> + + + <LinearLayout + android:layout_width="170dp" + android:layout_height="50dp" + android:layout_gravity="center" + android:layout_margin="3dp" + android:layout_weight="1" + android:background="#11CCCCCC" + android:orientation="vertical" + + > + + <androidx.appcompat.widget.SwitchCompat + android:id="@+id/btnVPN" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:layout_margin="9dp" + android:text="@string/apps_mode" + app:switchPadding="3dp" + + /> + </LinearLayout> + + </LinearLayout> + + + <LinearLayout + android:id="@+id/traffic" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@+id/controls" + android:orientation="horizontal" + + > + + <LinearLayout + android:layout_width="170dp" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:layout_margin="3dp" + android:layout_weight="1" + android:orientation="horizontal"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="3dp" + android:fontFamily="sans-serif-light" + android:gravity="center" + android:lines="1" + android:text="@string/main_layout_download" + + /> + + + <TextView + android:id="@+id/trafficDown" + android:layout_width="100dp" + android:layout_height="wrap_content" + android:layout_margin="3dp" + android:fontFamily="sans-serif-light" + android:gravity="center_vertical" + android:lines="1" + android:text="0kbps" + + /> + </LinearLayout> + + + <LinearLayout + android:layout_width="170dp" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:layout_margin="3dp" + android:layout_weight="1" + android:orientation="horizontal" + + > + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="3dp" + android:fontFamily="sans-serif-light" + android:gravity="center_vertical" + android:text="@string/main_layout_upload" /> + + <TextView + android:id="@+id/trafficUp" + android:layout_width="100dp" + android:layout_height="wrap_content" + android:layout_margin="3dp" + android:fontFamily="sans-serif-light" + android:gravity="center_vertical" + android:lines="1" + android:text="0kbps" + + /> + + </LinearLayout> + + </LinearLayout> + + <LinearLayout + android:id="@+id/row_bridges" + android:layout_width="match_parent" + android:layout_height="40dp" + android:layout_below="@+id/traffic" + android:layout_margin="3dp" + android:layout_weight="1" + android:background="#11CCCCCC" + android:gravity="center_horizontal" + android:orientation="horizontal"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="3dp" + android:fontFamily="sans-serif-light" + android:gravity="center_vertical" + android:lines="1" + android:text="@string/trouble_connecting" + + /> + + <androidx.appcompat.widget.SwitchCompat + android:id="@+id/btnBridges" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerHorizontal="true" + android:layout_centerVertical="true" + android:layout_margin="3dp" + android:layout_marginTop="10dp" + android:text="@string/use_bridges" + app:switchPadding="3dp" /> + </LinearLayout> + + <LinearLayout + android:id="@+id/boxVpnStatus" + android:layout_width="match_parent" + android:layout_height="80dp" + android:layout_below="@+id/row_bridges" + android:layout_margin="3dp" + android:layout_weight="1" + android:background="#55CCCCCC" + android:gravity="center_horizontal" + android:orientation="vertical"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="3dp" + android:fontFamily="sans-serif-light" + android:gravity="center_vertical" + android:lines="1" + android:text="@string/app_shortcuts" /> + + <LinearLayout + android:id="@+id/boxAppShortcuts" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="center" + android:orientation="horizontal" + android:padding="3dp"/> + </LinearLayout> + + + </RelativeLayout> + </ScrollView> - > <LinearLayout - android:layout_gravity="center" - android:orientation="horizontal" - android:layout_width="170dp" - android:layout_height="wrap_content" - android:layout_margin="3dp" - android:layout_weight="1" - > - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/main_layout_download" - android:gravity="center" - android:fontFamily="sans-serif-light" - android:layout_margin="3dp" - android:lines="1" - - /> - - - <TextView - android:id="@+id/trafficDown" - android:layout_width="100dp" - android:layout_height="wrap_content" - android:gravity="center_vertical" - android:fontFamily="sans-serif-light" - android:text="0kbps" - android:layout_margin="3dp" - android:lines="1" - - /> - </LinearLayout> - + android:layout_width="320dp" + android:layout_height="match_parent" + android:layout_gravity="end" + android:background="#333333" + android:orientation="vertical" + android:padding="6dp"> - <LinearLayout - android:layout_gravity="center" - android:orientation="horizontal" - android:layout_width="170dp" - android:layout_height="wrap_content" - android:layout_margin="3dp" - android:layout_weight="1" - - > <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/main_layout_upload" - android:gravity="center_vertical" - android:fontFamily="sans-serif-light" - android:layout_margin="3dp" - /> + android:text="@string/menu_log" + android:textAppearance="?android:attr/textAppearanceMedium" /> <TextView - android:id="@+id/trafficUp" - android:layout_width="100dp" + android:id="@+id/orbotLog" + android:layout_width="fill_parent" android:layout_height="wrap_content" - android:gravity="center_vertical" - android:fontFamily="sans-serif-light" - android:text="0kbps" - android:layout_margin="3dp" - android:lines="1" - - /> - + android:layout_alignParentLeft="true" + android:layout_marginTop="10dp" + android:fontFamily="monospace" + android:gravity="start" + android:textIsSelectable="true" + android:textSize="12sp" /> </LinearLayout> - </LinearLayout> - - <LinearLayout - android:id="@+id/row_bridges" - android:gravity="center_horizontal" - android:orientation="horizontal" - android:layout_width="match_parent" - android:layout_height="40dp" - android:background="#11CCCCCC" - android:layout_margin="3dp" - android:layout_weight="1" - android:layout_below="@+id/traffic" - > - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:gravity="center_vertical" - android:fontFamily="sans-serif-light" - android:text="@string/trouble_connecting" - android:layout_margin="3dp" - android:lines="1" - - /> - <androidx.appcompat.widget.SwitchCompat - android:id="@+id/btnBridges" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/use_bridges" - android:layout_margin="3dp" - app:switchPadding="3dp" - android:layout_marginTop="10dp" - android:layout_centerHorizontal="true" - android:layout_centerVertical="true" - /> - </LinearLayout> - <LinearLayout - android:gravity="center_horizontal" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="80dp" - android:background="#55CCCCCC" - android:layout_margin="3dp" - android:layout_weight="1" - android:layout_below="@+id/row_bridges" - > - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:gravity="center_vertical" - android:fontFamily="sans-serif-light" - android:text="@string/app_shortcuts" - android:layout_margin="3dp" - android:lines="1" - /> - - <LinearLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:id="@+id/boxAppShortcuts" - android:gravity="center" - android:padding="3dp" - > - </LinearLayout> - </LinearLayout> - - -</RelativeLayout> - </ScrollView> - - - <LinearLayout - android:layout_width="320dp" - android:layout_height="match_parent" - android:orientation="vertical" - android:layout_gravity="end" - android:background="#333333" - android:padding="6dp" - > - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/menu_log" - android:textAppearance="?android:attr/textAppearanceMedium" - /> - <TextView - android:id="@+id/orbotLog" - android:textSize="12sp" - android:gravity="start" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_marginTop="10dp" - android:textIsSelectable="true" - android:fontFamily="monospace" - /> - </LinearLayout> - - </androidx.drawerlayout.widget.DrawerLayout> + </androidx.drawerlayout.widget.DrawerLayout> </LinearLayout>

1 0

[orbot/master] Small String Fixes:
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit 19e532269369f00efc6f74b0a989ed33ac98eba8 Author: bim <dsnake(a)protonmail.com> Date: Tue Aug 4 12:48:09 2020 -0400 Small String Fixes: - "Reachable addresses" pref category was hardcoded, switched it to the string resource so it was capitalized to "Reachable Addresses" and would be not in english in other locales - changed "Client cookies" menu item to "Client Cookies" --- app/src/main/res/values/strings.xml | 2 +- app/src/main/res/xml/preferences.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bbf55492..f27892a3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -212,7 +212,7 @@ <string name="copy_cookie_to_clipboard">Copy cookie to clipboard</string> <string name="auth_cookie_was_not_configured">Auth cookie was not configured</string> <string name="please_restart_Orbot_to_enable_the_changes">Please restart Orbot to enable the changes</string> - <string name="client_cookies">Client cookies</string> + <string name="client_cookies">Client Cookies</string> <string name="onion">.onion</string> <string name="invalid_onion_address">Invalid .onion address</string> <string name="cookie_from_QR">Read from QR</string> diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 8477efbd..a8c078bc 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -158,7 +158,7 @@ </PreferenceCategory> - <PreferenceCategory android:title="ReachableAddresses"> + <PreferenceCategory android:title="@string/reachable_addresses"> <CheckBoxPreference android:defaultValue="false" android:enabled="true"

1 0

[orbot/master] Start tor/VPN when VPN permissions are first granted and VPN switch is set to on
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit 233abf8ed54328b8ffa8bd36bc13d3d07115b133 Author: bim <dsnake(a)protonmail.com> Date: Tue Aug 4 00:33:00 2020 -0400 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) --- .../org/torproject/android/OrbotMainActivity.java | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index 199a5177..a3824041 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -523,9 +523,7 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan if (intentVPN != null) startActivityForResult(intentVPN, REQUEST_VPN); else { - drawAppShortcuts(true); - sendIntentToService(ACTION_START); - sendIntentToService(ACTION_START_VPN); + startVpn(); } } else { @@ -535,6 +533,12 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan } + private void startVpn() { + drawAppShortcuts(true); + sendIntentToService(ACTION_START); + sendIntentToService(ACTION_START_VPN); + } + private void enableHiddenServicePort( String hsName, final int hsPort, int hsRemotePort, final String backupToPackage, final Uri hsKeyPath, @@ -805,8 +809,7 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan refreshVPNApps(); } else if (request == REQUEST_VPN && response == RESULT_OK) { - drawAppShortcuts(true); - sendIntentToService(ACTION_START_VPN); + startVpn(); } else if (request == REQUEST_VPN && response == RESULT_CANCELED) { mBtnVPN.setChecked(false); } @@ -1239,13 +1242,7 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan iv.setLayoutParams(params); iv.setImageDrawable(getResources().getDrawable(R.drawable.ic_settings_white_24dp)); llBoxShortcuts.addView(iv); - iv.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - startActivityForResult(new Intent(OrbotMainActivity.this, AppManagerActivity.class), REQUEST_VPN_APPS_SELECT); - - } - }); + iv.setOnClickListener(v -> startActivityForResult(new Intent(OrbotMainActivity.this, AppManagerActivity.class), REQUEST_VPN_APPS_SELECT)); }

1 0

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

24 Aug '20

commit cd0c2c88ce0eaddf5ce1a1b3561c0c11b9058d37 Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed Aug 12 14:53:15 2020 -0400 update tor to 0.4.3.6 --- orbotservice/build.gradle | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle index 29230b70..7667bf35 100644 --- a/orbotservice/build.gradle +++ b/orbotservice/build.gradle @@ -47,7 +47,7 @@ dependencies { implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation 'org.torproject:tor-android-binary:0.4.2.7a' + implementation 'org.torproject:tor-android-binary:0.4.3.6-actual' implementation 'info.pluggabletransports.aptds:apt-dispatch-library:1.0.9' implementation 'info.pluggabletransports.aptds:apt-meek-obfs4-legacy:1.0.9' @@ -59,5 +59,6 @@ dependencies { implementation 'com.offbynull.portmapper:portmapper:2.0.5' - implementation 'org.briarproject:jtorctl:0.3' + implementation 'info.guardianproject:jtorctl:0.4' + }

1 0