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 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);
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 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) + " ";
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 " ".
+ // 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/")));
// Get the Orbot version name if Orbot is installed.
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 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;
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);
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);
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);
+ versionUltraPrivacyTextView.setText(ultraPrivacyStringBuilder);
// Build.VERSION.SECURITY_PATCH is only available for SDK_INT >= 23.
if (Build.VERSION.SDK_INT >= 23) {