Remove WebKit from About -> Version. https://redmine.stoutner.com/issues/330

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 20045832fb01b7092e72afdf34fb2f3a2f0c6faf..9b9f4fbadf4e70431c4b75a52d99bcbd0973609a 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutTabFragment.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutTabFragment.java
@@ -100,7 +100,6 @@ 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 versionOrbotTextView = tabLayout.findViewById(R.id.about_version_orbot);
             TextView versionEasyListTextView = tabLayout.findViewById(R.id.about_version_easylist);
@@ -125,7 +124,6 @@ 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 easyListLabel = getString(R.string.easylist_label) + "  ";
             String easyPrivacyLabel = getString(R.string.easyprivacy_label) + "  ";
@@ -154,9 +152,7 @@ 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 " ".
+            // 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.
@@ -179,7 +175,6 @@ 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 easyListStringBuilder = new SpannableStringBuilder(easyListLabel + MainWebViewActivity.easyListVersion);
             SpannableStringBuilder easyPrivacyStringBuilder = new SpannableStringBuilder(easyPrivacyLabel + MainWebViewActivity.easyPrivacyVersion);
@@ -207,7 +202,6 @@ 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);
             easyListStringBuilder.setSpan(blueColorSpan, easyListLabel.length(), easyListStringBuilder.length(), Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
             easyPrivacyStringBuilder.setSpan(blueColorSpan, easyPrivacyLabel.length(), easyPrivacyStringBuilder.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);
@@ -224,7 +218,6 @@ public class AboutTabFragment extends Fragment {
             versionBootloaderTextView.setText(bootloaderStringBuilder);
             versionAndroidTextView.setText(androidStringBuilder);
             versionBuildTextView.setText(buildStringBuilder);
-            versionWebKitTextView.setText(webKitStringBuilder);
             versionChromeTextView.setText(chromeStringBuilder);
             versionEasyListTextView.setText(easyListStringBuilder);
             versionEasyPrivacyTextView.setText(easyPrivacyStringBuilder);

diff --git a/app/src/main/res/layout/about_tab_version.xml b/app/src/main/res/layout/about_tab_version.xml
index ac900a5dcc286e3958e46aedcaf843f9afa9947c..df2eccd44c5e1a36f97d52f7b9bce73c2740766e 100644 (file)
--- a/app/src/main/res/layout/about_tab_version.xml
+++ b/app/src/main/res/layout/about_tab_version.xml
@@ -143,11 +143,6 @@
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
-            <TextView
-                android:id="@+id/about_version_webkit"
-                android:layout_height="wrap_content"
-                android:layout_width="wrap_content" />
-
             <TextView
                 android:id="@+id/about_version_chrome"
                 android:layout_height="wrap_content"

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index bfc071c0b814c5b05d80cdccbcdc1eafe5172246..7025760ebd67cea017afaa72b1650373e89fe6f8 100644 (file)
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -391,7 +391,6 @@
                 <string name="api">API</string>
             <string name="build">Build:</string>
             <string name="security_patch">Sicherheits-Patch:</string>
-            <string name="webkit">WebKit:</string>
             <string name="chrome">Chrome:</string>
             <string name="orbot">Orbot:</string>
             <string name="easylist_label">EasyList:</string>

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 8afa404ecdf7b80244b0974b9983584159bfc47a..8cad4e19f0edbc7c8af9c73a55e6aefa316dacad 100644 (file)
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -492,7 +492,6 @@
                 <string name="api">API</string>
             <string name="build">Versión de compilación:</string>
             <string name="security_patch">Parche de seguridad:</string>
-            <string name="webkit">WebKit:</string>
             <string name="chrome">Chrome:</string>
             <string name="orbot">Orbot:</string>
             <string name="easylist_label">EasyList:</string>

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 0d092c316bd549d21fa82fef04c43b6a122a50da..4009ddcfcec9c535f1c26d8627ef6c45ebf7cd1a 100644 (file)
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -491,7 +491,6 @@
                 <string name="api">API</string>
             <string name="build">Build:</string>
             <string name="security_patch">Patch si sicurezza:</string>
-            <string name="webkit">WebKit:</string>
             <string name="chrome">Chrome:</string>
             <string name="orbot">Orbot:</string>
             <string name="easylist_label">EasyList:</string>

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index d753623c3dfe1814a53b852343b4156f013af04b..b6a86b3cd74a332c71cc735a84e51796b9933b43 100644 (file)
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -489,7 +489,6 @@
                 <string name="api">API</string>
             <string name="build">Сборка:</string>
             <string name="security_patch">Патч безопасности:</string>
-            <string name="webkit">WebKit:</string>
             <string name="chrome">Chrome:</string>
             <string name="orbot">Orbot:</string>
             <string name="easylist_label">EasyList:</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f370ba3b6c2e1dcac6c633bfc36add6c8f45143a..c4fcfb96e60a7fe981d55e8a84c02824789af695 100644 (file)
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -562,7 +562,6 @@
                 <string name="api">API</string>
             <string name="build">Build:</string>
             <string name="security_patch">Security Patch:</string>
-            <string name="webkit">WebKit:</string>
             <string name="chrome">Chrome:</string>
             <string name="orbot">Orbot:</string>
             <string name="easylist_label">EasyList:</string>