[tbb-commits] [tor-browser/tor-browser-60.5.1esr-8.5-1] Revert "Bug 28051 - Open Orbot when the notification is tapped"

[gk at torproject.org]

commit fbf54c71e26a64859f953e18a34e5c9e8831f071
Author: Matthew Finkel <Matthew.Finkel at gmail.com>
Date:   Fri Jan 18 13:07:10 2019 +0000

    Revert "Bug 28051 - Open Orbot when the notification is tapped"
    
    This reverts commit b5be1210aab76340526aa7828d5d9050b8183e62.
    
    Orbot isn't our bootstrapper anymore
---
 .../base/java/org/mozilla/gecko/LauncherActivity.java  | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/mobile/android/base/java/org/mozilla/gecko/LauncherActivity.java b/mobile/android/base/java/org/mozilla/gecko/LauncherActivity.java
index 4cd94ed538c7..e8f8facc24c6 100644
--- a/mobile/android/base/java/org/mozilla/gecko/LauncherActivity.java
+++ b/mobile/android/base/java/org/mozilla/gecko/LauncherActivity.java
@@ -45,9 +45,6 @@ import static org.mozilla.gecko.deeplink.DeepLinkContract.LINK_FXA_SIGNIN;
 
 import org.mozilla.gecko.deeplink.DeepLinkContract;
 
-import org.torproject.android.OrbotMainActivity;
-import org.torproject.android.service.TorServiceConstants;
-
 /**
  * Activity that receives incoming Intents and dispatches them to the appropriate activities (e.g. browser, custom tabs, web app).
  */
@@ -70,9 +67,6 @@ public class LauncherActivity extends Activity {
         } else if (isWebAppIntent(safeIntent)) {
             dispatchWebAppIntent();
 
-        } else if (TorServiceConstants.TOR_APP_USERNAME.equals(getIntent().getAction())) {
-            dispatchOrbotIntent();
-
         // If it's not a view intent, it won't be a custom tabs intent either. Just launch!
         } else if (!isViewIntentWithURL(safeIntent)) {
             dispatchNormalIntent();
@@ -122,18 +116,6 @@ public class LauncherActivity extends Activity {
         startActivity(intent);
     }
 
-    private void dispatchOrbotIntent() {
-        final String orbotStartAction = "android.intent.action.MAIN";
-        final Intent intent = new Intent(orbotStartAction, null, this, OrbotMainActivity.class);
-
-        //When we launch Orbot, we want a new task.
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
-        intent.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
-
-        startActivity(intent);
-    }
-
     private void dispatchUrlIntent(@NonNull String url) {
         Intent intent = new Intent(getIntent());
         intent.setData(Uri.parse(url));