X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Ffragments%2FAboutTabFragment.java;h=c35b90b64b6231543d6aabc52afc116e6830054a;hp=5c811e8d42ef1e6202f0e1adbd8f3dfb41054976;hb=b82022327701273b1b56419e8d6042895c0bc7b9;hpb=84989e138cb593d5a2f70be848db4889aaa8da88 diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutTabFragment.java b/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutTabFragment.java index 5c811e8d..c35b90b6 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutTabFragment.java +++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutTabFragment.java @@ -1,5 +1,5 @@ /* - * Copyright © 2016-2019 Soren Stoutner . + * Copyright © 2016-2020 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -21,8 +21,10 @@ package com.stoutner.privacybrowser.fragments; import android.annotation.SuppressLint; import android.content.Context; +import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.Signature; +import android.content.res.Configuration; import android.os.Build; import android.os.Bundle; import android.text.SpannableStringBuilder; @@ -36,10 +38,10 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; +import androidx.webkit.WebViewCompat; import com.stoutner.privacybrowser.BuildConfig; import com.stoutner.privacybrowser.R; -import com.stoutner.privacybrowser.activities.MainWebViewActivity; import java.io.ByteArrayInputStream; import java.io.InputStream; @@ -52,20 +54,24 @@ import java.text.DateFormat; import java.util.Date; public class AboutTabFragment extends Fragment { - // Track the current tab number. + // Define the class variables. private int tabNumber; + private String[] blocklistVersions; + private View tabLayout; - // Store the tab number in the arguments bundle. - public static AboutTabFragment createTab(int tab) { + public static AboutTabFragment createTab(int tabNumber, String[] blocklistVersions) { // Create a bundle. - Bundle bundle = new Bundle(); + Bundle argumentsBundle = new Bundle(); // Store the tab number in the bundle. - bundle.putInt("Tab", tab); + argumentsBundle.putInt("tab_number", tabNumber); + argumentsBundle.putStringArray("blocklist_versions", blocklistVersions); - // Add the bundle to the fragment. + // Create a new instance of the tab fragment. AboutTabFragment aboutTabFragment = new AboutTabFragment(); - aboutTabFragment.setArguments(bundle); + + // Add the arguments bundle to the fragment. + aboutTabFragment.setArguments(argumentsBundle); // Return the new fragment. return aboutTabFragment; @@ -76,28 +82,32 @@ public class AboutTabFragment extends Fragment { // Run the default commands. super.onCreate(savedInstanceState); - // Remove the lint warning that `getArguments()` might be null. - assert getArguments() != null; + // Get a handle for the arguments. + Bundle arguments = getArguments(); + + // Remove the incorrect lint warning below that arguments might be null. + assert arguments != null; - // Store the tab number in a class variable. - tabNumber = getArguments().getInt("Tab"); + // Store the arguments in class variables. + tabNumber = getArguments().getInt("tab_number"); + blocklistVersions = getArguments().getStringArray("blocklist_versions"); } @Override public View onCreateView(@NonNull LayoutInflater layoutInflater, ViewGroup container, Bundle savedInstanceState) { - // Create a tab layout view. - View tabLayout; - // Get a handle for the context and assert that it isn't null. Context context = getContext(); assert context != null; + // Get the current theme status. + int currentThemeStatus = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK; + // 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. tabLayout = layoutInflater.inflate(R.layout.about_tab_version, container, false); - // Get handles for the `TextViews`. + // Get handles for the text views. TextView versionTextView = tabLayout.findViewById(R.id.version); TextView brandTextView = tabLayout.findViewById(R.id.brand); TextView manufacturerTextView = tabLayout.findViewById(R.id.manufacturer); @@ -108,13 +118,16 @@ public class AboutTabFragment extends Fragment { TextView androidTextView = tabLayout.findViewById(R.id.android); TextView securityPatchTextView = tabLayout.findViewById(R.id.security_patch); TextView buildTextView = tabLayout.findViewById(R.id.build); - TextView webViewTextView = tabLayout.findViewById(R.id.webview); + TextView webViewProviderTextView = tabLayout.findViewById(R.id.webview_provider); + TextView webViewVersionTextView = tabLayout.findViewById(R.id.webview_version); TextView orbotTextView = tabLayout.findViewById(R.id.orbot); + TextView i2pTextView = tabLayout.findViewById(R.id.i2p); TextView openKeychainTextView = tabLayout.findViewById(R.id.open_keychain); TextView easyListTextView = tabLayout.findViewById(R.id.easylist); TextView easyPrivacyTextView = tabLayout.findViewById(R.id.easyprivacy); TextView fanboyAnnoyanceTextView = tabLayout.findViewById(R.id.fanboy_annoyance); TextView fanboySocialTextView = tabLayout.findViewById(R.id.fanboy_social); + TextView ultraListTextView = tabLayout.findViewById(R.id.ultralist); TextView ultraPrivacyTextView = tabLayout.findViewById(R.id.ultraprivacy); TextView certificateIssuerDNTextView = tabLayout.findViewById(R.id.certificate_issuer_dn); TextView certificateSubjectDNTextView = tabLayout.findViewById(R.id.certificate_subject_dn); @@ -125,7 +138,7 @@ public class AboutTabFragment extends Fragment { TextView certificateSignatureAlgorithmTextView = tabLayout.findViewById(R.id.certificate_signature_algorithm); // Setup the labels. - String version = getString(R.string.version) + " " + BuildConfig.VERSION_NAME + " (" + getString(R.string.version_code) + " " + Integer.toString(BuildConfig.VERSION_CODE) + ")"; + String version = getString(R.string.version) + " " + BuildConfig.VERSION_NAME + " (" + getString(R.string.version_code) + " " + BuildConfig.VERSION_CODE + ")"; String brandLabel = getString(R.string.brand) + " "; String manufacturerLabel = getString(R.string.manufacturer) + " "; String modelLabel = getString(R.string.model) + " "; @@ -133,11 +146,12 @@ public class AboutTabFragment extends Fragment { String bootloaderLabel = getString(R.string.bootloader) + " "; String androidLabel = getString(R.string.android) + " "; String buildLabel = getString(R.string.build) + " "; - String webViewLabel = getString(R.string.webview) + " "; + String webViewVersionLabel = getString(R.string.webview_version) + " "; String easyListLabel = getString(R.string.easylist_label) + " "; String easyPrivacyLabel = getString(R.string.easyprivacy_label) + " "; String fanboyAnnoyanceLabel = getString(R.string.fanboy_annoyance_label) + " "; String fanboySocialLabel = getString(R.string.fanboy_social_label) + " "; + String ultraListLabel = getString(R.string.ultralist_label) + " "; String ultraPrivacyLabel = getString(R.string.ultraprivacy_label) + " "; String issuerDNLabel = getString(R.string.issuer_dn) + " "; String subjectDNLabel = getString(R.string.subject_dn) + " "; @@ -147,7 +161,8 @@ public class AboutTabFragment extends Fragment { String serialNumberLabel = getString(R.string.serial_number) + " "; String signatureAlgorithmLabel = getString(R.string.signature_algorithm) + " "; - // `webViewLayout` is only used to get the default user agent from `bare_webview`. It is not used to render content on the screen. + // The WebView layout is only used to get the default user agent from `bare_webview`. It is not used to render content on the screen. + // Once the minimum API >= 26 this can be accomplished with the WebView package info. View webViewLayout = layoutInflater.inflate(R.layout.bare_webview, container, false); WebView tabLayoutWebView = webViewLayout.findViewById(R.id.bare_webview); String userAgentString = tabLayoutWebView.getSettings().getUserAgentString(); @@ -159,7 +174,7 @@ public class AboutTabFragment extends Fragment { String device = Build.DEVICE; String bootloader = Build.BOOTLOADER; String radio = Build.getRadioVersion(); - String android = Build.VERSION.RELEASE + " (" + getString(R.string.api) + " " + Integer.toString(Build.VERSION.SDK_INT) + ")"; + String android = Build.VERSION.RELEASE + " (" + getString(R.string.api) + " " + Build.VERSION.SDK_INT + ")"; String build = Build.DISPLAY; // Select the substring that begins after `Chrome/` and goes until the next ` `. String webView = userAgentString.substring(userAgentString.indexOf("Chrome/") + 7, userAgentString.indexOf(" ", userAgentString.indexOf("Chrome/"))); @@ -173,6 +188,15 @@ public class AboutTabFragment extends Fragment { orbot = ""; } + // Get the I2P version name if I2P is installed. + String i2p; + try { + // Store the version name. + i2p = context.getPackageManager().getPackageInfo("net.i2p.android.router", 0).versionName; + } catch (PackageManager.NameNotFoundException exception) { // I2P is not installed. + i2p = ""; + } + // Get the OpenKeychain version name if it is installed. String openKeychain; try { @@ -190,22 +214,21 @@ public class AboutTabFragment extends Fragment { SpannableStringBuilder bootloaderStringBuilder = new SpannableStringBuilder(bootloaderLabel + bootloader); SpannableStringBuilder androidStringBuilder = new SpannableStringBuilder(androidLabel + android); SpannableStringBuilder buildStringBuilder = new SpannableStringBuilder(buildLabel + build); - SpannableStringBuilder webViewStringBuilder = new SpannableStringBuilder(webViewLabel + webView); - SpannableStringBuilder easyListStringBuilder = new SpannableStringBuilder(easyListLabel + MainWebViewActivity.easyListVersion); - SpannableStringBuilder easyPrivacyStringBuilder = new SpannableStringBuilder(easyPrivacyLabel + MainWebViewActivity.easyPrivacyVersion); - SpannableStringBuilder fanboyAnnoyanceStringBuilder = new SpannableStringBuilder(fanboyAnnoyanceLabel + MainWebViewActivity.fanboysAnnoyanceVersion); - SpannableStringBuilder fanboySocialStringBuilder = new SpannableStringBuilder(fanboySocialLabel + MainWebViewActivity.fanboysSocialVersion); - SpannableStringBuilder ultraPrivacyStringBuilder = new SpannableStringBuilder(ultraPrivacyLabel + MainWebViewActivity.ultraPrivacyVersion); - - // Create the `blueColorSpan` variable. + SpannableStringBuilder webViewVersionStringBuilder = new SpannableStringBuilder(webViewVersionLabel + webView); + SpannableStringBuilder easyListStringBuilder = new SpannableStringBuilder(easyListLabel + blocklistVersions[0]); + SpannableStringBuilder easyPrivacyStringBuilder = new SpannableStringBuilder(easyPrivacyLabel + blocklistVersions[1]); + SpannableStringBuilder fanboyAnnoyanceStringBuilder = new SpannableStringBuilder(fanboyAnnoyanceLabel + blocklistVersions[2]); + SpannableStringBuilder fanboySocialStringBuilder = new SpannableStringBuilder(fanboySocialLabel + blocklistVersions[3]); + SpannableStringBuilder ultraListStringBuilder = new SpannableStringBuilder(ultraListLabel + blocklistVersions[4]); + SpannableStringBuilder ultraPrivacyStringBuilder = new SpannableStringBuilder(ultraPrivacyLabel + blocklistVersions[5]); + + // Define the blue color span 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)); + // Set the blue color span according to the theme. The deprecated `getResources()` must be used until the minimum API >= 23. + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + blueColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.violet_500)); } else { - //noinspection deprecation blueColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.blue_700)); } @@ -217,11 +240,12 @@ public class AboutTabFragment extends Fragment { bootloaderStringBuilder.setSpan(blueColorSpan, bootloaderLabel.length(), bootloaderStringBuilder.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE); androidStringBuilder.setSpan(blueColorSpan, androidLabel.length(), androidStringBuilder.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE); buildStringBuilder.setSpan(blueColorSpan, buildLabel.length(), buildStringBuilder.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE); - webViewStringBuilder.setSpan(blueColorSpan, webViewLabel.length(), webViewStringBuilder.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE); + webViewVersionStringBuilder.setSpan(blueColorSpan, webViewVersionLabel.length(), webViewVersionStringBuilder.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE); easyListStringBuilder.setSpan(blueColorSpan, easyListLabel.length(), easyListStringBuilder.length(), Spanned.SPAN_INCLUSIVE_EXCLUSIVE); easyPrivacyStringBuilder.setSpan(blueColorSpan, easyPrivacyLabel.length(), easyPrivacyStringBuilder.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE); fanboyAnnoyanceStringBuilder.setSpan(blueColorSpan, fanboyAnnoyanceLabel.length(), fanboyAnnoyanceStringBuilder.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE); fanboySocialStringBuilder.setSpan(blueColorSpan, fanboySocialLabel.length(), fanboySocialStringBuilder.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE); + ultraListStringBuilder.setSpan(blueColorSpan, ultraListLabel.length(), ultraListStringBuilder.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE); ultraPrivacyStringBuilder.setSpan(blueColorSpan, ultraPrivacyLabel.length(), ultraPrivacyStringBuilder.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE); // Display the strings in the text boxes. @@ -233,13 +257,24 @@ public class AboutTabFragment extends Fragment { bootloaderTextView.setText(bootloaderStringBuilder); androidTextView.setText(androidStringBuilder); buildTextView.setText(buildStringBuilder); - webViewTextView.setText(webViewStringBuilder); + webViewVersionTextView.setText(webViewVersionStringBuilder); easyListTextView.setText(easyListStringBuilder); easyPrivacyTextView.setText(easyPrivacyStringBuilder); fanboyAnnoyanceTextView.setText(fanboyAnnoyanceStringBuilder); fanboySocialTextView.setText(fanboySocialStringBuilder); + ultraListTextView.setText(ultraListStringBuilder); ultraPrivacyTextView.setText(ultraPrivacyStringBuilder); + // Only populate the radio text view if there is a radio in the device. + if (!radio.isEmpty()) { + String radioLabel = getString(R.string.radio) + " "; + SpannableStringBuilder radioStringBuilder = new SpannableStringBuilder(radioLabel + radio); + radioStringBuilder.setSpan(blueColorSpan, radioLabel.length(), radioStringBuilder.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE); + radioTextView.setText(radioStringBuilder); + } else { // This device does not have a radio. + radioTextView.setVisibility(View.GONE); + } + // Build.VERSION.SECURITY_PATCH is only available for SDK_INT >= 23. if (Build.VERSION.SDK_INT >= 23) { String securityPatchLabel = getString(R.string.security_patch) + " "; @@ -247,18 +282,36 @@ public class AboutTabFragment extends Fragment { SpannableStringBuilder securityPatchStringBuilder = new SpannableStringBuilder(securityPatchLabel + securityPatch); securityPatchStringBuilder.setSpan(blueColorSpan, securityPatchLabel.length(), securityPatchStringBuilder.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE); securityPatchTextView.setText(securityPatchStringBuilder); - } else { // SDK_INT < 23. + } else { // The API < 23. + // Hide the security patch text view. securityPatchTextView.setVisibility(View.GONE); } - // Only populate the radio text view if there is a radio in the device. - if (!radio.isEmpty()) { - String radioLabel = getString(R.string.radio) + " "; - SpannableStringBuilder radioStringBuilder = new SpannableStringBuilder(radioLabel + radio); - radioStringBuilder.setSpan(blueColorSpan, radioLabel.length(), radioStringBuilder.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE); - radioTextView.setText(radioStringBuilder); - } else { // This device does not have a radio. - radioTextView.setVisibility(View.GONE); + // Only populate the WebView provider if the SDK >= 21. + if (Build.VERSION.SDK_INT >= 21) { + // Create the WebView provider label. + String webViewProviderLabel = getString(R.string.webview_provider) + " "; + + // Get the current WebView package info. + PackageInfo webViewPackageInfo = WebViewCompat.getCurrentWebViewPackage(context); + + // Remove the warning below that the package info might be null. + assert webViewPackageInfo != null; + + // Get the WebView provider name. + String webViewPackageName = webViewPackageInfo.packageName; + + // Create the spannable string builder. + SpannableStringBuilder webViewProviderStringBuilder = new SpannableStringBuilder(webViewProviderLabel + webViewPackageName); + + // Apply the coloration. + webViewProviderStringBuilder.setSpan(blueColorSpan, webViewProviderLabel.length(), webViewProviderStringBuilder.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE); + + // Display the WebView provider. + webViewProviderTextView.setText(webViewProviderStringBuilder); + } else { // The API < 21. + // Hide the WebView provider text view. + webViewProviderTextView.setVisibility(View.GONE); } // Only populate the Orbot text view if it is installed. @@ -271,6 +324,16 @@ public class AboutTabFragment extends Fragment { orbotTextView.setVisibility(View.GONE); } + // Only populate the I2P text view if it is installed. + if (!i2p.isEmpty()) { + String i2pLabel = getString(R.string.i2p) + " "; + SpannableStringBuilder i2pStringBuilder = new SpannableStringBuilder(i2pLabel + i2p); + i2pStringBuilder.setSpan(blueColorSpan, i2pLabel.length(), i2pStringBuilder.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE); + i2pTextView.setText(i2pStringBuilder); + } else { // I2P is not installed. + i2pTextView.setVisibility(View.GONE); + } + // Only populate the OpenKeychain text view if it is installed. if (!openKeychain.isEmpty()) { String openKeychainLabel = getString(R.string.openkeychain) + " "; @@ -284,9 +347,10 @@ public class AboutTabFragment extends Fragment { // 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. - @SuppressLint("PackageManagerGetSignatures") Signature packageSignature = getContext().getPackageManager().getPackageInfo(getContext().getPackageName(), PackageManager.GET_SIGNATURES).signatures[0]; + @SuppressLint("PackageManagerGetSignatures") Signature packageSignature = getContext().getPackageManager().getPackageInfo(getContext().getPackageName(), + PackageManager.GET_SIGNATURES).signatures[0]; - // Convert the signature to a `byte[]` `InputStream`. + // Convert the signature to a byte array input stream. InputStream certificateByteArrayInputStream = new ByteArrayInputStream(packageSignature.toByteArray()); // Display the certificate information on the screen. @@ -338,7 +402,7 @@ public class AboutTabFragment extends Fragment { } catch (PackageManager.NameNotFoundException e) { // Do nothing if `PackageManager` says Privacy Browser isn't installed. } - } else { // load a `WebView` for all the other tabs. Tab numbers start at 0. + } 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. tabLayout = layoutInflater.inflate(R.layout.bare_webview, container, false); @@ -346,9 +410,8 @@ public class AboutTabFragment extends Fragment { WebView tabWebView = (WebView) tabLayout; // Load the tabs according to the theme. - if (MainWebViewActivity.darkTheme) { // The dark theme is applied. + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { // The dark theme is applied. // Set the background color. The deprecated `.getColor()` must be used until the minimum API >= 23. - //noinspection deprecation tabWebView.setBackgroundColor(getResources().getColor(R.color.gray_850)); switch (tabNumber) { @@ -405,7 +468,27 @@ public class AboutTabFragment extends Fragment { } } + // Scroll the tab if the saved instance state is not null. + if (savedInstanceState != null) { + tabLayout.post(() -> { + tabLayout.setScrollX(savedInstanceState.getInt("scroll_x")); + tabLayout.setScrollY(savedInstanceState.getInt("scroll_y")); + }); + } + // Return the formatted `tabLayout`. return tabLayout; } + + @Override + public void onSaveInstanceState(@NonNull Bundle savedInstanceState) { + // Run the default commands. + super.onSaveInstanceState(savedInstanceState); + + // Save the scroll positions if the tab layout is not null, which can happen if a tab is not currently selected. + if (tabLayout != null) { + savedInstanceState.putInt("scroll_x", tabLayout.getScrollX()); + savedInstanceState.putInt("scroll_y", tabLayout.getScrollY()); + } + } } \ No newline at end of file