X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fhelpers%2FOrbotProxyHelper.java;h=ef49afe1f9fc331da9f160050460aff800451ba7;hb=871520acac2bd75f528e943c1b2a650017c852b9;hp=696bd504f76df088cda6c95bcd7b5bd6d0ea8ac9;hpb=f82135d919d64d4909c37c79a18e14ceba802579;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 696bd504..ef49afe1 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/helpers/OrbotProxyHelper.java +++ b/app/src/main/java/com/stoutner/privacybrowser/helpers/OrbotProxyHelper.java @@ -25,7 +25,6 @@ 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; @@ -77,9 +76,6 @@ 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. - MainWebViewActivity.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); @@ -99,9 +95,20 @@ 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); + + // Set the positive button. dialogBuilder.setPositiveButton(R.string.close, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { @@ -109,12 +116,12 @@ public class OrbotProxyHelper { } }); - // 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. - MainWebViewActivity.appBar.setBackgroundDrawable(ContextCompat.getDrawable(privacyBrowserContext, R.color.gray_100)); } } }