[tor-commits] [orbot/master] update main activity to clean up intents

[n8fr8 at torproject.org]

commit 1e2074c818673ef8eccf0017984fdcb16d6ea82e
Author: n8fr8 <nathan at freitas.net>
Date:   Mon Oct 16 23:37:15 2017 -0400

    update main activity to clean up intents
---
 .../java/org/torproject/android/OrbotMainActivity.java  | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
index 013c9b43..afeab503 100644
--- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java
+++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
@@ -543,6 +543,7 @@ public class OrbotMainActivity extends AppCompatActivity
             try
             {
                 String aboutText = readFromAssets(this,"LICENSE");
+                aboutText = aboutText.replace("\n","<br/>");
                 aboutOther.setText(Html.fromHtml(aboutText));
             }
             catch (Exception e){}
@@ -747,7 +748,6 @@ public class OrbotMainActivity extends AppCompatActivity
         // Get intent, action and MIME type
         Intent intent = getIntent();
         String action = intent.getAction();
-        Log.d(TAG, "handleIntents " + action);
 
         if (action == null)
             return;
@@ -797,21 +797,6 @@ public class OrbotMainActivity extends AppCompatActivity
 
                 startTor();
 
-                //never allow backgrounds start from this type of intent start
-                //app devs who want background starts, can use the service intents
-                /**
-                 if (Prefs.allowBackgroundStarts())
-                 {
-                 Intent resultIntent;
-                 if (lastStatusIntent == null) {
-                 resultIntent = new Intent(intent);
-                 } else {
-                 resultIntent = lastStatusIntent;
-                 }
-                 resultIntent.putExtra(TorServiceConstants.EXTRA_STATUS, torStatus);
-                 setResult(RESULT_OK, resultIntent);
-                 finish();
-                 }*/
 
                 break;
             case Intent.ACTION_VIEW: