[tbb-commits] [tor-browser/tor-browser-52.7.2esr-8.0-1] Orfox: add BroadcastReceiver to receive Tor status from Orbot

[gk at torproject.org]

commit a9dbc810f24b511ca2eb079ba19830106658c9a9
Author: Hans-Christoph Steiner <hans at eds.org>
Date:   Tue Sep 1 20:49:27 2015 +0200

    Orfox: add BroadcastReceiver to receive Tor status from Orbot
    
    Signed-off-by: Amogh Pradeep <amoghbl1 at gmail.com>
---
 .../base/java/org/mozilla/gecko/BrowserApp.java    | 31 ++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
index a532b454a263..984f04eaf52c 100644
--- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
@@ -120,10 +120,12 @@ import android.app.AlertDialog;
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
+import android.content.BroadcastReceiver;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
@@ -1070,6 +1072,30 @@ public class BrowserApp extends GeckoApp
         }
     }
 
+    private BroadcastReceiver torStatusReceiver = new BroadcastReceiver() {
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (TextUtils.equals(intent.getAction(), OrbotHelper.ACTION_STATUS)) {
+                Log.i(LOGTAG, getPackageName() + " received intent : " + intent.getAction() + " " + intent.getPackage());
+                String status = intent.getStringExtra(OrbotHelper.EXTRA_STATUS) + " (" + intent.getStringExtra(OrbotHelper.EXTRA_PACKAGE_NAME) + ")";
+                Log.i(LOGTAG, status);
+
+                boolean enabled = (intent.getStringExtra(OrbotHelper.EXTRA_STATUS).equals(OrbotHelper.STATUS_ON));
+                // TODO
+                /*
+                   if(enabled) {
+                   if (intent.hasExtra(OrbotHelper.EXTRA_PROXY_PORT_HTTP))
+                   Log.i(LOGTAG, "HTTP PROXY: " + intent.getIntExtra(OrbotHelper.EXTRA_PROXY_PORT_HTTP, -1));
+
+                   if (intent.hasExtra(OrbotHelper.EXTRA_PROXY_PORT_SOCKS))
+                   Log.i(LOGTAG, "SOCKS PROXY: " + intent.getIntExtra(OrbotHelper.EXTRA_PROXY_PORT_SOCKS, -1));
+                   }
+                 */
+            }
+        }
+    };
+
     public void checkStartOrbot() {
         if (!OrbotHelper.isOrbotInstalled(this)) {
             final Intent intent = OrbotHelper.getOrbotInstallIntent(this);
@@ -1090,6 +1116,7 @@ public class BrowserApp extends GeckoApp
             });
             builder.show();
         } else {
+            registerReceiver(torStatusReceiver, new IntentFilter(OrbotHelper.ACTION_STATUS));
             OrbotHelper.requestStartTor(this);
         }
     }
@@ -1136,6 +1163,10 @@ public class BrowserApp extends GeckoApp
         if (mIsAbortingAppLaunch) {
             return;
         }
+        // Register for Prompt:ShowTop so we can foreground this activity even if it's hidden.
+        EventDispatcher.getInstance().registerGeckoThreadListener((GeckoEventListener) this,
+            "Prompt:ShowTop");
+        unregisterReceiver(torStatusReceiver);
 
         for (final BrowserAppDelegate delegate : delegates) {
             delegate.onRestart(this);