X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fhelpers%2FOrbotProxyHelper.java;h=6253bc1c3baac61870662e72e502c27a3c68b271;hb=49e94a767e452d451a722bbb068e46458e404ed9;hp=8d0e408262fc8d993b3660466d3a1d1bd654c7e8;hpb=f7ad9e2325cd19f0571e569ff160f2fffac5c5a5;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/java/com/stoutner/privacybrowser/helpers/OrbotProxyHelper.java b/app/src/main/java/com/stoutner/privacybrowser/helpers/OrbotProxyHelper.java
index 8d0e4082..6253bc1c 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/helpers/OrbotProxyHelper.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/helpers/OrbotProxyHelper.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+/*
+ * Copyright © 2016-2018 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
@@ -19,18 +19,18 @@
 
 package com.stoutner.privacybrowser.helpers;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Proxy;
-import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AlertDialog;
 import android.util.ArrayMap;
 import android.util.Log;
 
-import com.stoutner.privacybrowser.activities.MainWebView;
+import com.stoutner.privacybrowser.activities.MainWebViewActivity;
 import com.stoutner.privacybrowser.R;
 
 import java.lang.reflect.Field;
@@ -54,7 +54,7 @@ public class OrbotProxyHelper {
             mLoadedApkField.setAccessible(true);
             Object mLoadedApkObject = mLoadedApkField.get(privacyBrowserContext);
 
-            Class loadedApkClass = Class.forName("android.app.LoadedApk");
+            @SuppressLint("PrivateApi") Class loadedApkClass = Class.forName("android.app.LoadedApk");
             Field mReceiversField = loadedApkClass.getDeclaredField("mReceivers");
             // `setAccessible(true)` allows us to change the value of `mReceiversField`.
             mReceiversField.setAccessible(true);
@@ -63,7 +63,8 @@ public class OrbotProxyHelper {
 
             for (Object receiverMap : receivers.values()) {
                 for (Object receiver : ((ArrayMap) receiverMap).keySet()) {
-                    // We have to use `Class<?>`, which is an `unbounded wildcard parameterized type`, instead of `Class`, which is a `raw type`, or `receiveClass.getDeclaredMethod` below will produce an error.
+                    // We have to use `Class<?>`, which is an `unbounded wildcard parameterized type`, instead of `Class`, which is a `raw type`.
+                    // Otherwise, `receiveClass.getDeclaredMethod` below will produce an error.
                     Class<?> receiverClass = receiver.getClass();
                     if (receiverClass.getName().contains("ProxyChangeListener")) {
                         Method onReceiveMethod = receiverClass.getDeclaredMethod("onReceive", Context.class, Intent.class);
@@ -77,15 +78,12 @@ public class OrbotProxyHelper {
         }
 
         if (proxyPort.equals("8118")) {  // Orbot proxy was turned on.
-            // Set the `appBar` background to be light blue if Orbot proxy support is enabled.
-            MainWebView.appBar.setBackgroundDrawable(ContextCompat.getDrawable(privacyBrowserContext, R.color.blue_50));
-
             try {  // Check to see if Orbot is installed.
                 PackageManager packageManager = privacyBrowserContext.getPackageManager();
                 packageManager.getPackageInfo("org.torproject.android", PackageManager.GET_ACTIVITIES);
 
                 // Ask Orbot to connect if its current status is not "ON".
-                if (!MainWebView.orbotStatus.equals("ON")) {
+                if (!MainWebViewActivity.orbotStatus.equals("ON")) {
                     // Request Orbot to start.
                     Intent orbotIntent = new Intent("org.torproject.android.intent.action.START");
 
@@ -99,22 +97,30 @@ public class OrbotProxyHelper {
                     privacyBrowserContext.sendBroadcast(orbotIntent);
                 }
             } catch (PackageManager.NameNotFoundException exception){  // If an exception is thrown, Orbot is not installed.
-                // Build an `AlertDialog`.  `R.style.LightAlertDialog` formats the color of the button text.
-                AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(parentActivity, R.style.LightAlertDialog);
+                // Use `AlertDialog.Builder` to create the `AlertDialog`.
+                AlertDialog.Builder dialogBuilder;
+
+                // Set the style according to the theme.
+                if (MainWebViewActivity.darkTheme) {
+                    dialogBuilder = new AlertDialog.Builder(parentActivity, R.style.PrivacyBrowserAlertDialogDark);
+                } else {
+                    dialogBuilder = new AlertDialog.Builder(parentActivity, R.style.PrivacyBrowserAlertDialogLight);
+                }
+
+                // Set the message.
                 dialogBuilder.setMessage(R.string.orbot_proxy_not_installed);
-                dialogBuilder.setPositiveButton(R.string.close, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        // Do nothing.  The `AlertDialog` will close automatically.
-                    }
+
+                // Set the positive button.
+                dialogBuilder.setPositiveButton(R.string.close, (DialogInterface dialog, int which) -> {
+                    // Do nothing.  The `AlertDialog` will close automatically.
                 });
 
-                // Convert `dialogBuilder` to `alertDialog` and display it on the screen.
+                // Convert `dialogBuilder` to `alertDialog`.
                 AlertDialog alertDialog = dialogBuilder.create();
+
+                // Make it so.
                 alertDialog.show();
             }
-        } else {  // Otherwise set the default grey `appBar` background.
-            MainWebView.appBar.setBackgroundDrawable(ContextCompat.getDrawable(privacyBrowserContext, R.color.gray_100));
         }
     }
 }