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

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

24 Aug '20

commit 9b415d17a0d8086adc5525e395736e5438cf3276 Author: n8fr8 <nathan(a)guardianproject.info> Date: Sat May 30 06:33:45 2020 -0400 update version code to 1630200100 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index faa6df5b..a668bb62 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,7 +73,7 @@ android { minSdkVersion 16 applicationId 'org.torproject.android' targetSdkVersion 29 - versionCode 1620200100 + versionCode 1630200100 versionName getVersionName() archivesBaseName = "Orbot-$versionName" }

1 0

[orbot/master] Update BUILD
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit 4ef76e066c87ed3d8bc7e55c082567bbdbb4317f Author: bim <dsnake(a)protonmail.com> Date: Fri Jun 12 11:57:48 2020 -0400 Update BUILD Edited this file online removing instructions for the no longer supported armeabi ABI as well as old and unsupported andorid command line tool. I think in the future a more comprehensive rewrite of this file could be helpful. --- BUILD | 7 ------- 1 file changed, 7 deletions(-) diff --git a/BUILD b/BUILD index 285fdf1c..e137f8bb 100644 --- a/BUILD +++ b/BUILD @@ -23,18 +23,11 @@ You then need to run "ndk-build" from: cd orbotservice/src/main ndk-build - mv libs/armeabi/pdnsd libs/armeabi/pdnsd.so mv libs/armeabi-v7a/pdnsd libs/armeabi-v7a/pdnsd.so mv libs/arm64-v8a/pdnsd libs/arm64-v8a/pdnsd.so mv libs/x86/pdnsd libs/x86/pdnsd.so mv libs/x86_64/pdnsd libs/x86_64/pdnsd.so -This isn't enough though and we'll now sew up the binary into a small package -that will handle basic Tor controlling features. -(Doesn't work and should be unnecessary on Android Studio/Android SDK as of 2020!) - - android update project --name Orbot --target android-15 --path . - Now build the Android app (gradle / android studio instructions here)

1 0

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

24 Aug '20

commit 1ecca6b8bb2ed85cf4225bb9790136b0d736f31b Merge: da5f80d7 b2b92d6b Author: n8fr8 <nathan(a)guardianproject.info> Date: Sat May 30 06:30:06 2020 -0400 Merge branch 'bitmold-bug_tor_wont_stop_with_activeVPN' .../org/torproject/android/OrbotMainActivity.java | 53 ++++----- .../torproject/android/service/OrbotService.java | 37 ++----- .../android/service/vpn/OrbotVpnManager.java | 123 ++++----------------- 3 files changed, 56 insertions(+), 157 deletions(-)

1 0

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

24 Aug '20

commit bd3bc7b3f2b36125448a4a4bf7aeac32100584a4 Author: n8fr8 <nathan(a)guardianproject.info> Date: Sat May 30 06:34:57 2020 -0400 update changelog --- CHANGELOG | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 58b957e8..0f8637e6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,27 @@ -NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ + +/** 16.3.0-RC-1-tor-0.4.2.7 / 30 May 2020 / 9b415d17a0d8086adc5525e395736e5438cf3276 **/ + +9b415d17 (HEAD -> master) update version code to 1630200100 +1ecca6b8 (origin/master, origin/HEAD) Merge branch 'bitmold-bug_tor_wont_stop_with_activeVPN' +b2b92d6b (bitmold-bug_tor_wont_stop_with_activeVPN) leave VPN toggle enabled, just stop the service +80b532ea Merge branch 'bug_tor_wont_stop_with_activeVPN' of https://github.com/bitmold/orbot into bitmold-bug_tor_wont_stop_with_activeVPN +da5f80d7 Merge pull request #344 from bitmold/hosted_services_dialog_crash +44ece312 Merge pull request #341 from nijel/patch-1 +cd92f881 Merge pull request #339 from bitmold/moat_max_solution_len +216ca72c Merge pull request #338 from bitmold/bridge_wized_landscape_fix +952bee96 Merge pull request #337 from bitmold/moat_reset_ui_fix +ad6ba4aa Merge branch 'bitmold-dialog_rotation_fixes' +7beceb68 (bitmold-dialog_rotation_fixes) Merge branch 'dialog_rotation_fixes' of https://github.com/bitmold/orbot into bitmold-dialog_rotation_fixes +b5e2c7b0 updating base versionCode to 1620200100 and changing how arch increments happen +f8b1fceb Fixes #329 Tor Wont Fully Stop With VPN Enabled +b18f9b8a Fixes #343 hosted services dialog crash +1f54a962 Delete rs-rAR translation +7a0db403 Delete rs-rAR translation +33276a9f MOAT Errors won't disappear on device rotation +9b3afa51 Limited MOAT Solution Length to spec's 20 byte limit +315a1a88 Recent changes to the BridgeWizard would cause it not to display fully in landscape orientation. This was trivially fixed by adding a ScrollView +85c83319 When a new CAPTCHA is requested, immediately clear the old solution EditText instead of waiting for the CAPTCHA to finish downloading. +872b5248 About dialog remains open on rotation. Added an android:id to its ScrollView so its position is retained too. /** 16.2.0-RC-1-tor-0.4.2.7 / 4 May 2020 / 0a3a4f7ee943e05caa0d5417ed802d2a4e028af3 **/

1 0

[orbot/master] 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.
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit d521ae02d585b8554cb8dc75984209564fa51533 Author: bim <dsnake(a)protonmail.com> Date: Tue Jun 16 12:40:24 2020 -0400 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. --- app/src/main/AndroidManifest.xml | 13 +++++-------- .../org/torproject/android/ui/onboarding/MoatActivity.java | 1 + app/src/main/res/layout/activity_moat.xml | 1 + 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index da126ea9..3ac50847 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -73,11 +73,6 @@ android:stateNotNeeded="true" android:theme="@android:style/Theme.Translucent" /> - <activity - android:name=".ui.VPNEnableActivity" - android:exported="false" - android:label="@string/app_name" /> - <activity android:name=".settings.SettingsPreferences" android:label="@string/app_name" /> @@ -107,7 +102,9 @@ <activity android:name=".ui.onboarding.OnboardingActivity" /> <activity android:name=".ui.onboarding.BridgeWizardActivity" /> - <activity android:name=".ui.onboarding.MoatActivity" /> + <activity + android:name=".ui.onboarding.MoatActivity" + android:windowSoftInputMode="stateHidden" /> <activity android:name=".ui.onboarding.CustomBridgesActivity" /> <provider @@ -164,12 +161,12 @@ android:name=".service.OrbotService" android:enabled="true" android:permission="android.permission.BIND_VPN_SERVICE" - android:stopWithTask="false" > + android:stopWithTask="false"> <intent-filter> <action android:name="android.net.VpnService" /> </intent-filter> </service> - + </application> </manifest> \ No newline at end of file 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 8a47fc9b..69e9e9e2 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 @@ -135,6 +135,7 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe mProgressBar.setVisibility(View.GONE); mIvCaptcha.setImageBitmap(BitmapFactory.decodeByteArray(mCaptcha, 0, mCaptcha.length)); mRequestInProgress = false; + mEtSolution.setEnabled(true); } } else { diff --git a/app/src/main/res/layout/activity_moat.xml b/app/src/main/res/layout/activity_moat.xml index c9d68d12..ba052dbd 100644 --- a/app/src/main/res/layout/activity_moat.xml +++ b/app/src/main/res/layout/activity_moat.xml @@ -65,6 +65,7 @@ android:layout_height="wrap_content" android:autofillHints="" android:ems="10" + android:enabled="false" android:hint="@string/enter_characters_from_image" android:imeOptions="actionSend" android:inputType="textShortMessage|text"

1 0

[orbot/master] app-mini project builds again
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit b9d2f90d2507b065b357c800d239caf814086cff Author: bim <dsnake(a)protonmail.com> Date: Fri Jul 10 21:53:24 2020 -0400 app-mini project builds again Applies the changes to the app-mini project that were in commit ec47151a0c5e9bf789c38a9f36820031241b54f4 Notably the project not building confused people cloning the repository, see issue #348 --- app-mini/src/main/AndroidManifest.xml | 4 - .../torproject/android/mini/MiniMainActivity.java | 52 ++++----- .../torproject/android/mini/OnBootReceiver.java | 25 +---- .../android/mini/vpn/VPNEnableActivity.java | 121 --------------------- 4 files changed, 28 insertions(+), 174 deletions(-) diff --git a/app-mini/src/main/AndroidManifest.xml b/app-mini/src/main/AndroidManifest.xml index 5da4d86e..6e73081a 100644 --- a/app-mini/src/main/AndroidManifest.xml +++ b/app-mini/src/main/AndroidManifest.xml @@ -50,10 +50,6 @@ android:noHistory="true" android:stateNotNeeded="true" android:theme="@android:style/Theme.Translucent" /> - <activity - android:name=".vpn.VPNEnableActivity" - android:exported="false" - android:label="@string/app_name" /> <activity android:name=".settings.SettingsPreferences" android:label="@string/app_name" /> diff --git a/app-mini/src/main/java/org/torproject/android/mini/MiniMainActivity.java b/app-mini/src/main/java/org/torproject/android/mini/MiniMainActivity.java index 7ef51c52..f697bcea 100644 --- a/app-mini/src/main/java/org/torproject/android/mini/MiniMainActivity.java +++ b/app-mini/src/main/java/org/torproject/android/mini/MiniMainActivity.java @@ -20,6 +20,7 @@ import android.graphics.Canvas; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.net.Uri; +import android.net.VpnService; import android.os.Bundle; import android.os.Handler; import android.os.Message; @@ -56,12 +57,10 @@ import org.torproject.android.mini.ui.AppConfigActivity; import org.torproject.android.mini.ui.AppManagerActivity; import org.torproject.android.mini.ui.Rotate3dAnimation; import org.torproject.android.mini.ui.onboarding.OnboardingActivity; -import org.torproject.android.mini.vpn.VPNEnableActivity; import org.torproject.android.service.OrbotConstants; import org.torproject.android.service.OrbotService; import org.torproject.android.service.TorServiceConstants; import org.torproject.android.service.util.Prefs; -import org.torproject.android.service.vpn.TorVpnService; import org.torproject.android.service.vpn.TorifiedApp; import org.torproject.android.service.vpn.VpnConstants; import org.torproject.android.service.vpn.VpnPrefs; @@ -275,7 +274,7 @@ public class MiniMainActivity extends AppCompatActivity //auto start VPN if VPN is enabled if (useVPN) { - startActivity(new Intent(MiniMainActivity.this,VPNEnableActivity.class)); + sendIntentToService(TorServiceConstants.ACTION_START_VPN); } mBtnVPN.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { @@ -463,16 +462,14 @@ public class MiniMainActivity extends AppCompatActivity } } - private void refreshVPNApps () - { - TorVpnService.stop(this); - startActivity(new Intent(MiniMainActivity.this, VPNEnableActivity.class)); + private void refreshVPNApps() { + sendIntentToService(TorServiceConstants.ACTION_STOP_VPN); + sendIntentToService(TorServiceConstants.ACTION_START_VPN); } private void enableVPN (boolean enable) { - if (enable && pkgIds.size() == 0) - { + if (enable && pkgIds.size() == 0) { showAppPicker(); } else { @@ -480,10 +477,18 @@ public class MiniMainActivity extends AppCompatActivity Prefs.putStartOnBoot(enable); if (enable) { - startActivityForResult(new Intent(MiniMainActivity.this, VPNEnableActivity.class), REQUEST_VPN); + + Intent intentVPN = VpnService.prepare(this); + + if (intentVPN != null) { + startActivityForResult(intentVPN, REQUEST_VPN); + } else { + sendIntentToService(TorServiceConstants.ACTION_START); + sendIntentToService(TorServiceConstants.ACTION_START_VPN); + } } else { - TorVpnService.start(this); - stopTor(); + sendIntentToService(TorServiceConstants.ACTION_STOP_VPN); + stopTor(); // todo this call isn't in the main Orbot app, is it needed? } } } @@ -606,20 +611,7 @@ public class MiniMainActivity extends AppCompatActivity } - } - else if (request == REQUEST_VPN) - { - if (response == RESULT_OK) { - TorVpnService.start(this); - - } - else if (response == VPNEnableActivity.ACTIVITY_RESULT_VPN_DENIED) - { - mBtnVPN.setChecked(false); - Prefs.putUseVpn(false); - } - } - else if (request == REQUEST_VPN_APPS_SELECT) + } else if (request == REQUEST_VPN_APPS_SELECT) { if (response == RESULT_OK && torStatus == TorServiceConstants.STATUS_ON) { @@ -627,10 +619,14 @@ public class MiniMainActivity extends AppCompatActivity String newPkgId = data.getStringExtra(Intent.EXTRA_PACKAGE_NAME); //add new entry - } - + } else if (request == REQUEST_VPN && response == RESULT_OK) { + sendIntentToService(TorServiceConstants.ACTION_START_VPN); + } else if (request == REQUEST_VPN && response == RESULT_CANCELED) { + mBtnVPN.setChecked(false); + Prefs.putUseVpn(false); } + IntentResult scanResult = IntentIntegrator.parseActivityResult(request, response, data); if (scanResult != null) { diff --git a/app-mini/src/main/java/org/torproject/android/mini/OnBootReceiver.java b/app-mini/src/main/java/org/torproject/android/mini/OnBootReceiver.java index 56d2b5e9..c958df8b 100644 --- a/app-mini/src/main/java/org/torproject/android/mini/OnBootReceiver.java +++ b/app-mini/src/main/java/org/torproject/android/mini/OnBootReceiver.java @@ -1,11 +1,10 @@ package org.torproject.android.mini; - import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.os.Build; -import org.torproject.android.mini.vpn.VPNEnableActivity; + import org.torproject.android.service.OrbotService; import org.torproject.android.service.TorServiceConstants; import org.torproject.android.service.util.Prefs; @@ -16,29 +15,13 @@ public class OnBootReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { - - if (Prefs.startOnBoot() && (!sReceivedBoot)) - { - if (Prefs.useVpn()) - startVpnService(context); //VPN will start Tor once it is done - else - startService(TorServiceConstants.ACTION_START, context); - + if (Prefs.startOnBoot() && (!sReceivedBoot)) { + startService(TorServiceConstants.ACTION_START_ON_BOOT, context); sReceivedBoot = true; } } - public void startVpnService (final Context context) - { - Intent intent = new Intent(context,VPNEnableActivity.class); - intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - context.startActivity(intent); - - } - - private void startService (String action, Context context) - { - + private void startService (String action, Context context) { Intent intent = new Intent(context, OrbotService.class); intent.setAction(action); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { diff --git a/app-mini/src/main/java/org/torproject/android/mini/vpn/VPNEnableActivity.java b/app-mini/src/main/java/org/torproject/android/mini/vpn/VPNEnableActivity.java deleted file mode 100644 index 153f5b57..00000000 --- a/app-mini/src/main/java/org/torproject/android/mini/vpn/VPNEnableActivity.java +++ /dev/null @@ -1,121 +0,0 @@ -package org.torproject.android.mini.vpn; - -import android.content.Intent; -import android.net.VpnService; -import android.os.Build; -import android.os.Bundle; -import android.os.Handler; -import android.util.Log; -import android.view.Window; -import androidx.appcompat.app.AppCompatActivity; -import org.torproject.android.service.OrbotService; -import org.torproject.android.service.TorServiceConstants; -import org.torproject.android.service.util.Prefs; -import org.torproject.android.service.vpn.TorVpnService; - -/** - * To combat background service being stopped/swiped - */ -public class VPNEnableActivity extends AppCompatActivity { - - private final static int REQUEST_VPN = 7777; - private Intent intent = null; - private boolean checkVpn = true; - private Handler h = new Handler(); - - @Override - public void onCreate(Bundle icicle ) { - requestWindowFeature(Window.FEATURE_NO_TITLE); - - super.onCreate( icicle ); - - Log.d("VPNEnableActivity","prompting user to start Orbot VPN"); - } - - public void onResume() { - super.onResume(); - - if (checkVpn) - { - intent = VpnService.prepare(this); - - if (intent != null) - promptStartVpnService(); - else - startVpnService (); - - checkVpn = false; - } - } - - public void promptStartVpnService () { - // todo no actual prompting happens here and this should be refactored - startVpnService(); - } - - private void startVpnService () - { - if (intent == null) - { - Prefs.putUseVpn(true); - - Log.d("VPNEnableActivity","VPN enabled, starting Tor..."); - TorVpnService.start(this); - - Handler h = new Handler(); - h.postDelayed(new Runnable () { - - public void run () - { - sendIntentToService(TorServiceConstants.ACTION_START); - finish(); - } - }, 100); - - - } - else - { - Log.w("VPNEnableActivity","prompt for VPN"); - startActivityForResult(intent,REQUEST_VPN); - - } - - } - - public static final int ACTIVITY_RESULT_VPN_DENIED = 63; - - @Override - protected void onActivityResult(int request, int response, Intent data) { - super.onActivityResult(request, response, data); - - if (request == REQUEST_VPN && response == RESULT_OK) { - TorVpnService.start(this); - - h.postDelayed(new Runnable () { - @Override - public void run () { - sendIntentToService(TorServiceConstants.ACTION_START); - finish(); - } - }, 1000); - } - else if (request == REQUEST_VPN && response == RESULT_CANCELED) { - setResult(ACTIVITY_RESULT_VPN_DENIED); - finish(); - } - } - - - private void sendIntentToService(String action) { - Intent intent = new Intent(this, OrbotService.class); - intent.setAction(action); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - startForegroundService(intent); - } - else - { - startService(intent); - } - } -}

1 0

[orbot/master] gitignore ndk-build artifacts
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit fbda0e452c4aca350878e2313108fc038a47a237 Author: bim <dsnake(a)protonmail.com> Date: Fri Jun 12 11:50:38 2020 -0400 gitignore ndk-build artifacts --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 16e53c25..6e97d832 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +# compiled NDK binary artifacts +orbotservice/src/main/libs/ + # auto-generated files from Android builds build.xml ant.properties

1 0

[orbot/master] leave VPN toggle enabled, just stop the service
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit b2b92d6b55f20890d28a52fed51a759ae4371ef1 Author: n8fr8 <nathan(a)guardianproject.info> Date: Sat May 30 06:29:43 2020 -0400 leave VPN toggle enabled, just stop the service --- app/src/main/java/org/torproject/android/OrbotMainActivity.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index 61e4b4f2..328476a9 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -210,10 +210,12 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan } private void stopTor() { - if (mBtnVPN.isChecked()) mBtnVPN.setChecked(false); // indirectly closes tun2socks interface + if (mBtnVPN.isChecked()) sendIntentToService(ACTION_STOP_VPN); + Intent intent = new Intent(OrbotMainActivity.this, OrbotService.class); stopService(intent); + } /**

1 0

[orbot/master] Merge pull request #359 from bitmold/app-mini-builds
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit 74e773f74a25d1639d0559e96c61bf35215259d7 Merge: 1ecca6b8 b9d2f90d Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Mon Jul 13 12:11:57 2020 -0400 Merge pull request #359 from bitmold/app-mini-builds app-mini project builds again app-mini/src/main/AndroidManifest.xml | 4 - .../torproject/android/mini/MiniMainActivity.java | 52 ++++----- .../torproject/android/mini/OnBootReceiver.java | 25 +---- .../android/mini/vpn/VPNEnableActivity.java | 121 --------------------- 4 files changed, 28 insertions(+), 174 deletions(-)

1 0

[orbot/master] Fixes #356 Can't Scroll through pasted bridges with soft keyboard open
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit 2a389e05878a67a2c13bd8639388559e794742a3 Author: bim <dsnake(a)protonmail.com> Date: Tue Jun 16 17:03:12 2020 -0400 Fixes #356 Can't Scroll through pasted bridges with soft keyboard open --- .../ui/onboarding/CustomBridgesActivity.java | 33 ++++++++++++++++++---- 1 file changed, 27 insertions(+), 6 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 0aa0c5ee..5e2b3dd6 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 @@ -2,6 +2,7 @@ /* See LICENSE for licensing information */ package org.torproject.android.ui.onboarding; +import android.annotation.SuppressLint; import android.content.ClipData; import android.content.ClipboardManager; import android.content.Intent; @@ -10,8 +11,10 @@ import android.os.Bundle; import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; +import android.text.method.ScrollingMovementMethod; import android.util.Log; import android.view.MenuItem; +import android.view.MotionEvent; import android.view.View; import android.widget.EditText; import android.widget.TextView; @@ -68,6 +71,7 @@ public class CustomBridgesActivity extends AppCompatActivity implements View.OnC } mEtPastedBridges = findViewById(R.id.etPastedBridges); + configureMultilineEditTextInScrollView(mEtPastedBridges); mEtPastedBridges.setText(bridges); mEtPastedBridges.addTextChangedListener(this); @@ -81,9 +85,9 @@ public class CustomBridgesActivity extends AppCompatActivity implements View.OnC @Override public boolean onOptionsItemSelected(@NonNull MenuItem item) { if (item.getItemId() == android.R.id.home) { - finish(); + finish(); - return true; + return true; } return super.onOptionsItemSelected(item); @@ -155,8 +159,7 @@ public class CustomBridgesActivity extends AppCompatActivity implements View.OnC results = results.substring(urlIdx + 3); setNewBridges(results); - } - else { + } else { JSONArray bridgeJson = new JSONArray(results); StringBuilder bridgeLines = new StringBuilder(); @@ -167,8 +170,7 @@ public class CustomBridgesActivity extends AppCompatActivity implements View.OnC setNewBridges(bridgeLines.toString()); } - } - catch (Exception e) { + } catch (Exception e) { Log.e(getClass().getSimpleName(), "unsupported", e); } } @@ -216,4 +218,23 @@ public class CustomBridgesActivity extends AppCompatActivity implements View.OnC intent.setAction(TorServiceConstants.CMD_SIGNAL_HUP); startService(intent); } + + // configures an EditText we assume to be multiline and nested in a ScrollView to be independently scrollable + @SuppressLint("ClickableViewAccessibility") + private static void configureMultilineEditTextInScrollView(EditText et) { + et.setVerticalScrollBarEnabled(true); + et.setOverScrollMode(View.OVER_SCROLL_ALWAYS); + et.setScrollBarStyle(View.SCROLLBARS_INSIDE_INSET); + et.setMovementMethod(ScrollingMovementMethod.getInstance()); + et.setOnTouchListener(new View.OnTouchListener() { + @Override + public boolean onTouch(View v, MotionEvent event) { + v.getParent().requestDisallowInterceptTouchEvent(true); + if ((event.getAction() & MotionEvent.ACTION_UP) != 0 && (event.getActionMasked() & MotionEvent.ACTION_UP) != 0) { + v.getParent().requestDisallowInterceptTouchEvent(false); + } + return false; + } + }); + } }

1 0