/*
- * Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
*
* This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
*
import android.annotation.SuppressLint;
import android.content.pm.PackageManager;
import android.content.pm.Signature;
+import android.graphics.ColorMatrixColorFilter;
+import android.graphics.Paint;
import android.os.Build;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import com.stoutner.privacybrowser.BuildConfig;
import com.stoutner.privacybrowser.R;
+import com.stoutner.privacybrowser.activities.MainWebViewActivity;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
// Load the tabs. Tab numbers start at 0.
if (tabNumber == 0) { // Load the about tab.
- // Setting false at the end of inflater.inflate does not attach the inflated layout as a child of container.
- // The fragment will take care of attaching the root automatically.
+ // Setting false at the end of inflater.inflate does not attach the inflated layout as a child of container. The fragment will take care of attaching the root automatically.
tabLayout = inflater.inflate(R.layout.about_tab_version, container, false);
// Get handles for the `TextViews`.
TextView versionSecurityPatchTextView = (TextView) tabLayout.findViewById(R.id.about_version_securitypatch);
TextView versionWebKitTextView = (TextView) tabLayout.findViewById(R.id.about_version_webkit);
TextView versionChromeTextView = (TextView) tabLayout.findViewById(R.id.about_version_chrome);
+ TextView versionOrbotTextView = (TextView) tabLayout.findViewById(R.id.about_version_orbot);
TextView certificateIssuerDNTextView = (TextView) tabLayout.findViewById(R.id.about_version_certificate_issuer_dn);
TextView certificateSubjectDNTextView = (TextView) tabLayout.findViewById(R.id.about_version_certificate_subject_dn);
TextView certificateStartDateTextView = (TextView) tabLayout.findViewById(R.id.about_version_certificate_start_date);
// Select the substring that begins after "Chrome/" and goes until the next " ".
String chrome = userAgentString.substring(userAgentString.indexOf("Chrome/") + 7, userAgentString.indexOf(" ", userAgentString.indexOf("Chrome/")));
- // Create a `SpannableStringBuilder` for each `TextView` that needs multiple colors of text.
+ // Get the Orbot version name if Orbot is installed.
+ String orbot;
+ try {
+ // Store the version name.
+ orbot = getContext().getPackageManager().getPackageInfo("org.torproject.android", PackageManager.GET_CONFIGURATIONS).versionName;
+ } catch (PackageManager.NameNotFoundException e) { // Orbot is not installed.
+ orbot = "";
+ }
+
+ // Create a `SpannableStringBuilder` for the hardware and software `TextViews` that needs multiple colors of text.
SpannableStringBuilder brandStringBuilder = new SpannableStringBuilder(brandLabel + brand);
SpannableStringBuilder manufacturerStringBuilder = new SpannableStringBuilder(manufacturerLabel + manufacturer);
SpannableStringBuilder modelStringBuilder = new SpannableStringBuilder(modelLabel + model);
SpannableStringBuilder webKitStringBuilder = new SpannableStringBuilder(webKitLabel + webKit);
SpannableStringBuilder chromeStringBuilder = new SpannableStringBuilder(chromeLabel + chrome);
- // Create a blue `ForegroundColorSpan`. We have to use the deprecated `getColor` until API >= 23.
- @SuppressWarnings("deprecation") ForegroundColorSpan blueColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.blue_700));
+ // Create the `blueColorSpan` variable.
+ ForegroundColorSpan blueColorSpan;
+
+ // Set `blueColorSpan` according to the theme. We have to use the deprecated `getColor()` until API >= 23.
+ if (MainWebViewActivity.darkTheme) {
+ //noinspection deprecation
+ blueColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.blue_400));
+ } else {
+ //noinspection deprecation
+ blueColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.blue_700));
+ }
// Setup the spans to display the device information in blue. `SPAN_INCLUSIVE_INCLUSIVE` allows the span to grow in either direction.
brandStringBuilder.setSpan(blueColorSpan, brandLabel.length(), brandStringBuilder.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);
SpannableStringBuilder securityPatchStringBuilder = new SpannableStringBuilder(securityPatchLabel + securityPatch);
securityPatchStringBuilder.setSpan(blueColorSpan, securityPatchLabel.length(), securityPatchStringBuilder.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);
versionSecurityPatchTextView.setText(securityPatchStringBuilder);
- } else { // Hide `versionSecurityPatchTextView`.
+ } else { // SDK_INT < 23, so `versionSecurityPatchTextView` should be hidden.
versionSecurityPatchTextView.setVisibility(View.GONE);
}
SpannableStringBuilder radioStringBuilder = new SpannableStringBuilder(radioLabel + radio);
radioStringBuilder.setSpan(blueColorSpan, radioLabel.length(), radioStringBuilder.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);
versionRadioTextView.setText(radioStringBuilder);
- } else { // Hide `versionRadioTextView`.
+ } else { // This device does not have a radio, so `versionRadioTextView` should be hidden.
versionRadioTextView.setVisibility(View.GONE);
}
+ // Only populate `versionOrbotTextView` if Orbot is installed.
+ if (!orbot.equals("")) {
+ String orbotLabel = getString(R.string.orbot) + " ";
+ SpannableStringBuilder orbotStringBuilder = new SpannableStringBuilder(orbotLabel + orbot);
+ orbotStringBuilder.setSpan(blueColorSpan, orbotLabel.length(), orbotStringBuilder.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);
+ versionOrbotTextView.setText(orbotStringBuilder);
+ } else { // Orbot is not installed, so the `versionOrbotTextView` should be hidden.
+ versionOrbotTextView.setVisibility(View.GONE);
+ }
+
// Display the package signature.
try {
// Get the first package signature. Suppress the lint warning about the need to be careful in implementing comparison of certificates for security purposes.
// Do nothing if `PackageManager` says Privacy Browser isn't installed.
}
} else { // load a WebView for all the other tabs. Tab numbers start at 0.
- // Setting false at the end of inflater.inflate does not attach the inflated layout as a child of container.
- // The fragment will take care of attaching the root automatically.
+ // Setting false at the end of inflater.inflate does not attach the inflated layout as a child of container. The fragment will take care of attaching the root automatically.
tabLayout = inflater.inflate(R.layout.bare_webview, container, false);
+
+ // Get a handle for `tabWebView`.
WebView tabWebView = (WebView) tabLayout;
+ // Filter the colors if `darkTheme` is `true`.
+ if (MainWebViewActivity.darkTheme) {
+ // Initialize `darkPaint`.
+ Paint darkPaint = new Paint();
+
+ // Setup a float array that inverts and tempers the colors (no hard whites or blacks).
+ float[] darkFilterFloatArray = {
+ -.8f, 0, 0, 0, 255, // Red.
+ 0, -.8f, 0, 0, 255, // Green.
+ 0, 0, -.8f, 0, 255, // Blue.
+ 0, 0, 0, .8f, 0 // Alpha.
+ };
+
+ // Set `darkPaint` to use `darkFilterFloatArray`.
+ darkPaint.setColorFilter(new ColorMatrixColorFilter(darkFilterFloatArray));
+
+ // Apply `darkPaint` to `tabWebView`.
+ tabWebView.setLayerType(View.LAYER_TYPE_HARDWARE, darkPaint);
+ } else {
+ // Reset `tabWebView` to use the normal colors.
+ tabWebView.setLayerType(View.LAYER_TYPE_HARDWARE, null);
+ }
+
switch (tabNumber) {
case 1:
tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/about_permissions.html");
projects / PrivacyBrowserAndroid.git / blobdiff