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

[orbot/master] Improved UI: show progress spinner, start request on keyboard enter.
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit a34ee2213a1ba7c2be06798e50c2c17bc96789f2 Author: Benjamin Erhart <berhart(a)netzarchitekten.com> Date: Wed Apr 22 11:27:13 2020 +0200 Improved UI: show progress spinner, start request on keyboard enter. --- .../android/ui/onboarding/MoatActivity.java | 118 ++++++++++++++------- app/src/main/res/layout/activity_moat.xml | 23 +++- 2 files changed, 98 insertions(+), 43 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 e2f642fd..0b99477f 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 @@ -2,10 +2,9 @@ /* See LICENSE for licensing information */ package org.torproject.android.ui.onboarding; -import android.app.Dialog; +import android.app.Activity; import android.content.BroadcastReceiver; import android.content.Context; -import android.content.DialogInterface; import android.content.Intent; import android.content.IntentFilter; import android.graphics.BitmapFactory; @@ -13,11 +12,17 @@ import android.os.Bundle; import android.text.TextUtils; import android.util.Base64; import android.util.Log; +import android.view.KeyEvent; import android.view.Menu; import android.view.MenuItem; import android.view.View; +import android.view.inputmethod.EditorInfo; +import android.view.inputmethod.InputMethodManager; +import android.widget.Button; import android.widget.EditText; import android.widget.ImageView; +import android.widget.ProgressBar; +import android.widget.TextView; import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AlertDialog; @@ -50,12 +55,14 @@ import org.torproject.android.service.util.Prefs; API description: https://github.com/NullHypothesis/bridgedb#accessing-the-moat-interface */ -public class MoatActivity extends AppCompatActivity implements View.OnClickListener { +public class MoatActivity extends AppCompatActivity implements View.OnClickListener, TextView.OnEditorActionListener { private static String moatBaseUrl = "https://bridges.torproject.org/moat"; private ImageView mCaptchaIv; + private ProgressBar mProgressBar; private EditText mSolutionEt; + private Button mRequestBt; private String mChallenge; @@ -103,9 +110,14 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe setTitle(getString(R.string.request_bridges)); mCaptchaIv = findViewById(R.id.captchaIv); + mProgressBar = findViewById(R.id.progressBar); mSolutionEt = findViewById(R.id.solutionEt); + mRequestBt = findViewById(R.id.requestBt); - findViewById(R.id.requestBt).setOnClickListener(this); + mCaptchaIv.setVisibility(View.GONE); + mSolutionEt.setOnEditorActionListener(this); + mRequestBt.setEnabled(false); + mRequestBt.setOnClickListener(this); LocalBroadcastManager.getInstance(this).registerReceiver(mBroadcastReceiver, new IntentFilter(TorServiceConstants.ACTION_STATUS)); @@ -159,6 +171,27 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe return super.onOptionsItemSelected(item); } + + @Override + public boolean onEditorAction(TextView textView, int actionId, KeyEvent keyEvent) { + Log.d(MoatActivity.class.getSimpleName(), "Editor Action: actionId=" + actionId + ", IME_ACTION_GO=" + EditorInfo.IME_ACTION_GO); + + if (keyEvent != null && keyEvent.getKeyCode() == KeyEvent.KEYCODE_ENTER) { + if (keyEvent.getAction() == KeyEvent.ACTION_UP) { + InputMethodManager imm = (InputMethodManager) getSystemService(Activity.INPUT_METHOD_SERVICE); + if (imm != null) { + imm.hideSoftInputFromWindow(textView.getWindowToken(), 0); + } + + onClick(mSolutionEt); + } + + return true; + } + + return false; + } + @Override protected void onDestroy() { super.onDestroy(); @@ -167,6 +200,10 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe } private void fetchCaptcha() { + mProgressBar.setVisibility(View.VISIBLE); + mCaptchaIv.setVisibility(View.GONE); + mRequestBt.setEnabled(false); + JsonObjectRequest request = buildRequest("fetch", "\"type\": \"client-transports\", \"supported\": [\"obfs4\"]", new Response.Listener<JSONObject>() { @@ -179,19 +216,14 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe byte[] image = Base64.decode(data.getString("image"), Base64.DEFAULT); mCaptchaIv.setImageBitmap(BitmapFactory.decodeByteArray(image, 0, image.length)); + mProgressBar.setVisibility(View.GONE); + mCaptchaIv.setVisibility(View.VISIBLE); + mRequestBt.setEnabled(true); + } catch (JSONException e) { - Log.d(MoatActivity.class.getSimpleName(), "Error decoding answer."); - - new AlertDialog.Builder(MoatActivity.this) - .setTitle(R.string.error) - .setMessage(e.getLocalizedMessage()) - .setNegativeButton(R.string.btn_cancel, new Dialog.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - //Do nothing. - } - }) - .show(); + Log.d(MoatActivity.class.getSimpleName(), "Error decoding answer: " + response.toString()); + + displayError(e, response); } } }); @@ -202,6 +234,9 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe } private void requestBridges(String solution) { + mProgressBar.setVisibility(View.VISIBLE); + mRequestBt.setEnabled(false); + JsonObjectRequest request = buildRequest("check", "\"id\": \"2\", \"type\": \"moat-solution\", \"transport\": \"obfs4\", \"challenge\": \"" + mChallenge + "\", \"solution\": \"" + solution + "\", \"qrcode\": \"false\"", @@ -222,21 +257,14 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe Prefs.setBridgesList(sb.toString()); Prefs.putBridgesEnabled(true); - MoatActivity.this.finish(); + mProgressBar.setVisibility(View.GONE); - } catch (JSONException e) { + MoatActivity.this.finish(); + } + catch (JSONException e) { Log.d(MoatActivity.class.getSimpleName(), "Error decoding answer: " + response.toString()); - new AlertDialog.Builder(MoatActivity.this) - .setTitle(R.string.error) - .setMessage(e.getLocalizedMessage()) - .setNegativeButton(R.string.btn_cancel, new Dialog.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - //Do nothing. - } - }) - .show(); + displayError(e, response); } } }); @@ -267,16 +295,7 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe public void onErrorResponse(VolleyError error) { Log.d(MoatActivity.class.getSimpleName(), "Error response."); - new AlertDialog.Builder(MoatActivity.this) - .setTitle(R.string.error) - .setMessage(error.getLocalizedMessage()) - .setNegativeButton(R.string.btn_cancel, new Dialog.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - //Do nothing. - } - }) - .show(); + displayError(error, null); } } ) { @@ -322,4 +341,27 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe sendIntentToService(TorServiceConstants.ACTION_STATUS); } } + + private void displayError(Exception exception, JSONObject response) { + + String detail = null; + + // Try to decode potential error response. + if (response != null) { + try { + detail = response.getJSONArray("errors").getJSONObject(0).getString("detail"); + } catch (JSONException e2) { + // Ignore. Show first exception instead. + } + } + + mProgressBar.setVisibility(View.GONE); + mRequestBt.setEnabled(mCaptchaIv.getVisibility() == View.VISIBLE); + + new AlertDialog.Builder(this) + .setTitle(R.string.error) + .setMessage(TextUtils.isEmpty(detail) ? exception.getLocalizedMessage() : detail) + .setNegativeButton(R.string.btn_cancel, null) + .show(); + } } diff --git a/app/src/main/res/layout/activity_moat.xml b/app/src/main/res/layout/activity_moat.xml index fe01873c..b0a2b42f 100644 --- a/app/src/main/res/layout/activity_moat.xml +++ b/app/src/main/res/layout/activity_moat.xml @@ -28,20 +28,33 @@ android:layout_margin="12dp" android:text="@string/solve_captcha_instruction" /> - <ImageView - android:id="@+id/captchaIv" + <RelativeLayout android:layout_width="match_parent" android:layout_height="240dp" - android:contentDescription="@string/captcha" - tools:srcCompat="@tools:sample/backgrounds/scenic" /> + android:layout_margin="12dp"> + + <ImageView + android:id="@+id/captchaIv" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:contentDescription="@string/captcha" + tools:srcCompat="@tools:sample/backgrounds/scenic" /> + + <ProgressBar + android:id="@+id/progressBar" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + + </RelativeLayout> <EditText android:id="@+id/solutionEt" android:layout_width="match_parent" android:layout_height="wrap_content" android:autofillHints="" - android:hint="@string/enter_characters_from_image" android:ems="10" + android:hint="@string/enter_characters_from_image" + android:imeOptions="actionSend" android:inputType="textShortMessage|text" /> <Button

