Remove WebKit from About -> Version. https://redmine.stoutner.com/issues/330
authorSoren Stoutner <soren@stoutner.com>
Tue, 11 Sep 2018 04:32:44 +0000 (21:32 -0700)
committerSoren Stoutner <soren@stoutner.com>
Tue, 11 Sep 2018 04:32:44 +0000 (21:32 -0700)
app/src/main/java/com/stoutner/privacybrowser/fragments/AboutTabFragment.java
app/src/main/res/layout/about_tab_version.xml
app/src/main/res/values-de/strings.xml
app/src/main/res/values-es/strings.xml
app/src/main/res/values-it/strings.xml
app/src/main/res/values-ru/strings.xml
app/src/main/res/values/strings.xml

index 2004583..9b9f4fb 100644 (file)
@@ -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);
index ac900a5..df2eccd 100644 (file)
                 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"
index bfc071c..7025760 100644 (file)
                 <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>
index 8afa404..8cad4e1 100644 (file)
                 <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>
index 0d092c3..4009ddc 100644 (file)
                 <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>
index d753623..b6a86b3 100644 (file)
                 <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>
index f370ba3..c4fcfb9 100644 (file)
                 <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>