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

[orbot/master] Limited MOAT Solution Length to spec's 20 byte limit
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit 9b3afa51bec3ad4124a569af521e63a022426c34 Author: bim <dsnake(a)protonmail.com> Date: Mon May 11 16:13:42 2020 -0400 Limited MOAT Solution Length to spec's 20 byte limit --- app/src/main/res/layout/activity_moat.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/layout/activity_moat.xml b/app/src/main/res/layout/activity_moat.xml index 432c4d42..c9d68d12 100644 --- a/app/src/main/res/layout/activity_moat.xml +++ b/app/src/main/res/layout/activity_moat.xml @@ -4,8 +4,8 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical" android:background="@color/dark_purple" + android:orientation="vertical" tools:context=".ui.onboarding.MoatActivity"> <com.google.android.material.appbar.AppBarLayout @@ -29,7 +29,7 @@ <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical" > + android:orientation="vertical"> <TextView android:layout_width="match_parent" @@ -67,7 +67,8 @@ android:ems="10" android:hint="@string/enter_characters_from_image" android:imeOptions="actionSend" - android:inputType="textShortMessage|text" /> + android:inputType="textShortMessage|text" + android:maxLength="20" /> <Button android:id="@+id/requestBt"

1 0

[orbot/master] updating base versionCode to 1620200100 and changing how arch increments happen
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit b5e2c7b0f24608f3caab97b6f7c570fcd455afdc Author: n8fr8 <nathan(a)guardianproject.info> Date: Sat May 30 05:56:16 2020 -0400 updating base versionCode to 1620200100 and changing how arch increments happen --- app/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 5240f8a3..faa6df5b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,7 +73,7 @@ android { minSdkVersion 16 applicationId 'org.torproject.android' targetSdkVersion 29 - versionCode 16202001 + versionCode 1620200100 versionName getVersionName() archivesBaseName = "Orbot-$versionName" } @@ -83,7 +83,7 @@ android { minSdkVersion 16 applicationId 'org.torproject.android.max' targetSdkVersion 28 - versionCode 16141000 + versionCode 161410000 versionName getVersionName() archivesBaseName = "orbotMAX-$versionName" }**/ @@ -138,7 +138,7 @@ android.applicationVariants.all { variant -> variant.outputs.each { output -> def baseVersionCode = project.ext.abiCodes.get(output.getFilter(OutputFile.ABI)) if (baseVersionCode != null) { - output.versionCodeOverride = Integer.valueOf(baseVersionCode + variant.versionCode) + output.versionCodeOverride = Integer.valueOf(variant.versionCode) + Integer.valueOf(baseVersionCode) } } }

1 0

[orbot/master] Fixes #343 hosted services dialog crash
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit b18f9b8a1aa2ca052c40cfcb40deb174966dde02 Author: bim <dsnake(a)protonmail.com> Date: Tue May 19 16:44:06 2020 -0400 Fixes #343 hosted services dialog crash --- .../ui/hiddenservices/dialogs/HSDataDialog.java | 27 ++++++++++++---------- .../ui/hiddenservices/dialogs/HSDeleteDialog.java | 2 +- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDataDialog.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDataDialog.java index bfae0ca3..ee3ac343 100644 --- a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDataDialog.java +++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDataDialog.java @@ -5,14 +5,17 @@ import android.app.Dialog; import android.content.ContentResolver; import android.content.ContentValues; import android.os.Bundle; + import androidx.annotation.NonNull; import androidx.fragment.app.DialogFragment; import androidx.appcompat.app.AlertDialog; + import android.view.View; import android.widget.Button; import android.widget.CheckBox; import android.widget.EditText; import android.widget.Toast; + import org.torproject.android.R; import org.torproject.android.ui.hiddenservices.providers.HSContentProvider; @@ -35,14 +38,15 @@ public class HSDataDialog extends DialogFragment { save.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { String serverName = ((EditText) dialog_view.findViewById(R.id.hsName)).getText().toString(); - Integer localPort = Integer.parseInt( - ((EditText) dialog_view.findViewById(R.id.hsLocalPort)).getText().toString() - ); - Integer onionPort = Integer.parseInt( - ((EditText) dialog_view.findViewById(R.id.hsOnionPort)).getText().toString() - ); - - Boolean authCookie = ((CheckBox) dialog_view.findViewById(R.id.hsAuth)).isChecked(); + int localPort, onionPort; + try { + localPort = Integer.parseInt(((EditText) dialog_view.findViewById(R.id.hsLocalPort)).getText().toString()); + onionPort = Integer.parseInt(((EditText) dialog_view.findViewById(R.id.hsOnionPort)).getText().toString()); + } catch (NumberFormatException nfe) { + Toast.makeText(v.getContext(), R.string.fields_can_t_be_empty, Toast.LENGTH_LONG).show(); + return; + } + boolean authCookie = ((CheckBox) dialog_view.findViewById(R.id.hsAuth)).isChecked(); if (checkInput(serverName, localPort, onionPort)) { saveData(serverName, localPort, onionPort, authCookie); @@ -64,9 +68,9 @@ public class HSDataDialog extends DialogFragment { return serviceDataDialog; } - private boolean checkInput(String serverName, Integer local, Integer remote) { + private boolean checkInput(String serverName, int local, int remote) { boolean is_ok = true; - Integer error_msg = 0; + int error_msg = 0; if ((local < 1 || local > 65535) || (remote < 1 || remote > 65535)) { error_msg = R.string.invalid_port; @@ -85,8 +89,7 @@ public class HSDataDialog extends DialogFragment { return is_ok; } - private void saveData(String name, Integer local, Integer remote, Boolean authCookie) { - + private void saveData(String name, int local, int remote, boolean authCookie) { ContentValues fields = new ContentValues(); fields.put(HSContentProvider.HiddenService.NAME, name); fields.put(HSContentProvider.HiddenService.PORT, local); diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDeleteDialog.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDeleteDialog.java index a0951d35..27a547f8 100644 --- a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDeleteDialog.java +++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDeleteDialog.java @@ -34,7 +34,7 @@ public class HSDeleteDialog extends DialogFragment { null ); - // Delete from interal storage + // Delete from internal storage String base = context.getFilesDir().getAbsolutePath() + "/" + TorServiceConstants.HIDDEN_SERVICES_DIR; File dir = new File(base, "hs" + arguments.getString("port"));

