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=5c811e8d42ef1e6202f0e1adbd8f3dfb41054976;hp=57048f7017d066c76aaa18d4dd578407ef31b063;hb=af807cce079aaae9cbf0430e7da946fcbe0c99c3;hpb=49e94a767e452d451a722bbb068e46458e404ed9 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 57048f70..5c811e8d 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-2018 Soren Stoutner . + * Copyright © 2016-2019 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -20,12 +20,11 @@ package com.stoutner.privacybrowser.fragments; import android.annotation.SuppressLint; +import android.content.Context; import android.content.pm.PackageManager; import android.content.pm.Signature; import android.os.Build; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; import android.text.SpannableStringBuilder; import android.text.Spanned; import android.text.style.ForegroundColorSpan; @@ -35,6 +34,9 @@ import android.view.ViewGroup; import android.webkit.WebView; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; + import com.stoutner.privacybrowser.BuildConfig; import com.stoutner.privacybrowser.R; import com.stoutner.privacybrowser.activities.MainWebViewActivity; @@ -50,6 +52,7 @@ import java.text.DateFormat; import java.util.Date; public class AboutTabFragment extends Fragment { + // Track the current tab number. private int tabNumber; // Store the tab number in the arguments bundle. @@ -81,39 +84,45 @@ public class AboutTabFragment extends Fragment { } @Override - public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + 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; + // 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 = inflater.inflate(R.layout.about_tab_version, container, false); + tabLayout = layoutInflater.inflate(R.layout.about_tab_version, container, false); // Get handles for the `TextViews`. - TextView versionNumberTextView = tabLayout.findViewById(R.id.about_version_number); - TextView versionBrandTextView = tabLayout.findViewById(R.id.about_version_brand); - TextView versionManufacturerTextView = tabLayout.findViewById(R.id.about_version_manufacturer); - TextView versionModelTextView = tabLayout.findViewById(R.id.about_version_model); - TextView versionDeviceTextView = tabLayout.findViewById(R.id.about_version_device); - TextView versionBootloaderTextView = tabLayout.findViewById(R.id.about_version_bootloader); - TextView versionRadioTextView = tabLayout.findViewById(R.id.about_version_radio); - TextView versionAndroidTextView = tabLayout.findViewById(R.id.about_version_android); - TextView versionSecurityPatchTextView = tabLayout.findViewById(R.id.about_version_securitypatch); - TextView versionBuildTextView = tabLayout.findViewById(R.id.about_version_build); - TextView versionWebKitTextView = tabLayout.findViewById(R.id.about_version_webkit); - TextView versionChromeTextView = tabLayout.findViewById(R.id.about_version_chrome); - TextView versionOrbotTextView = tabLayout.findViewById(R.id.about_version_orbot); - TextView versionEasyListTextView = tabLayout.findViewById(R.id.about_version_easylist); - TextView versionEasyPrivacyTextView = tabLayout.findViewById(R.id.about_version_easyprivacy); - TextView versionFanboyAnnoyanceTextView = tabLayout.findViewById(R.id.about_version_fanboy_annoyance); - TextView versionFanboySocialTextView = tabLayout.findViewById(R.id.about_version_fanboy_social); - TextView certificateIssuerDNTextView = tabLayout.findViewById(R.id.about_version_certificate_issuer_dn); - TextView certificateSubjectDNTextView = tabLayout.findViewById(R.id.about_version_certificate_subject_dn); - TextView certificateStartDateTextView = tabLayout.findViewById(R.id.about_version_certificate_start_date); - TextView certificateEndDateTextView = tabLayout.findViewById(R.id.about_version_certificate_end_date); - TextView certificateVersionTextView = tabLayout.findViewById(R.id.about_version_certificate_version); - TextView certificateSerialNumberTextView = tabLayout.findViewById(R.id.about_version_certificate_serial_number); - TextView certificateSignatureAlgorithmTextView = tabLayout.findViewById(R.id.about_version_certificate_signature_algorithm); + TextView versionTextView = tabLayout.findViewById(R.id.version); + TextView brandTextView = tabLayout.findViewById(R.id.brand); + TextView manufacturerTextView = tabLayout.findViewById(R.id.manufacturer); + TextView modelTextView = tabLayout.findViewById(R.id.model); + TextView deviceTextView = tabLayout.findViewById(R.id.device); + TextView bootloaderTextView = tabLayout.findViewById(R.id.bootloader); + TextView radioTextView = tabLayout.findViewById(R.id.radio); + 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 orbotTextView = tabLayout.findViewById(R.id.orbot); + 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 ultraPrivacyTextView = tabLayout.findViewById(R.id.ultraprivacy); + TextView certificateIssuerDNTextView = tabLayout.findViewById(R.id.certificate_issuer_dn); + TextView certificateSubjectDNTextView = tabLayout.findViewById(R.id.certificate_subject_dn); + TextView certificateStartDateTextView = tabLayout.findViewById(R.id.certificate_start_date); + TextView certificateEndDateTextView = tabLayout.findViewById(R.id.certificate_end_date); + TextView certificateVersionTextView = tabLayout.findViewById(R.id.certificate_version); + TextView certificateSerialNumberTextView = tabLayout.findViewById(R.id.certificate_serial_number); + 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) + ")"; @@ -124,12 +133,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 webKitLabel = getString(R.string.webkit) + " "; - String chromeLabel = getString(R.string.chrome) + " "; + String webViewLabel = getString(R.string.webview) + " "; 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 ultraPrivacyLabel = getString(R.string.ultraprivacy_label) + " "; String issuerDNLabel = getString(R.string.issuer_dn) + " "; String subjectDNLabel = getString(R.string.subject_dn) + " "; String startDateLabel = getString(R.string.start_date) + " "; @@ -139,7 +148,7 @@ public class AboutTabFragment extends Fragment { 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. - View webViewLayout = inflater.inflate(R.layout.bare_webview, container, false); + View webViewLayout = layoutInflater.inflate(R.layout.bare_webview, container, false); WebView tabLayoutWebView = webViewLayout.findViewById(R.id.bare_webview); String userAgentString = tabLayoutWebView.getSettings().getUserAgentString(); @@ -152,23 +161,27 @@ public class AboutTabFragment extends Fragment { String radio = Build.getRadioVersion(); String android = Build.VERSION.RELEASE + " (" + getString(R.string.api) + " " + Integer.toString(Build.VERSION.SDK_INT) + ")"; String build = Build.DISPLAY; - // Select the substring that begins after "Safari/" and goes to the end of the string. - String webKit = userAgentString.substring(userAgentString.indexOf("Safari/") + 7); - // 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/"))); + // 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/"))); // Get the Orbot version name if Orbot is installed. String orbot; try { - // Remove the lint warning that `getContext()` might be null. - assert getContext() != null; - // Store the version name. - orbot = getContext().getPackageManager().getPackageInfo("org.torproject.android", PackageManager.GET_CONFIGURATIONS).versionName; - } catch (PackageManager.NameNotFoundException e) { // Orbot is not installed. + orbot = context.getPackageManager().getPackageInfo("org.torproject.android", 0).versionName; + } catch (PackageManager.NameNotFoundException exception) { // Orbot is not installed. orbot = ""; } + // Get the OpenKeychain version name if it is installed. + String openKeychain; + try { + // Store the version name. + openKeychain = context.getPackageManager().getPackageInfo("org.sufficientlysecure.keychain", 0).versionName; + } catch (PackageManager.NameNotFoundException exception) { // OpenKeychain is not installed. + openKeychain = ""; + } + // 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); @@ -177,12 +190,12 @@ public class AboutTabFragment extends Fragment { SpannableStringBuilder bootloaderStringBuilder = new SpannableStringBuilder(bootloaderLabel + bootloader); SpannableStringBuilder androidStringBuilder = new SpannableStringBuilder(androidLabel + android); SpannableStringBuilder buildStringBuilder = new SpannableStringBuilder(buildLabel + build); - SpannableStringBuilder webKitStringBuilder = new SpannableStringBuilder(webKitLabel + webKit); - SpannableStringBuilder chromeStringBuilder = new SpannableStringBuilder(chromeLabel + chrome); + 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.fanboyAnnoyanceVersion); - SpannableStringBuilder fanboySocialStringBuilder = new SpannableStringBuilder(fanboySocialLabel + MainWebViewActivity.fanboySocialVersion); + 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. ForegroundColorSpan blueColorSpan; @@ -204,28 +217,28 @@ 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); - webKitStringBuilder.setSpan(blueColorSpan, webKitLabel.length(), webKitStringBuilder.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE); - chromeStringBuilder.setSpan(blueColorSpan, chromeLabel.length(), chromeStringBuilder.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE); + webViewStringBuilder.setSpan(blueColorSpan, webViewLabel.length(), webViewStringBuilder.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); + ultraPrivacyStringBuilder.setSpan(blueColorSpan, ultraPrivacyLabel.length(), ultraPrivacyStringBuilder.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE); // Display the strings in the text boxes. - versionNumberTextView.setText(version); - versionBrandTextView.setText(brandStringBuilder); - versionManufacturerTextView.setText(manufacturerStringBuilder); - versionModelTextView.setText(modelStringBuilder); - versionDeviceTextView.setText(deviceStringBuilder); - versionBootloaderTextView.setText(bootloaderStringBuilder); - versionAndroidTextView.setText(androidStringBuilder); - versionBuildTextView.setText(buildStringBuilder); - versionWebKitTextView.setText(webKitStringBuilder); - versionChromeTextView.setText(chromeStringBuilder); - versionEasyListTextView.setText(easyListStringBuilder); - versionEasyPrivacyTextView.setText(easyPrivacyStringBuilder); - versionFanboyAnnoyanceTextView.setText(fanboyAnnoyanceStringBuilder); - versionFanboySocialTextView.setText(fanboySocialStringBuilder); + versionTextView.setText(version); + brandTextView.setText(brandStringBuilder); + manufacturerTextView.setText(manufacturerStringBuilder); + modelTextView.setText(modelStringBuilder); + deviceTextView.setText(deviceStringBuilder); + bootloaderTextView.setText(bootloaderStringBuilder); + androidTextView.setText(androidStringBuilder); + buildTextView.setText(buildStringBuilder); + webViewTextView.setText(webViewStringBuilder); + easyListTextView.setText(easyListStringBuilder); + easyPrivacyTextView.setText(easyPrivacyStringBuilder); + fanboyAnnoyanceTextView.setText(fanboyAnnoyanceStringBuilder); + fanboySocialTextView.setText(fanboySocialStringBuilder); + ultraPrivacyTextView.setText(ultraPrivacyStringBuilder); // Build.VERSION.SECURITY_PATCH is only available for SDK_INT >= 23. if (Build.VERSION.SDK_INT >= 23) { @@ -233,29 +246,39 @@ public class AboutTabFragment extends Fragment { String securityPatch = Build.VERSION.SECURITY_PATCH; SpannableStringBuilder securityPatchStringBuilder = new SpannableStringBuilder(securityPatchLabel + securityPatch); securityPatchStringBuilder.setSpan(blueColorSpan, securityPatchLabel.length(), securityPatchStringBuilder.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE); - versionSecurityPatchTextView.setText(securityPatchStringBuilder); - } else { // SDK_INT < 23, so `versionSecurityPatchTextView` should be hidden. - versionSecurityPatchTextView.setVisibility(View.GONE); + securityPatchTextView.setText(securityPatchStringBuilder); + } else { // SDK_INT < 23. + securityPatchTextView.setVisibility(View.GONE); } - // Only populate `versionRadioTextView` if there is a radio in the device. - if (!radio.equals("")) { + // 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); - versionRadioTextView.setText(radioStringBuilder); - } else { // This device does not have a radio, so `versionRadioTextView` should be hidden. - versionRadioTextView.setVisibility(View.GONE); + radioTextView.setText(radioStringBuilder); + } else { // This device does not have a radio. + radioTextView.setVisibility(View.GONE); } - // Only populate `versionOrbotTextView` if Orbot is installed. - if (!orbot.equals("")) { + // Only populate the Orbot text view if it is installed. + if (!orbot.isEmpty()) { 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); + orbotTextView.setText(orbotStringBuilder); + } else { // Orbot is not installed. + orbotTextView.setVisibility(View.GONE); + } + + // Only populate the OpenKeychain text view if it is installed. + if (!openKeychain.isEmpty()) { + String openKeychainLabel = getString(R.string.openkeychain) + " "; + SpannableStringBuilder openKeychainStringBuilder = new SpannableStringBuilder(openKeychainLabel + openKeychain); + openKeychainStringBuilder.setSpan(blueColorSpan, openKeychainLabel.length(), openKeychainStringBuilder.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE); + openKeychainTextView.setText(openKeychainStringBuilder); + } else { //OpenKeychain is not installed. + openKeychainTextView.setVisibility(View.GONE); } // Display the package signature. @@ -317,14 +340,14 @@ public class AboutTabFragment extends Fragment { } } 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 = inflater.inflate(R.layout.bare_webview, container, false); + tabLayout = layoutInflater.inflate(R.layout.bare_webview, container, false); // Get a handle for `tabWebView`. WebView tabWebView = (WebView) tabLayout; // Load the tabs according to the theme. if (MainWebViewActivity.darkTheme) { // The dark theme is applied. - // Set the background color. We have to use the deprecated `.getColor()` until API >= 23. + // 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));