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=fbc487e9176c8ff75daaca08376398bfbe4f2ef9;hp=4c7a0f4ec84116e3dc6536a97c7b25c72e663058;hb=69b0fea4c49422f5e3c377994c4cf249bdc5a434;hpb=65ff2d87f3a8fd1c26a26678498a7451e76ebb16 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 4c7a0f4e..fbc487e9 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-2017 Soren Stoutner . + * Copyright © 2016-2018 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -24,6 +24,7 @@ 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; @@ -72,12 +73,15 @@ public class AboutTabFragment extends Fragment { // Run the default commands. super.onCreate(savedInstanceState); + // Remove the lint warning that `getArguments()` might be null. + assert getArguments() != null; + // Store the tab number in a class variable. tabNumber = getArguments().getInt("Tab"); } @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { View tabLayout; // Load the tabs. Tab numbers start at 0. @@ -86,26 +90,30 @@ public class AboutTabFragment extends Fragment { tabLayout = inflater.inflate(R.layout.about_tab_version, container, false); // Get handles for the `TextViews`. - TextView versionNumberTextView = (TextView) tabLayout.findViewById(R.id.about_version_number); - TextView versionBrandTextView = (TextView) tabLayout.findViewById(R.id.about_version_brand); - TextView versionManufacturerTextView = (TextView) tabLayout.findViewById(R.id.about_version_manufacturer); - TextView versionModelTextView = (TextView) tabLayout.findViewById(R.id.about_version_model); - TextView versionDeviceTextView = (TextView) tabLayout.findViewById(R.id.about_version_device); - TextView versionBootloaderTextView = (TextView) tabLayout.findViewById(R.id.about_version_bootloader); - TextView versionRadioTextView = (TextView) tabLayout.findViewById(R.id.about_version_radio); - TextView versionAndroidTextView = (TextView) tabLayout.findViewById(R.id.about_version_android); - TextView versionBuildTextView = (TextView) tabLayout.findViewById(R.id.about_version_build); - 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); - TextView certificateEndDateTextView = (TextView) tabLayout.findViewById(R.id.about_version_certificate_end_date); - TextView certificateVersionTextView = (TextView) tabLayout.findViewById(R.id.about_version_certificate_version); - TextView certificateSerialNumberTextView = (TextView) tabLayout.findViewById(R.id.about_version_certificate_serial_number); - TextView certificateSignatureAlgorithmTextView = (TextView) tabLayout.findViewById(R.id.about_version_certificate_signature_algorithm); + 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); // Setup the labels. String version = getString(R.string.version) + " " + BuildConfig.VERSION_NAME + " (" + getString(R.string.version_code) + " " + Integer.toString(BuildConfig.VERSION_CODE) + ")"; @@ -118,6 +126,10 @@ public class AboutTabFragment extends Fragment { String buildLabel = getString(R.string.build) + " "; String webKitLabel = getString(R.string.webkit) + " "; String chromeLabel = getString(R.string.chrome) + " "; + 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 issuerDNLabel = getString(R.string.issuer_dn) + " "; String subjectDNLabel = getString(R.string.subject_dn) + " "; String startDateLabel = getString(R.string.start_date) + " "; @@ -128,7 +140,7 @@ public class AboutTabFragment extends Fragment { // `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); - WebView tabLayoutWebView = (WebView) webViewLayout.findViewById(R.id.bare_webview); + WebView tabLayoutWebView = webViewLayout.findViewById(R.id.bare_webview); String userAgentString = tabLayoutWebView.getSettings().getUserAgentString(); // Get the device's information and store it in strings. @@ -148,6 +160,9 @@ public class AboutTabFragment extends Fragment { // 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. @@ -164,6 +179,10 @@ public class AboutTabFragment extends Fragment { SpannableStringBuilder buildStringBuilder = new SpannableStringBuilder(buildLabel + build); SpannableStringBuilder webKitStringBuilder = new SpannableStringBuilder(webKitLabel + webKit); SpannableStringBuilder chromeStringBuilder = new SpannableStringBuilder(chromeLabel + chrome); + 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); // Create the `blueColorSpan` variable. ForegroundColorSpan blueColorSpan; @@ -187,6 +206,10 @@ public class AboutTabFragment extends Fragment { 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); + 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); // Display the strings in the text boxes. versionNumberTextView.setText(version); @@ -199,6 +222,10 @@ public class AboutTabFragment extends Fragment { versionBuildTextView.setText(buildStringBuilder); versionWebKitTextView.setText(webKitStringBuilder); versionChromeTextView.setText(chromeStringBuilder); + versionEasyListTextView.setText(easyListStringBuilder); + versionEasyPrivacyTextView.setText(easyPrivacyStringBuilder); + versionFanboyAnnoyanceTextView.setText(fanboyAnnoyanceStringBuilder); + versionFanboySocialTextView.setText(fanboySocialStringBuilder); // Build.VERSION.SECURITY_PATCH is only available for SDK_INT >= 23. if (Build.VERSION.SDK_INT >= 23) {