1 0

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

28 Apr '20

commit b1049ca625f8a2bbba58aede4dfa72014973a390 Merge: 410ae032 b9804c12 Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Apr 24 17:01:53 2020 -0400 Merge branch 'master' of https://github.com/guardianproject/orbot README | 2 +- .../org/torproject/android/OrbotMainActivity.java | 3 - .../org/torproject/android/settings/Languages.java | 18 +--- .../torproject/android/settings/LocaleHelper.java | 6 -- .../android/ui/onboarding/CustomSlideBigText.java | 60 ++++++++---- .../android/ui/onboarding/OnboardingActivity.java | 105 ++++++++++++++------- app/src/main/res/values/strings.xml | 7 ++ 7 files changed, 126 insertions(+), 75 deletions(-)

1 0

[orbot/master] Adapted to naming convention of project.
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit 7a9b9d1bfdb677391330fed638bf89f1c2c2d172 Author: Benjamin Erhart <berhart(a)netzarchitekten.com> Date: Wed Apr 22 12:24:27 2020 +0200 Adapted to naming convention of project. --- .../android/ui/onboarding/MoatActivity.java | 38 +++++++++++----------- 1 file changed, 19 insertions(+), 19 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 71d97715..30275609 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 @@ -60,10 +60,10 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe private static String moatBaseUrl = "https://bridges.torproject.org/moat"; - private ImageView mCaptchaIv; + private ImageView mIvCaptcha; private ProgressBar mProgressBar; - private EditText mSolutionEt; - private Button mRequestBt; + private EditText mEtSolution; + private Button mBtRequest; private String mChallenge; @@ -115,15 +115,15 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe setTitle(getString(R.string.request_bridges)); - mCaptchaIv = findViewById(R.id.captchaIv); + mIvCaptcha = findViewById(R.id.captchaIv); mProgressBar = findViewById(R.id.progressBar); - mSolutionEt = findViewById(R.id.solutionEt); - mRequestBt = findViewById(R.id.requestBt); + mEtSolution = findViewById(R.id.solutionEt); + mBtRequest = findViewById(R.id.requestBt); - mCaptchaIv.setVisibility(View.GONE); - mSolutionEt.setOnEditorActionListener(this); - mRequestBt.setEnabled(false); - mRequestBt.setOnClickListener(this); + mIvCaptcha.setVisibility(View.GONE); + mEtSolution.setOnEditorActionListener(this); + mBtRequest.setEnabled(false); + mBtRequest.setOnClickListener(this); LocalBroadcastManager.getInstance(this).registerReceiver(mBroadcastReceiver, new IntentFilter(TorServiceConstants.ACTION_STATUS)); @@ -160,7 +160,7 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe public void onClick(View view) { Log.d(MoatActivity.class.getSimpleName(), "Request Bridge!"); - requestBridges(mSolutionEt.getText().toString()); + requestBridges(mEtSolution.getText().toString()); } @Override @@ -192,7 +192,7 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe imm.hideSoftInputFromWindow(textView.getWindowToken(), 0); } - onClick(mSolutionEt); + onClick(mEtSolution); } return true; @@ -223,8 +223,8 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe private void fetchCaptcha() { mProgressBar.setVisibility(View.VISIBLE); - mCaptchaIv.setVisibility(View.GONE); - mRequestBt.setEnabled(false); + mIvCaptcha.setVisibility(View.GONE); + mBtRequest.setEnabled(false); JsonObjectRequest request = buildRequest("fetch", "\"type\": \"client-transports\", \"supported\": [\"obfs4\"]", @@ -236,11 +236,11 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe mChallenge = data.getString("challenge"); byte[] image = Base64.decode(data.getString("image"), Base64.DEFAULT); - mCaptchaIv.setImageBitmap(BitmapFactory.decodeByteArray(image, 0, image.length)); + mIvCaptcha.setImageBitmap(BitmapFactory.decodeByteArray(image, 0, image.length)); mProgressBar.setVisibility(View.GONE); - mCaptchaIv.setVisibility(View.VISIBLE); - mRequestBt.setEnabled(true); + mIvCaptcha.setVisibility(View.VISIBLE); + mBtRequest.setEnabled(true); } catch (JSONException e) { Log.d(MoatActivity.class.getSimpleName(), "Error decoding answer: " + response.toString()); @@ -257,7 +257,7 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe private void requestBridges(String solution) { mProgressBar.setVisibility(View.VISIBLE); - mRequestBt.setEnabled(false); + mBtRequest.setEnabled(false); JsonObjectRequest request = buildRequest("check", "\"id\": \"2\", \"type\": \"moat-solution\", \"transport\": \"obfs4\", \"challenge\": \"" @@ -387,7 +387,7 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe } mProgressBar.setVisibility(View.GONE); - mRequestBt.setEnabled(mCaptchaIv.getVisibility() == View.VISIBLE); + mBtRequest.setEnabled(mIvCaptcha.getVisibility() == View.VISIBLE); new AlertDialog.Builder(this) .setTitle(R.string.error)

1 0

[orbot/master] Don't allow refresh button to trigger while request ongoing.
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit f94931ee7c7df3878dd8b54969d9a3e19852c4d4 Author: Benjamin Erhart <berhart(a)netzarchitekten.com> Date: Wed Apr 22 12:47:34 2020 +0200 Don't allow refresh button to trigger while request ongoing. --- .../android/ui/onboarding/MoatActivity.java | 49 ++++++++++++---------- 1 file changed, 26 insertions(+), 23 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 30275609..12ed6e3e 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 @@ -74,7 +74,7 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe private boolean mSuccess; - private String mTorStatus; + private boolean mRequestInProgress = true; private BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() { @Override @@ -140,8 +140,7 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe @Override public boolean onPrepareOptionsMenu(Menu menu) { - menu.findItem(R.id.menu_refresh) - .setEnabled(TorServiceConstants.STATUS_ON.equals(mTorStatus)); + menu.findItem(R.id.menu_refresh).setEnabled(!mRequestInProgress); return super.onPrepareOptionsMenu(menu); } @@ -205,10 +204,7 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe protected void onPause() { super.onPause(); - if (mSuccess) { - setResult(RESULT_OK); - } - else { + if (!mSuccess) { Prefs.setBridgesList(mOriginalBridges); Prefs.putBridgesEnabled(mOriginalBridgeStatus); } @@ -222,24 +218,23 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe } private void fetchCaptcha() { - mProgressBar.setVisibility(View.VISIBLE); - mIvCaptcha.setVisibility(View.GONE); - mBtRequest.setEnabled(false); - JsonObjectRequest request = buildRequest("fetch", "\"type\": \"client-transports\", \"supported\": [\"obfs4\"]", new Response.Listener<JSONObject>() { @Override public void onResponse(JSONObject response) { + mRequestInProgress = false; + invalidateOptionsMenu(); + mProgressBar.setVisibility(View.GONE); + try { JSONObject data = response.getJSONArray("data").getJSONObject(0); mChallenge = data.getString("challenge"); byte[] image = Base64.decode(data.getString("image"), Base64.DEFAULT); mIvCaptcha.setImageBitmap(BitmapFactory.decodeByteArray(image, 0, image.length)); - - mProgressBar.setVisibility(View.GONE); mIvCaptcha.setVisibility(View.VISIBLE); + mEtSolution.setText(null); mBtRequest.setEnabled(true); } catch (JSONException e) { @@ -247,24 +242,32 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe displayError(e, response); } + } }); if (request != null) { + mRequestInProgress = true; + invalidateOptionsMenu(); + mProgressBar.setVisibility(View.VISIBLE); + mIvCaptcha.setVisibility(View.GONE); + mBtRequest.setEnabled(false); + mQueue.add(request); } } private void requestBridges(String solution) { - mProgressBar.setVisibility(View.VISIBLE); - mBtRequest.setEnabled(false); - JsonObjectRequest request = buildRequest("check", "\"id\": \"2\", \"type\": \"moat-solution\", \"transport\": \"obfs4\", \"challenge\": \"" + mChallenge + "\", \"solution\": \"" + solution + "\", \"qrcode\": \"false\"", new Response.Listener<JSONObject>() { @Override public void onResponse(JSONObject response) { + mRequestInProgress = false; + invalidateOptionsMenu(); + mProgressBar.setVisibility(View.GONE); + try { JSONArray bridges = response.getJSONArray("data").getJSONObject(0).getJSONArray("bridges"); @@ -279,11 +282,9 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe Prefs.setBridgesList(sb.toString()); Prefs.putBridgesEnabled(true); - mProgressBar.setVisibility(View.GONE); - mSuccess = true; - - MoatActivity.this.finish(); + setResult(RESULT_OK); + finish(); } catch (JSONException e) { Log.d(MoatActivity.class.getSimpleName(), "Error decoding answer: " + response.toString()); @@ -294,6 +295,11 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe }); if (request != null) { + mRequestInProgress = true; + invalidateOptionsMenu(); + mProgressBar.setVisibility(View.VISIBLE); + mBtRequest.setEnabled(false); + mQueue.add(request); } } @@ -343,9 +349,6 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe private void setUp(String host, int port, String status) { Log.d(MoatActivity.class.getSimpleName(), "Tor status=" + status); - mTorStatus = status; - invalidateOptionsMenu(); - switch (status) { case TorServiceConstants.STATUS_OFF: // We need the Meek bridge.

1 0

[orbot/master] Fixed behaviour on device turn.
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit 1749167ac07d7a0ffdbd6378b55482bbc3143e05 Author: Benjamin Erhart <berhart(a)netzarchitekten.com> Date: Wed Apr 22 13:35:35 2020 +0200 Fixed behaviour on device turn. --- .../android/ui/onboarding/MoatActivity.java | 55 +++++++++++---- app/src/main/res/layout/activity_moat.xml | 78 +++++++++++++--------- 2 files changed, 86 insertions(+), 47 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 12ed6e3e..f4e3a107 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 @@ -24,6 +24,7 @@ import android.widget.ImageView; import android.widget.ProgressBar; import android.widget.TextView; +import androidx.annotation.NonNull; import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AppCompatActivity; @@ -66,6 +67,7 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe private Button mBtRequest; private String mChallenge; + private byte[] mCaptcha; private RequestQueue mQueue; @@ -120,11 +122,29 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe mEtSolution = findViewById(R.id.solutionEt); mBtRequest = findViewById(R.id.requestBt); - mIvCaptcha.setVisibility(View.GONE); mEtSolution.setOnEditorActionListener(this); - mBtRequest.setEnabled(false); mBtRequest.setOnClickListener(this); + if (savedInstanceState != null) { + mOriginalBridges = savedInstanceState.getString("originalBridges"); + mOriginalBridgeStatus = savedInstanceState.getBoolean("originalBridgeStatus"); + mChallenge = savedInstanceState.getString("challenge"); + mCaptcha = savedInstanceState.getByteArray("captcha"); + + if (mCaptcha != null) { + mProgressBar.setVisibility(View.GONE); + mIvCaptcha.setImageBitmap(BitmapFactory.decodeByteArray(mCaptcha, 0, mCaptcha.length)); + mRequestInProgress = false; + } + } + else { + mIvCaptcha.setVisibility(View.GONE); + mBtRequest.setEnabled(false); + + mOriginalBridges = Prefs.getBridgesList(); + mOriginalBridgeStatus = Prefs.bridgesEnabled(); + } + LocalBroadcastManager.getInstance(this).registerReceiver(mBroadcastReceiver, new IntentFilter(TorServiceConstants.ACTION_STATUS)); } @@ -149,9 +169,6 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe protected void onResume() { super.onResume(); - mOriginalBridges = Prefs.getBridgesList(); - mOriginalBridgeStatus = Prefs.bridgesEnabled(); - sendIntentToService(TorServiceConstants.ACTION_STATUS); } @@ -201,13 +218,13 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe } @Override - protected void onPause() { - super.onPause(); + public void onSaveInstanceState(@NonNull Bundle outState) { + super.onSaveInstanceState(outState); - if (!mSuccess) { - Prefs.setBridgesList(mOriginalBridges); - Prefs.putBridgesEnabled(mOriginalBridgeStatus); - } + outState.putString("originalBridges", mOriginalBridges); + outState.putBoolean("originalBridgeStatus", mOriginalBridgeStatus); + outState.putString("challenge", mChallenge); + outState.putByteArray("captcha", mCaptcha); } @Override @@ -215,6 +232,11 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe super.onDestroy(); LocalBroadcastManager.getInstance(this).unregisterReceiver(mBroadcastReceiver); + + if (!mSuccess) { + Prefs.setBridgesList(mOriginalBridges); + Prefs.putBridgesEnabled(mOriginalBridgeStatus); + } } private void fetchCaptcha() { @@ -231,8 +253,8 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe JSONObject data = response.getJSONArray("data").getJSONObject(0); mChallenge = data.getString("challenge"); - byte[] image = Base64.decode(data.getString("image"), Base64.DEFAULT); - mIvCaptcha.setImageBitmap(BitmapFactory.decodeByteArray(image, 0, image.length)); + mCaptcha = Base64.decode(data.getString("image"), Base64.DEFAULT); + mIvCaptcha.setImageBitmap(BitmapFactory.decodeByteArray(mCaptcha, 0, mCaptcha.length)); mIvCaptcha.setVisibility(View.VISIBLE); mEtSolution.setText(null); mBtRequest.setEnabled(true); @@ -253,6 +275,9 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe mIvCaptcha.setVisibility(View.GONE); mBtRequest.setEnabled(false); + mChallenge = null; + mCaptcha = null; + mQueue.add(request); } } @@ -370,7 +395,9 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe sendIntentToService(TorServiceConstants.CMD_SIGNAL_HUP); - fetchCaptcha(); + if (mCaptcha == null) { + fetchCaptcha(); + } break; } diff --git a/app/src/main/res/layout/activity_moat.xml b/app/src/main/res/layout/activity_moat.xml index b0a2b42f..c6a88209 100644 --- a/app/src/main/res/layout/activity_moat.xml +++ b/app/src/main/res/layout/activity_moat.xml @@ -22,45 +22,57 @@ </com.google.android.material.appbar.AppBarLayout> - <TextView + <ScrollView android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="12dp" - android:text="@string/solve_captcha_instruction" /> - - <RelativeLayout - android:layout_width="match_parent" - android:layout_height="240dp" - android:layout_margin="12dp"> + android:layout_height="match_parent"> - <ImageView - android:id="@+id/captchaIv" + <LinearLayout android:layout_width="match_parent" - android:layout_height="match_parent" - android:contentDescription="@string/captcha" - tools:srcCompat="@tools:sample/backgrounds/scenic" /> + android:layout_height="wrap_content" + android:orientation="vertical" > - <ProgressBar - android:id="@+id/progressBar" - android:layout_width="match_parent" - android:layout_height="match_parent" /> + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="12dp" + android:text="@string/solve_captcha_instruction" /> - </RelativeLayout> + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="160dp" + android:layout_margin="12dp"> - <EditText - android:id="@+id/solutionEt" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:autofillHints="" - android:ems="10" - android:hint="@string/enter_characters_from_image" - android:imeOptions="actionSend" - android:inputType="textShortMessage|text" /> + <ImageView + android:id="@+id/captchaIv" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:contentDescription="@string/captcha" + tools:srcCompat="@tools:sample/backgrounds/scenic" /> - <Button - android:id="@+id/requestBt" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/request_bridges" /> + <ProgressBar + android:id="@+id/progressBar" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + + </RelativeLayout> + + <EditText + android:id="@+id/solutionEt" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:autofillHints="" + android:ems="10" + android:hint="@string/enter_characters_from_image" + android:imeOptions="actionSend" + android:inputType="textShortMessage|text" /> + + <Button + android:id="@+id/requestBt" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/request_bridges" /> + + </LinearLayout> + </ScrollView> </LinearLayout>

