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

[orbot/master] Recent changes to the BridgeWizard would cause it not to display
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit 315a1a881ac12511b99e26075b51c82e24501476 Author: bim <dsnake(a)protonmail.com> Date: Sun May 10 20:20:00 2020 -0400 Recent changes to the BridgeWizard would cause it not to display fully in landscape orientation. This was trivially fixed by adding a ScrollView --- app/src/main/res/layout/content_bridge_wizard.xml | 103 ++++++++++++---------- 1 file changed, 55 insertions(+), 48 deletions(-) diff --git a/app/src/main/res/layout/content_bridge_wizard.xml b/app/src/main/res/layout/content_bridge_wizard.xml index d8e20d82..5c3d990e 100644 --- a/app/src/main/res/layout/content_bridge_wizard.xml +++ b/app/src/main/res/layout/content_bridge_wizard.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" @@ -9,65 +9,72 @@ tools:context="org.torproject.android.ui.onboarding.BridgeWizardActivity" tools:showIn="@layout/activity_bridge_wizard"> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="12dp" - - android:text="@string/if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_" - android:textColor="@color/panel_background_main" - android:textSize="16sp" - android:textStyle="bold" /> - - <Button - android:id="@+id/btnMoat" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="12dp" - android:text="@string/request_bridges_from_torproject" /> - - <RadioGroup + <LinearLayout + android:id="@+id/scrollView" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> - <RadioButton - android:id="@+id/btnBridgesDirect" + <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="12dp" - android:text="@string/bridge_direct_connect" /> - <RadioButton - android:id="@+id/btnBridgesObfs4" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="12dp" - android:text="@string/bridge_community" /> + android:text="@string/if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_" + android:textColor="@color/panel_background_main" + android:textSize="16sp" + android:textStyle="bold" /> - <RadioButton - android:id="@+id/btnBridgesMeek" - android:layout_width="wrap_content" + <Button + android:id="@+id/btnMoat" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="12dp" - android:text="@string/bridge_cloud" /> + android:text="@string/request_bridges_from_torproject" /> - <RadioButton - android:id="@+id/btnCustomBridges" - android:layout_width="wrap_content" + <RadioGroup + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="12dp" - android:text="@string/custom_bridges"/> + android:orientation="vertical"> - </RadioGroup> + <RadioButton + android:id="@+id/btnBridgesDirect" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="12dp" + android:text="@string/bridge_direct_connect" /> - <TextView - android:id="@+id/lbl_bridge_test_status" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="12dp" - android:gravity="center" - android:textColor="@color/bright_green" - android:textSize="16sp" - android:textStyle="bold" /> -</LinearLayout> + <RadioButton + android:id="@+id/btnBridgesObfs4" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="12dp" + android:text="@string/bridge_community" /> + + <RadioButton + android:id="@+id/btnBridgesMeek" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="12dp" + android:text="@string/bridge_cloud" /> + + <RadioButton + android:id="@+id/btnCustomBridges" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="12dp" + android:text="@string/custom_bridges" /> + + </RadioGroup> + + <TextView + android:id="@+id/lbl_bridge_test_status" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="12dp" + android:gravity="center" + android:textColor="@color/bright_green" + android:textSize="16sp" + android:textStyle="bold" /> + </LinearLayout> +</ScrollView>

1 0

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

24 Aug '20

