X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Ffragments%2FAboutTabFragment.java;h=d4bd52fc22d0a6a8b3942af1ec47758f0c8cb1f7;hb=b4fc354bee486a2df17b3aae6760a3c61eba1e97;hp=374f991511674f9ede24ab577ee1bafefb8ac546;hpb=9f551f25b53a30cca7b19b6e6bfc2d2520d9aa1b;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 374f9915..d4bd52fc 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. @@ -96,9 +100,13 @@ public class AboutTabFragment extends Fragment { 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 versionWebViewTextView = tabLayout.findViewById(R.id.about_version_webview); 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 versionUltraPrivacyTextView = tabLayout.findViewById(R.id.about_version_ultraprivacy); 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); @@ -116,8 +124,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) + " "; @@ -140,14 +152,15 @@ 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. @@ -162,8 +175,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.fanboysAnnoyanceVersion); + SpannableStringBuilder fanboySocialStringBuilder = new SpannableStringBuilder(fanboySocialLabel + MainWebViewActivity.fanboysSocialVersion); + SpannableStringBuilder ultraPrivacyStringBuilder = new SpannableStringBuilder(ultraPrivacyLabel + MainWebViewActivity.ultraPrivacyVersion); // Create the `blueColorSpan` variable. ForegroundColorSpan blueColorSpan; @@ -185,8 +202,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); - 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); @@ -197,8 +218,12 @@ public class AboutTabFragment extends Fragment { versionBootloaderTextView.setText(bootloaderStringBuilder); versionAndroidTextView.setText(androidStringBuilder); versionBuildTextView.setText(buildStringBuilder); - versionWebKitTextView.setText(webKitStringBuilder); - versionChromeTextView.setText(chromeStringBuilder); + versionWebViewTextView.setText(webViewStringBuilder); + versionEasyListTextView.setText(easyListStringBuilder); + versionEasyPrivacyTextView.setText(easyPrivacyStringBuilder); + versionFanboyAnnoyanceTextView.setText(fanboyAnnoyanceStringBuilder); + versionFanboySocialTextView.setText(fanboySocialStringBuilder); + versionUltraPrivacyTextView.setText(ultraPrivacyStringBuilder); // Build.VERSION.SECURITY_PATCH is only available for SDK_INT >= 23. if (Build.VERSION.SDK_INT >= 23) {