1 0

[orbot/master] Merge pull request #311 from bitmold/email_bridges_fix
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit 09ded59ce304d18eff3a25904558008117d7872e Merge: b9804c12 446dfa6e Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Fri Apr 24 17:05:02 2020 -0400 Merge pull request #311 from bitmold/email_bridges_fix Fixes bugs in #289 pertaining to parsing bridges .../torproject/android/service/OrbotService.java | 30 ++++++++-------------- 1 file changed, 10 insertions(+), 20 deletions(-)

1 0

[orbot/master] Color indeterminate ProgressBar.
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit 19d5054456e876ab3c136e57fac36ed08a746f69 Author: Benjamin Erhart <berhart(a)netzarchitekten.com> Date: Wed Apr 22 13:43:13 2020 +0200 Color indeterminate ProgressBar. --- app/src/main/res/layout/activity_moat.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/layout/activity_moat.xml b/app/src/main/res/layout/activity_moat.xml index c6a88209..432c4d42 100644 --- a/app/src/main/res/layout/activity_moat.xml +++ b/app/src/main/res/layout/activity_moat.xml @@ -52,7 +52,10 @@ <ProgressBar android:id="@+id/progressBar" android:layout_width="match_parent" - android:layout_height="match_parent" /> + android:layout_height="match_parent" + android:indeterminateTint="@color/dark_green" + android:indeterminateTintMode="src_in" + tools:targetApi="lollipop" /> </RelativeLayout>

