commit cb2c5fe6619b4e93f5348d86208babd6e38e0031 Merge: 1953962 f1a8fbd Author: Nathan Freitas nathan@freitas.net Date: Sat Jan 14 06:45:43 2017 -0500
Merge branch 'fix_bug_63' of https://github.com/arrase/orbot into arrase-fix_bug_63
Conflicts: app/src/main/java/org/torproject/android/OrbotMainActivity.java
.../org/torproject/android/OrbotMainActivity.java | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-)
diff --cc app/src/main/java/org/torproject/android/OrbotMainActivity.java index 1a468d4,ef9d6a0..4945002 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@@ -1287,9 -1193,17 +1287,18 @@@ public class OrbotMainActivity extends if (autoStartFromIntent) { autoStartFromIntent = false; - Intent resultIntent = lastStatusIntent; - resultIntent.putExtra(TorServiceConstants.EXTRA_STATUS, torStatus); - setResult(RESULT_OK, resultIntent); + Intent resultIntent = lastStatusIntent; + - if (resultIntent == null) - resultIntent = new Intent(TorServiceConstants.ACTION_START); ++ if (resultIntent == null) ++ resultIntent = new Intent(TorServiceConstants.ACTION_START); ++ ++ resultIntent.putExtra( ++ TorServiceConstants.EXTRA_STATUS, ++ torStatus == null?TorServiceConstants.STATUS_OFF:torStatus ++ ); + - resultIntent.putExtra( - TorServiceConstants.EXTRA_STATUS, - torStatus == null?TorServiceConstants.STATUS_OFF:torStatus - ); ++ setResult(RESULT_OK, resultIntent); + - setResult(RESULT_OK, resultIntent); finish(); Log.d(TAG, "autoStartFromIntent finish"); }