1 0

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

24 Aug '20

commit 7a0db40396823a20e3ca1d7bf787b639515e0264 Author: Michal Čihař <michal(a)cihar.com> Date: Mon May 18 14:47:36 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. --- .../src/main/res/values-rs-rAR/strings.xml | 23 ---------------------- 1 file changed, 23 deletions(-) diff --git a/orbotservice/src/main/res/values-rs-rAR/strings.xml b/orbotservice/src/main/res/values-rs-rAR/strings.xml deleted file mode 100644 index 520c0a26..00000000 --- a/orbotservice/src/main/res/values-rs-rAR/strings.xml +++ /dev/null @@ -1,23 +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> -  -  -  -  -  -  -  - - - - -  -  -</resources>

1 0

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

24 Aug '20

commit 952bee96536f166ddd8c8de0594279b741a3e150 Merge: ad6ba4aa 85c83319 Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Sat May 30 06:15:00 2020 -0400 Merge pull request #337 from bitmold/moat_reset_ui_fix When a new CAPTCHA is requested, immediately clear the old solution .../main/java/org/torproject/android/ui/onboarding/MoatActivity.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)

1 0

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

24 Aug '20

commit da5f80d7dab1cd50ee9326fa334b500904175875 Merge: 44ece312 b18f9b8a Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Sat May 30 06:21:46 2020 -0400 Merge pull request #344 from bitmold/hosted_services_dialog_crash Fixes #343 hosted services dialog crash .../ui/hiddenservices/dialogs/HSDataDialog.java | 27 ++++++++++++---------- .../ui/hiddenservices/dialogs/HSDeleteDialog.java | 2 +- 2 files changed, 16 insertions(+), 13 deletions(-)

1 0

[orbot/master] Merge pull request #341 from nijel/patch-1
by n8fr8＠torproject.org 24 Aug '20

24 Aug '20

commit 44ece31256ec2f0f74c936e8ca921825582c0222 Merge: cd92f881 1f54a962 Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Sat May 30 06:20:25 2020 -0400 Merge pull request #341 from nijel/patch-1 Delete rs-rAR translation app/src/main/res/values-rs-rAR/strings.xml | 32 ---------------------- .../src/main/res/values-rs-rAR/strings.xml | 23 ---------------- 2 files changed, 55 deletions(-)

1 0

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

24 Aug '20

commit cd92f8816e97d1febc1be10cf5565990232ceb2d Merge: 216ca72c 9b3afa51 Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Sat May 30 06:17:59 2020 -0400 Merge pull request #339 from bitmold/moat_max_solution_len Limited MOAT Solution Length to spec's 20 byte limit app/src/main/res/layout/activity_moat.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)

1 0

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

24 Aug '20

commit 80b532ea8fc2d4f98ca05e07d1ab4b9131bb3610 Merge: da5f80d7 f8b1fceb Author: n8fr8 <nathan(a)guardianproject.info> Date: Sat May 30 06:24:15 2020 -0400 Merge branch 'bug_tor_wont_stop_with_activeVPN' of https://github.com/bitmold/orbot into 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, 55 insertions(+), 158 deletions(-) diff --cc app/src/main/java/org/torproject/android/OrbotMainActivity.java index c1359457,ec7db2ba..61e4b4f2 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@@ -827,11 -883,12 +831,10 @@@ public class OrbotMainActivity extends 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); } IntentResult scanResult = IntentIntegrator.parseActivityResult(request, response, data);

1 0

[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