1 0

[orbot/master] Merge pull request #305 from Hashik-Donthineni/AppIntroOrientationFix
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit b9804c12371ae0aea260035f1c4f39af6b8fd717 Merge: 86279895 bfbb85bc Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Fri Apr 24 17:00:59 2020 -0400 Merge pull request #305 from Hashik-Donthineni/AppIntroOrientationFix Fixed the welcome screen being blank after rotation .../org/torproject/android/OrbotMainActivity.java | 3 - .../android/ui/onboarding/CustomSlideBigText.java | 60 ++++++++---- .../android/ui/onboarding/OnboardingActivity.java | 105 ++++++++++++++------- app/src/main/res/values/strings.xml | 7 ++ 4 files changed, 124 insertions(+), 51 deletions(-)

1 0

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

28 Apr '20

commit 732c1538a62131cba2713401ae205fcc6257dea9 Merge: b1049ca6 09ded59c Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Apr 24 17:05:07 2020 -0400 Merge branch 'master' of https://github.com/guardianproject/orbot .../torproject/android/service/OrbotService.java | 30 ++++++++-------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --cc orbotservice/src/main/java/org/torproject/android/service/OrbotService.java index a5731fae,90d07456..8762a7e5 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@@ -25,11 -25,8 +25,9 @@@ import android.content.IntentFilter import android.content.SharedPreferences; import android.content.pm.PackageManager; import android.database.Cursor; - import android.net.ConnectivityManager; - import android.net.NetworkInfo; import android.net.Uri; import android.os.Build; +import android.os.Debug; import android.os.IBinder; import android.os.RemoteException; import android.provider.BaseColumns;

1 0

[orbot/master] Merge branch 'master' of https://github.com/tladesignz/orbot into tladesignz-master
by n8fr8＠torproject.org 28 Apr '20

28 Apr '20

commit f2c8473fe781d246dd9078576c1474c06ba999da Merge: 732c1538 19d50544 Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Apr 24 17:07:53 2020 -0400 Merge branch 'master' of https://github.com/tladesignz/orbot into tladesignz-master BUILD | 3 + app/build.gradle | 11 +- app/src/main/AndroidManifest.xml | 139 +-- .../org/torproject/android/OrbotMainActivity.java | 937 ++++++++++----------- .../ui/onboarding/BridgeWizardActivity.java | 133 ++- .../android/ui/onboarding/MoatActivity.java | 428 ++++++++++ .../android/ui/onboarding/ProxiedHurlStack.java | 33 + app/src/main/res/layout/activity_moat.xml | 81 ++ app/src/main/res/layout/content_bridge_wizard.xml | 9 +- app/src/main/res/menu/moat.xml | 28 + app/src/main/res/values/strings.xml | 16 +- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 +- 13 files changed, 1215 insertions(+), 609 deletions(-)

1 0