X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Ffragments%2FAboutTabFragment.java;h=8496d00fdf1b94f995878a65ea35d1b1f7fc1ec5;hb=c4856b8be94ffa3f6075969967d61174dcc1a7ee;hp=4ff9a28a2d1194facd314ca20c66ba17060fbb8b;hpb=fa3b8b382eb5ed86c598e3b126d1ef5dd117c5be;p=PrivacyBrowserAndroid.git 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 4ff9a28a..8496d00f 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutTabFragment.java +++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutTabFragment.java @@ -22,6 +22,7 @@ package com.stoutner.privacybrowser.fragments; import android.annotation.SuppressLint; import android.content.Context; import android.content.SharedPreferences; +import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.Signature; import android.os.Build; @@ -111,7 +112,7 @@ public class AboutTabFragment extends Fragment { // 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); @@ -122,13 +123,15 @@ 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 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); @@ -147,11 +150,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) + " "; @@ -161,7 +165,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(); @@ -204,12 +209,13 @@ 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 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 ultraPrivacyStringBuilder = new SpannableStringBuilder(ultraPrivacyLabel + blocklistVersions[4]); + SpannableStringBuilder ultraListStringBuilder = new SpannableStringBuilder(ultraListLabel + blocklistVersions[4]); + SpannableStringBuilder ultraPrivacyStringBuilder = new SpannableStringBuilder(ultraPrivacyLabel + blocklistVersions[5]); // Create the `blueColorSpan` variable. ForegroundColorSpan blueColorSpan; @@ -229,11 +235,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. @@ -245,13 +252,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) + " "; @@ -259,18 +277,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 >= 26. + if (Build.VERSION.SDK_INT >= 26) { + // Create the WebView provider label. + String webViewProviderLabel = getString(R.string.webview_provider) + " "; + + // Get the current WebView package info. + PackageInfo webViewPackageInfo = WebView.getCurrentWebViewPackage(); + + // 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 < 26. + // Hide the WebView provider text view. + webViewProviderTextView.setVisibility(View.GONE); } // Only populate the Orbot text view if it is installed. @@ -296,9 +332,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. @@ -350,7 +387,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);