From 54e2e5e37297d075cd76f53fdf23ada63a7e8e88 Mon Sep 17 00:00:00 2001 From: arrase Date: Tue, 29 Nov 2016 21:04:41 +0100 Subject: [PATCH 1/3] fix for: https://github.com/n8fr8/orbot/issues/63 --- .../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 7706c0f5..551fb6e7 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -105,6 +105,7 @@ public class OrbotMainActivity extends AppCompatActivity /* Some tracking bits */ private String torStatus = TorServiceConstants.STATUS_OFF; //latest status reported from the tor service private Intent lastStatusIntent; // the last ACTION_STATUS Intent received + private Boolean isFirstRun = true; private SharedPreferences mPrefs = null; @@ -1301,8 +1302,9 @@ public class OrbotMainActivity extends AppCompatActivity String newTorStatus = msg.getData().getString("status"); String log = (String)msg.obj; - if (torStatus == null && newTorStatus != null) //first time status + if (isFirstRun && newTorStatus != null) //first time status { + isFirstRun = false; torStatus = newTorStatus; findViewById(R.id.frameMain).setVisibility(View.VISIBLE); updateStatus(log); From ad68947dd414d4217d7581fcfa987d1421d870fb Mon Sep 17 00:00:00 2001 From: arrase Date: Thu, 8 Dec 2016 16:12:29 +0100 Subject: [PATCH 2/3] fix for bug 63 --- .../torproject/android/OrbotMainActivity.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index 551fb6e7..062db3db 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -103,9 +103,8 @@ public class OrbotMainActivity extends AppCompatActivity private ActionBarDrawerToggle mDrawerToggle; /* Some tracking bits */ - private String torStatus = TorServiceConstants.STATUS_OFF; //latest status reported from the tor service + private String torStatus = null; //latest status reported from the tor service private Intent lastStatusIntent; // the last ACTION_STATUS Intent received - private Boolean isFirstRun = true; private SharedPreferences mPrefs = null; @@ -1199,8 +1198,12 @@ public class OrbotMainActivity extends AppCompatActivity if (resultIntent == null) resultIntent = new Intent(TorServiceConstants.ACTION_START); - resultIntent.putExtra(TorServiceConstants.EXTRA_STATUS, torStatus); - setResult(RESULT_OK, resultIntent); + resultIntent.putExtra( + TorServiceConstants.EXTRA_STATUS, + torStatus == null?TorServiceConstants.STATUS_OFF:torStatus + ); + + setResult(RESULT_OK, resultIntent); finish(); Log.d(TAG, "autoStartFromIntent finish"); } @@ -1301,10 +1304,9 @@ public class OrbotMainActivity extends AppCompatActivity String newTorStatus = msg.getData().getString("status"); String log = (String)msg.obj; - - if (isFirstRun && newTorStatus != null) //first time status + + if (torStatus == null && newTorStatus != null) //first time status { - isFirstRun = false; torStatus = newTorStatus; findViewById(R.id.frameMain).setVisibility(View.VISIBLE); updateStatus(log); From f1a8fbd6b64446e2ccf3c594ceb3f528694ea419 Mon Sep 17 00:00:00 2001 From: arrase Date: Thu, 8 Dec 2016 16:16:47 +0100 Subject: [PATCH 3/3] isolate --- app/src/main/java/org/torproject/android/OrbotMainActivity.java | 2 +- 1 file changed, 1 insertion(+), 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 062db3db..ef9d6a09 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -1305,7 +1305,7 @@ public class OrbotMainActivity extends AppCompatActivity String newTorStatus = msg.getData().getString("status"); String log = (String)msg.obj; - if (torStatus == null && newTorStatus != null) //first time status + if (torStatus == null && newTorStatus != null) //first time status { torStatus = newTorStatus; findViewById(R.id.frameMain).setVisibility(View.VISIBLE);