commit 0a3a4f7ee943e05caa0d5417ed802d2a4e028af3 Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon May 4 11:46:23 2020 -0400 update version code to 16202001 --- CHANGELOG | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ app/build.gradle | 2 +- 2 files changed, 69 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 3bf735a2..94301937 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,74 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at http /** 16.1.4-RC-1-tor-0.4.2.5-rc / 5 Feb 2020 / 35fbb5697c4d56f1ad97ae0fdace0a912fc5f2a5 **/ +a6310772 (HEAD -> master, origin/master, origin/HEAD) Merge branch 'tladesignz-master' +875f18ad (tladesignz-master) Merge branch 'master' of https://github.com/tladesignz/orbot into tladesignz-master +85e027c3 update version code +cabf328b don't start tun2socks/VPN if it is already running +718bb421 Issue #324: Implemented CustomBridgesActivity analogous to Onion Browser iOS. +12a3f4a9 (tag: 16.2.0-BETA-4-tor-0.4.2.7) remove TorVpnService from manifest to address #327 crash +22d7ef8d (tag: 16.2.0-BETA-3-tor-0.4.2.7) update to 16201003 +22bd248a update binary install scripts, to fix pdnsd install - now pdnsd is packaged as libpdsnd.so to work on newer platforms +e93c8bcc (tag: 16.2.0-BETA-2-tor-0.4.2.7) update version code to 16201002 +d0fec8e3 update tor and obfs4proxy binary libs to address #326 hopefully +3ac5a701 Issue #309: Activate newly required bridges, fixed accidental reset through Tor status notification. +e1425d3a Issue #309: Also disable CAPTCHA solution EditText, as long as there's no CAPTCHA to solve and while letting it check. +ff7cbcf2 Issue #309: Error alert button should say "OK" instead of "Cancel", since there's nothing to cancel, really, just to acknowledge the error. +54f5f311 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. +3bfaa8ad Issue #309: Fixed potential crash, when activity went away. +c41d453e (public/master) fix unneeded includes +4f4300a4 (tag: 16.2.0-BETA-1A-tor-0.4.2.7, tag: 16.2.0-BETA-1-tor-0.4.2.7, ghdev/master) update version to 16201001 +7d7b2e98 remove app updater code to address concerns in #323 +ec47151a major VPN refactor with Android Q updates for #263 #261 #151 #316 and #303 - integrate TorVPNService directly into OrbotService, so just one service now - removed VPNEnableActivity, and just have VPN activated by service now - changes address start on boot with VPN enable - also improvements to managing PDNSD daemon +d64b4d03 (tag: 16.1.5-BETA-2-tor-0.4.2.7) update version code to 16150001 +d5bc3740 update to SDK 29 +919c2111 improve pdnsd pid checking +e78c27bf remove unneeded commands in tor config and startup +5cd6cc88 update tor to 0.4.2.7 +785fa8ff Merge branch 'master' of github.com:guardianproject/orbot +93a07860 Merge pull request #322 from bitmold/AboutDialogCrashFix +b24750e7 Fixes #321 IlleglaStateException on about dialog +2e6c9b1f (tag: 16.1.5-BETA-1-tor-0.4.2.5-rc) small tweaks to request bridge strings +3c80df01 Merge branch 'bitmold-compile_erorr+refactor' +08de553e (bitmold-compile_erorr+refactor) Merge branch 'compile_erorr+refactor' of https://github.com/bitmold/orbot into bitmold-compile_erorr+refactor +df847ff1 Merge branch 'tladesignz-master' +b2646a3c update AndroidPT to latest 1.0.8 with fixes for obfs4 and meek on Android 10 +feedb3b2 fix string variable values +155980fc Change from using String resources for a bundle key in Onboarding +ec0ad261 Fixes compile error on master branch right now +f2c8473f Merge branch 'master' of https://github.com/tladesignz/orbot into tladesignz-master +732c1538 Merge branch 'master' of https://github.com/guardianproject/orbot +09ded59c (githubgp/master) Merge pull request #311 from bitmold/email_bridges_fix +b1049ca6 Merge branch 'master' of https://github.com/guardianproject/orbot +b9804c12 Merge pull request #305 from Hashik-Donthineni/AppIntroOrientationFix +410ae032 tweaks to app data storage and control port interaction - in some cases, Orbot connection to local control port can hang. Make changes to address that. +19d50544 Color indeterminate ProgressBar. +1749167a Fixed behaviour on device turn. +f94931ee Don't allow refresh button to trigger while request ongoing. +7a9b9d1b Adapted to naming convention of project. +964c3115 Fixed MoatActivity startup when Tor is not running. Reset old bridge configuration, when not completed. +5c99859e Finish BridgeWizardActivity on successful MOAT. +a34ee221 Improved UI: show progress spinner, start request on keyboard enter. +a46e463b Updated Gradle to latest version. +c026e206 Check OrbotService status, start Tor, if down, switch to Meek, when started, fetch CAPTCHA, as soon as done with that. Proxy Volley correctly. Improved option menu handling. Not working, yet: Tor doesn't come up. Why? +e7cfe465 Added first stab at a MoatActivity. Doesn't change bridges automatically, yet. Also, Volley needs to be proxied. +469d4cfa Fixed most warnings and errors in OrbotMainActivity. +3eb76e6f Updated Gradle. +42832216 Updated BUILD info. +446dfa6e Fixes bugs in #289 pertaining to parsing bridges +86279895 Merge pull request #310 from bitmold/zulu_context_menu +29541f35 Fixes #300 Where Locale is set to Zulu when settings are opened +bfbb85bc Changed variable names for better understanding +a09b4ebe Fixed Unused Imports +f4580cf3 Added comments for better understanding +6c09f67e Extracted String Resources +ee3e0542 Fixed blank screen when orintation changed in AppIntro +8a3727ac Merge pull request #301 from PLNech/patch-1 +0dcba0d3 fix FAQ URL in README +73b0b0d7 handle NPE since node is not yet set + +/** 16.1.4-RC-1-tor-0.4.2.5-rc / 5 Feb 2020 / 35fbb5697c4d56f1ad97ae0fdace0a912fc5f2a5 **/ + 35fbb569 (HEAD -> master) update version code to 16142100 71e4badb clean-up how kill process works; only try additional attempts if needed c9550204 (tag: 16.1.4-BETA-2-tor-0.4.2.5-rc) update build tools and versionCode to 16141100 diff --git a/app/build.gradle b/app/build.gradle index e447aa8d..5240f8a3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,7 +73,7 @@ android { minSdkVersion 16 applicationId 'org.torproject.android' targetSdkVersion 29 - versionCode 16201004 + versionCode 16202001 versionName getVersionName() archivesBaseName = "Orbot-$versionName" }

1 0

[orbot/master] update changelog for 16.2.0-RC-1-tor-0.4.2.7
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit eed732a3ffe1acc92c08c8d6c0a02fcccf6eb65e Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon May 4 11:48:58 2020 -0400 update changelog for 16.2.0-RC-1-tor-0.4.2.7 --- CHANGELOG | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 94301937..58b957e8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,7 +1,8 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ -/** 16.1.4-RC-1-tor-0.4.2.5-rc / 5 Feb 2020 / 35fbb5697c4d56f1ad97ae0fdace0a912fc5f2a5 **/ +/** 16.2.0-RC-1-tor-0.4.2.7 / 4 May 2020 / 0a3a4f7ee943e05caa0d5417ed802d2a4e028af3 **/ +0a3a4f7e (HEAD -> master) update version code to 16202001 a6310772 (HEAD -> master, origin/master, origin/HEAD) Merge branch 'tladesignz-master' 875f18ad (tladesignz-master) Merge branch 'master' of https://github.com/tladesignz/orbot into tladesignz-master 85e027c3 update version code

1 0

[orbot/master] About dialog remains open on rotation. Added an android:id to its
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit 872b52481a6292fcb18d2e3af51b548c4e9603ec Author: bim <dsnake(a)protonmail.com> Date: Sun May 10 18:25:15 2020 -0400 About dialog remains open on rotation. Added an android:id to its ScrollView so its position is retained too. --- .../org/torproject/android/OrbotMainActivity.java | 66 +----- .../android/ui/dialog/AboutDialogFragment.java | 90 +++++++ app/src/main/res/layout/layout_about.xml | 258 ++++++++++++--------- 3 files changed, 239 insertions(+), 175 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index 7c4528d5..837d7e60 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -6,6 +6,7 @@ package org.torproject.android; import android.app.ActivityManager; import android.app.ActivityManager.RunningServiceInfo; import android.app.AlertDialog; + import android.content.BroadcastReceiver; import android.content.ContentResolver; import android.content.ContentValues; @@ -17,14 +18,12 @@ import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; -import android.content.pm.PackageManager.NameNotFoundException; import android.database.Cursor; import android.net.Uri; import android.net.VpnService; import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.text.Html; import android.text.TextUtils; import android.util.Log; import android.view.Menu; @@ -66,6 +65,7 @@ import org.torproject.android.settings.LocaleHelper; import org.torproject.android.settings.SettingsPreferences; import org.torproject.android.ui.AppManagerActivity; import org.torproject.android.ui.Rotate3dAnimation; +import org.torproject.android.ui.dialog.AboutDialogFragment; import org.torproject.android.ui.hiddenservices.ClientCookiesActivity; import org.torproject.android.ui.hiddenservices.HiddenServicesActivity; import org.torproject.android.ui.hiddenservices.backup.BackupUtils; @@ -74,10 +74,7 @@ import org.torproject.android.ui.hiddenservices.providers.HSContentProvider; import org.torproject.android.ui.onboarding.BridgeWizardActivity; import org.torproject.android.ui.onboarding.OnboardingActivity; -import java.io.BufferedReader; import java.io.File; -import java.io.IOException; -import java.io.InputStreamReader; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.net.URLEncoder; @@ -466,8 +463,7 @@ public class OrbotMainActivity extends AppCompatActivity doExit(); } else if (item.getItemId() == R.id.menu_about) { - showAbout(); - + new AboutDialogFragment().show(getSupportFragmentManager(), AboutDialogFragment.TAG); } else if (item.getItemId() == R.id.menu_scan) { IntentIntegrator integrator = new IntentIntegrator(OrbotMainActivity.this); integrator.initiateScan(); @@ -496,51 +492,6 @@ public class OrbotMainActivity extends AppCompatActivity return super.onOptionsItemSelected(item); } - private void showAbout() { - View view = getLayoutInflater().inflate(R.layout.layout_about, null); - String version; - - try { - version = getPackageManager().getPackageInfo(getPackageName(), 0).versionName + " (Tor " + OrbotService.BINARY_TOR_VERSION + ")"; - } catch (NameNotFoundException e) { - version = "Version Not Found"; - } - - TextView versionName = view.findViewById(R.id.versionName); - versionName.setText(version); - - TextView aboutOther = view.findViewById(R.id.aboutother); - - try { - String aboutText = readFromAssets(this, "LICENSE"); - aboutText = aboutText.replace("\n", "<br/>"); - aboutOther.setText(Html.fromHtml(aboutText)); - } catch (IOException e) { - } - - - new AlertDialog.Builder(this) - .setTitle(getString(R.string.button_about)) - .setView(view) - .show(); - } - - @SuppressWarnings("SameParameterValue") - private static String readFromAssets(Context context, String filename) throws IOException { - BufferedReader reader = new BufferedReader(new InputStreamReader(context.getAssets().open(filename))); - - // do reading, usually loop until end of file reading - StringBuilder sb = new StringBuilder(); - String mLine = reader.readLine(); - while (mLine != null) { - sb.append(mLine).append('\n'); // process line - mLine = reader.readLine(); - } - reader.close(); - return sb.toString(); - } - - /** * This is our attempt to REALLY exit Orbot, and stop the background service * However, Android doesn't like people "quitting" apps, and/or our code may @@ -589,14 +540,13 @@ public class OrbotMainActivity extends AppCompatActivity Intent intentVPN = VpnService.prepare(this); if (intentVPN != null) - startActivityForResult(intentVPN,REQUEST_VPN); + startActivityForResult(intentVPN, REQUEST_VPN); else { sendIntentToService(ACTION_START); sendIntentToService(ACTION_START_VPN); } - } else - { + } else { //stop the VPN here sendIntentToService(ACTION_STOP_VPN); } @@ -879,11 +829,9 @@ public class OrbotMainActivity extends AppCompatActivity torStatus.equals(TorServiceConstants.STATUS_ON)) refreshVPNApps(); - } - else if (request == REQUEST_VPN && response == RESULT_OK) { + } else if (request == REQUEST_VPN && response == RESULT_OK) { sendIntentToService(ACTION_START_VPN); - } - else if (request == REQUEST_VPN && response == RESULT_CANCELED) { + } else if (request == REQUEST_VPN && response == RESULT_CANCELED) { mBtnVPN.setChecked(false); Prefs.putUseVpn(false); } diff --git a/app/src/main/java/org/torproject/android/ui/dialog/AboutDialogFragment.java b/app/src/main/java/org/torproject/android/ui/dialog/AboutDialogFragment.java new file mode 100644 index 00000000..38b9821a --- /dev/null +++ b/app/src/main/java/org/torproject/android/ui/dialog/AboutDialogFragment.java @@ -0,0 +1,90 @@ +package org.torproject.android.ui.dialog; + +import android.app.AlertDialog; +import android.app.Dialog; +import android.content.Context; +import android.content.pm.PackageManager; +import android.os.Bundle; +import android.text.Html; +import android.view.View; +import android.widget.TextView; + +import androidx.fragment.app.DialogFragment; + +import org.torproject.android.R; +import org.torproject.android.service.OrbotService; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; + +public class AboutDialogFragment extends DialogFragment { + + public static final String TAG = AboutDialogFragment.class.getSimpleName(); + + private TextView tvAbout; + private static final String BUNDLE_KEY_TV_ABOUT_TEXT = "about_tv_txt"; + + @Override + public Dialog onCreateDialog(Bundle savedInstanceState) { + View view = getActivity().getLayoutInflater().inflate(R.layout.layout_about, null); + String version; + + try { + version = getContext().getPackageManager().getPackageInfo( + getContext().getPackageName(), 0).versionName + " (Tor " + + OrbotService.BINARY_TOR_VERSION + ")"; + } catch (PackageManager.NameNotFoundException e) { + version = "Version Not Found"; + } + + TextView versionName = view.findViewById(R.id.versionName); + versionName.setText(version); + + tvAbout = view.findViewById(R.id.aboutother); + + boolean buildAboutText = true; + + if (savedInstanceState != null) { + String tvAboutText = savedInstanceState.getParcelable(BUNDLE_KEY_TV_ABOUT_TEXT); + if (tvAboutText != null) { + buildAboutText = false; + tvAbout.setText(tvAboutText); + } + } + + if (buildAboutText) { + try { + String aboutText = readFromAssets(getContext(), "LICENSE"); + aboutText = aboutText.replace("\n", "<br/>"); + tvAbout.setText(Html.fromHtml(aboutText)); + } catch (IOException e) { + } + } + return new AlertDialog.Builder(getContext()) + .setTitle(getString(R.string.button_about)) + .setView(view) + .create(); + } + + @SuppressWarnings("SameParameterValue") + private static String readFromAssets(Context context, String filename) throws IOException { + BufferedReader reader = new BufferedReader(new InputStreamReader(context.getAssets().open(filename))); + + // do reading, usually loop until end of file reading + StringBuilder sb = new StringBuilder(); + String mLine = reader.readLine(); + while (mLine != null) { + sb.append(mLine).append('\n'); // process line + mLine = reader.readLine(); + } + reader.close(); + return sb.toString(); + } + + @Override + public void onSaveInstanceState(Bundle outState) { + super.onSaveInstanceState(outState); + outState.putString(BUNDLE_KEY_TV_ABOUT_TEXT, tvAbout.getText().toString()); + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/layout_about.xml b/app/src/main/res/layout/layout_about.xml index 9d01498b..ce1792b3 100644 --- a/app/src/main/res/layout/layout_about.xml +++ b/app/src/main/res/layout/layout_about.xml @@ -1,117 +1,143 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> - <ScrollView - android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> - <LinearLayout - android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> - <TextView android:text="@string/wizard_details" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:paddingTop="15px" - android:paddingLeft="15px" - android:textStyle="bold" - android:textColor="#00ff00" /> - <TextView android:text="@string/wizard_details_msg" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:autoLink="web" - android:textColorLink="#ffffff" - android:paddingLeft="15px" - android:textColor="#ffffff" /> - - <TextView android:text="Version: " - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:paddingTop="15px" - android:paddingLeft="15px" - android:textStyle="bold" - android:textColor="#00ff00" /> - <TextView android:text="- Unknown -" - android:id="@+id/versionName" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:paddingLeft="15px" - android:layout_gravity="center_vertical" - android:textColor="#ffffff" /> - <TextView android:text="@string/project_home" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:paddingTop="15px" - android:paddingLeft="15px" - android:textStyle="bold" - android:textColor="#00ff00" /> - <TextView android:text="@string/project_urls" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:autoLink="web" - android:textColorLink="#ffffff" - android:paddingLeft="15px" - android:textColor="#ffffff" /> - <TextView android:text="@string/third_party_software" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:paddingTop="15px" - android:paddingLeft="15px" - android:textStyle="bold" - android:textColor="#00ff00" /> - <TextView android:text="@string/tor_version" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:autoLink="web" - android:textColorLink="#ffffff" - android:paddingLeft="15px" - android:textColor="#ffffff" /> - <TextView android:text="@string/libevent_version" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:autoLink="web" - android:textColorLink="#ffffff" - android:paddingLeft="15px" - android:textColor="#ffffff" /> - <TextView android:text="@string/polipo_version" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:autoLink="web" - android:textColorLink="#ffffff" - android:paddingLeft="15px" - android:textColor="#ffffff" /> - <TextView android:text="@string/obfsproxy_version" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:autoLink="web" - android:textColorLink="#ffffff" - android:paddingLeft="15px" - android:textColor="#ffffff"/> - <TextView android:text="@string/openssl_version" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:autoLink="web" - android:textColorLink="#ffffff" - android:paddingLeft="15px" - android:textColor="#ffffff" /> - - <TextView android:text="License: " - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:paddingTop="15px" - android:paddingLeft="15px" - android:textStyle="bold" - android:textColor="#00ff00" /> - <TextView - android:id="@+id/aboutother" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:autoLink="web" - android:textColorLink="#ffffff" - android:paddingLeft="15px" - android:textColor="#ffffff" /> - </LinearLayout> - </ScrollView> +<?xml version="1.0" encoding="utf-8"?>) + archivesBaseName = "Orbot-$versionName" + android:orientation="vertical"> + + <ScrollView + android:id="@+id/scrollView" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical"> + + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical"> + + <TextView + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:paddingLeft="15px" + android:paddingTop="15px" + android:text="@string/wizard_details" + android:textColor="#00ff00" + android:textStyle="bold" /> + + <TextView + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:autoLink="web" + android:paddingLeft="15px" + android:text="@string/wizard_details_msg" + android:textColor="#ffffff" + android:textColorLink="#ffffff" /> + + <TextView + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:paddingLeft="15px" + android:paddingTop="15px" + android:text="Version: " + android:textColor="#00ff00" + android:textStyle="bold" /> + + <TextView + android:id="@+id/versionName" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:paddingLeft="15px" + android:text="- Unknown -" + android:textColor="#ffffff" /> + + <TextView + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:paddingLeft="15px" + android:paddingTop="15px" + android:text="@string/project_home" + android:textColor="#00ff00" + android:textStyle="bold" /> + + <TextView + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:autoLink="web" + android:paddingLeft="15px" + android:text="@string/project_urls" + android:textColor="#ffffff" + android:textColorLink="#ffffff" /> + + <TextView + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:paddingLeft="15px" + android:paddingTop="15px" + android:text="@string/third_party_software" + android:textColor="#00ff00" + android:textStyle="bold" /> + + <TextView + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:autoLink="web" + android:paddingLeft="15px" + android:text="@string/tor_version" + android:textColor="#ffffff" + android:textColorLink="#ffffff" /> + + <TextView + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:autoLink="web" + android:paddingLeft="15px" + android:text="@string/libevent_version" + android:textColor="#ffffff" + android:textColorLink="#ffffff" /> + + <TextView + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:autoLink="web" + android:paddingLeft="15px" + android:text="@string/polipo_version" + android:textColor="#ffffff" + android:textColorLink="#ffffff" /> + + <TextView + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:autoLink="web" + android:paddingLeft="15px" + android:text="@string/obfsproxy_version" + android:textColor="#ffffff" + android:textColorLink="#ffffff" /> + + <TextView + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:autoLink="web" + android:paddingLeft="15px" + android:text="@string/openssl_version" + android:textColor="#ffffff" + android:textColorLink="#ffffff" /> + + <TextView + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:paddingLeft="15px" + android:paddingTop="15px" + android:text="License: " + android:textColor="#00ff00" + android:textStyle="bold" /> + + <TextView + android:id="@+id/aboutother" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:autoLink="web" + android:paddingLeft="15px" + android:textColor="#ffffff" + android:textColorLink="#ffffff" /> + </LinearLayout> + </ScrollView> </LinearLayout>

1 0

[orbot/master] When a new CAPTCHA is requested, immediately clear the old solution
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit 85c833192a17ad561bef1e39eb99708783f1e13c Author: bim <dsnake(a)protonmail.com> Date: Sun May 10 19:55:30 2020 -0400 When a new CAPTCHA is requested, immediately clear the old solution EditText instead of waiting for the CAPTCHA to finish downloading. --- .../main/java/org/torproject/android/ui/onboarding/MoatActivity.java | 3 +-- 1 file changed, 1 insertion(+), 2 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 df390a2f..c733c7ad 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 @@ -184,13 +184,12 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { case R.id.menu_refresh: + mEtSolution.setText(""); fetchCaptcha(); - return true; case android.R.id.home: finish(); - return true; }

1 0

[orbot/master] Delete rs-rAR translation
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit 1f54a962ebcfb72a5db04796fc00033969caae0c Author: Michal Čihař <michal(a)cihar.com> Date: Tue May 19 19:30:14 2020 +0200 Delete rs-rAR translation - I don't think there is Serbian used in Argentina. - The few existing strings seem to be actually Spanish, so it was probably meant to be es-rAR. --- app/src/main/res/values-rs-rAR/strings.xml | 32 ------------------------------ 1 file changed, 32 deletions(-) diff --git a/app/src/main/res/values-rs-rAR/strings.xml b/app/src/main/res/values-rs-rAR/strings.xml deleted file mode 100644 index 8955187a..00000000 --- a/app/src/main/res/values-rs-rAR/strings.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<resources> - <string name="app_name">Orbot</string> - <string name="status_starting_up">Orbot está iniciándose…</string> - <string name="status_activated">Conectado a la red Tor</string> - <string name="status_disabled">\"Orbot está Desactivado</string> - <string name="status_shutting_down">Orbot se está apagando</string> - <string name="tor_process_complete">Completar</string> - <string name="menu_settings">Configuración</string> - <string name="menu_log">Registro</string> - <string name="menu_start">Iniciar</string> - <string name="menu_stop">Detener</string> - <string name="menu_about">Acerca de</string> - <string name="button_about">Acerca de</string> - <string name="menu_exit">Salir</string> - <string name="btn_cancel">Cancelar</string> -  -  - <string name="pref_general_group">General</string> -  -  -  -  -  - - - - -  -  -</resources>

1 0

[orbot/master] Merge pull request #338 from bitmold/bridge_wized_landscape_fix
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit 216ca72c7fe2341d154caee2479980acc28060eb Merge: 952bee96 315a1a88 Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Sat May 30 06:15:41 2020 -0400 Merge pull request #338 from bitmold/bridge_wized_landscape_fix Bridge Wizard UI is Cut off in Landscape app/src/main/res/layout/content_bridge_wizard.xml | 103 ++++++++++++---------- 1 file changed, 55 insertions(+), 48 deletions(-)

1 0

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

24 Aug '20

commit 7beceb681182c18d140c321e090101275b2d69a3 Merge: b5e2c7b0 33276a9f Author: n8fr8 <nathan(a)guardianproject.info> Date: Sat May 30 05:57:27 2020 -0400 Merge branch 'dialog_rotation_fixes' of https://github.com/bitmold/orbot into bitmold-dialog_rotation_fixes .../org/torproject/android/OrbotMainActivity.java | 70 +----- .../android/ui/dialog/AboutDialogFragment.java | 90 ++++++++ .../android/ui/dialog/MoatErrorDialogFragment.java | 32 +++ .../android/ui/onboarding/MoatActivity.java | 9 +- app/src/main/res/layout/layout_about.xml | 254 ++++++++++++--------- 5 files changed, 274 insertions(+), 181 deletions(-)

1 0

[orbot/master] MOAT Errors won't disappear on device rotation
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit 33276a9f5104abf76cff54b2b737b739046bc269 Author: bim <dsnake(a)protonmail.com> Date: Sun May 10 18:51:37 2020 -0400 MOAT Errors won't disappear on device rotation --- .../org/torproject/android/OrbotMainActivity.java | 4 +-- .../android/ui/dialog/AboutDialogFragment.java | 2 +- .../android/ui/dialog/MoatErrorDialogFragment.java | 32 ++++++++++++++++++++++ .../android/ui/onboarding/MoatActivity.java | 9 ++---- app/src/main/res/layout/layout_about.xml | 6 ++-- 5 files changed, 41 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 837d7e60..c1359457 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -459,9 +459,7 @@ public class OrbotMainActivity extends AppCompatActivity Intent intent = new Intent(OrbotMainActivity.this, SettingsPreferences.class); startActivityForResult(intent, REQUEST_SETTINGS); } else if (item.getItemId() == R.id.menu_exit) { - //exit app - doExit(); - + doExit(); // exit appp } else if (item.getItemId() == R.id.menu_about) { new AboutDialogFragment().show(getSupportFragmentManager(), AboutDialogFragment.TAG); } else if (item.getItemId() == R.id.menu_scan) { diff --git a/app/src/main/java/org/torproject/android/ui/dialog/AboutDialogFragment.java b/app/src/main/java/org/torproject/android/ui/dialog/AboutDialogFragment.java index 38b9821a..10ad06b6 100644 --- a/app/src/main/java/org/torproject/android/ui/dialog/AboutDialogFragment.java +++ b/app/src/main/java/org/torproject/android/ui/dialog/AboutDialogFragment.java @@ -46,7 +46,7 @@ public class AboutDialogFragment extends DialogFragment { boolean buildAboutText = true; if (savedInstanceState != null) { - String tvAboutText = savedInstanceState.getParcelable(BUNDLE_KEY_TV_ABOUT_TEXT); + String tvAboutText = savedInstanceState.getString(BUNDLE_KEY_TV_ABOUT_TEXT); if (tvAboutText != null) { buildAboutText = false; tvAbout.setText(tvAboutText); diff --git a/app/src/main/java/org/torproject/android/ui/dialog/MoatErrorDialogFragment.java b/app/src/main/java/org/torproject/android/ui/dialog/MoatErrorDialogFragment.java new file mode 100644 index 00000000..ad8f9477 --- /dev/null +++ b/app/src/main/java/org/torproject/android/ui/dialog/MoatErrorDialogFragment.java @@ -0,0 +1,32 @@ +package org.torproject.android.ui.dialog; + +import android.app.AlertDialog; +import android.app.Dialog; +import android.os.Bundle; + +import androidx.fragment.app.DialogFragment; + +import org.torproject.android.R; + +public class MoatErrorDialogFragment extends DialogFragment { + + public static final String TAG = MoatErrorDialogFragment.class.getSimpleName(); + private static final String BUNDLE_KEY_MSG = "msg"; + + public static MoatErrorDialogFragment newInstance(String message) { + MoatErrorDialogFragment fragment = new MoatErrorDialogFragment(); + Bundle args = new Bundle(); + args.putString(BUNDLE_KEY_MSG, message); + fragment.setArguments(args); + return fragment; + } + + @Override + public Dialog onCreateDialog(Bundle savedInstanceState) { + return new AlertDialog.Builder(getContext()) + .setTitle(R.string.error) + .setMessage(getArguments().getString(BUNDLE_KEY_MSG)) + .setNegativeButton(R.string.btn_okay, null) + .create(); + } +} 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 df390a2f..83235e92 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 @@ -26,7 +26,6 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.appcompat.app.ActionBar; -import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; import androidx.localbroadcastmanager.content.LocalBroadcastManager; @@ -46,6 +45,7 @@ import org.torproject.android.R; import org.torproject.android.service.OrbotService; import org.torproject.android.service.TorServiceConstants; import org.torproject.android.service.util.Prefs; +import org.torproject.android.ui.dialog.MoatErrorDialogFragment; /** Implements the MOAT protocol: Fetches OBFS4 bridges via Meek Azure. @@ -435,11 +435,8 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe mBtRequest.setEnabled(mIvCaptcha.getVisibility() == View.VISIBLE); if (!isFinishing()) { - new AlertDialog.Builder(this) - .setTitle(R.string.error) - .setMessage(TextUtils.isEmpty(detail) ? exception.getLocalizedMessage() : detail) - .setNegativeButton(R.string.btn_okay, null) - .show(); + String message = TextUtils.isEmpty(detail) ? exception.getLocalizedMessage() : detail; + MoatErrorDialogFragment.newInstance(message).show(getSupportFragmentManager(), MoatErrorDialogFragment.TAG); } } } diff --git a/app/src/main/res/layout/layout_about.xml b/app/src/main/res/layout/layout_about.xml index ce1792b3..dca409c9 100644 --- a/app/src/main/res/layout/layout_about.xml +++ b/app/src/main/res/layout/layout_about.xml @@ -1,5 +1,7 @@ -<?xml version="1.0" encoding="utf-8"?>) - archivesBaseName = "Orbot-$versionName" +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="fill_parent" + android:layout_height="fill_parent" android:orientation="vertical"> <ScrollView

1 0

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

24 Aug '20

commit ad6ba4aaa7ac256a961fb58894baa8e0e1548191 Merge: b5e2c7b0 7beceb68 Author: n8fr8 <nathan(a)guardianproject.info> Date: Sat May 30 06:14:16 2020 -0400 Merge branch 'bitmold-dialog_rotation_fixes' .../org/torproject/android/OrbotMainActivity.java | 70 +----- .../android/ui/dialog/AboutDialogFragment.java | 90 ++++++++ .../android/ui/dialog/MoatErrorDialogFragment.java | 32 +++ .../android/ui/onboarding/MoatActivity.java | 9 +- app/src/main/res/layout/layout_about.xml | 254 ++++++++++++--------- 5 files changed, 274 insertions(+), 181 deletions(-)

1 0