Change “Chrome” to “WebView” in About > Version. https://redmine.stoutner.com/issues/339
authorSoren Stoutner <soren@stoutner.com>
Wed, 31 Oct 2018 17:46:29 +0000 (10:46 -0700)
committerSoren Stoutner <soren@stoutner.com>
Wed, 31 Oct 2018 17:46:29 +0000 (10:46 -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 9b9f4fbadf4e70431c4b75a52d99bcbd0973609a..d4bd52fc22d0a6a8b3942af1ec47758f0c8cb1f7 100644 (file)
@@ -100,7 +100,7 @@ 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 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);
@@ -124,7 +124,7 @@ public class AboutTabFragment extends Fragment {
             String bootloaderLabel = getString(R.string.bootloader) + "  ";
             String androidLabel = getString(R.string.android) + "  ";
             String buildLabel = getString(R.string.build) + "  ";
-            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) + "  ";
@@ -153,7 +153,7 @@ public class AboutTabFragment extends Fragment {
             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 `Chrome/` and goes until the next ` `.
-            String chrome = userAgentString.substring(userAgentString.indexOf("Chrome/") + 7, userAgentString.indexOf(" ", userAgentString.indexOf("Chrome/")));
+            String webView = userAgentString.substring(userAgentString.indexOf("Chrome/") + 7, userAgentString.indexOf(" ", userAgentString.indexOf("Chrome/")));
 
             // Get the Orbot version name if Orbot is installed.
             String orbot;
@@ -175,7 +175,7 @@ public class AboutTabFragment extends Fragment {
             SpannableStringBuilder bootloaderStringBuilder = new SpannableStringBuilder(bootloaderLabel + bootloader);
             SpannableStringBuilder androidStringBuilder = new SpannableStringBuilder(androidLabel + android);
             SpannableStringBuilder buildStringBuilder = new SpannableStringBuilder(buildLabel + build);
-            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);
@@ -202,7 +202,7 @@ 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);
-            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);
@@ -218,7 +218,7 @@ public class AboutTabFragment extends Fragment {
             versionBootloaderTextView.setText(bootloaderStringBuilder);
             versionAndroidTextView.setText(androidStringBuilder);
             versionBuildTextView.setText(buildStringBuilder);
-            versionChromeTextView.setText(chromeStringBuilder);
+            versionWebViewTextView.setText(webViewStringBuilder);
             versionEasyListTextView.setText(easyListStringBuilder);
             versionEasyPrivacyTextView.setText(easyPrivacyStringBuilder);
             versionFanboyAnnoyanceTextView.setText(fanboyAnnoyanceStringBuilder);
index df2eccd44c5e1a36f97d52f7b9bce73c2740766e..a973821eaceaf00d829f1683ccf18f8018da290b 100644 (file)
                 android:layout_width="wrap_content" />
 
             <TextView
-                android:id="@+id/about_version_chrome"
+                android:id="@+id/about_version_webview"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
index 7025760ebd67cea017afaa72b1650373e89fe6f8..8e789628fc1961bc5d53d256fb3b0b20f64dfd8b 100644 (file)
     <string name="error_body">Fehler</string>
     <string name="about_view_source">Über Quelltext</string>
     <string name="about_view_source_message">Weil Androids WebView keine Quelltext-Informationen zur Verfügung stellt, muss eine separate a separate Serveranfrage mit system tools gestellt werden,
-        die hier dargestellten Daten erhält. Deshalb können Unterschiede zwischen diesen Daten und der mit Webview dargestellten Webseite auftreten.
+        die hier dargestellten Daten erhält. Deshalb können Unterschiede zwischen diesen Daten und der mit WebView dargestellten Webseite auftreten.
         Es ist geplant, mit Version 4.x eine eigene Engine einzuführen, die diese Einschränkungen umgeht.</string>
 
     <!-- Create Home Screen Shortcut Alert Dialog. -->
                 <string name="api">API</string>
             <string name="build">Build:</string>
             <string name="security_patch">Sicherheits-Patch:</string>
-            <string name="chrome">Chrome:</string>
+            <string name="webview">WebView:</string>
             <string name="orbot">Orbot:</string>
             <string name="easylist_label">EasyList:</string>
             <string name="easyprivacy_label">EasyPrivacy:</string>
index 4ba42bfef91195d611cd1a6cfcfbf518a4977c2c..533c70f237a86170a92e6f2cf2fd10c4a9df220f 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="chrome">Chrome:</string>
+            <string name="webview">WebView:</string>
             <string name="orbot">Orbot:</string>
             <string name="easylist_label">EasyList:</string>
             <string name="easyprivacy_label">EasyPrivacy:</string>
index d3df4a7e92f574b5069e13ff9bb064ce02b0488f..22393f876ea34d924e0388dd73bc9d0783ae6da8 100644 (file)
                 <string name="api">API</string>
             <string name="build">Build:</string>
             <string name="security_patch">Patch si sicurezza:</string>
-            <string name="chrome">Chrome:</string>
+            <string name="webview">WebView:</string>
             <string name="orbot">Orbot:</string>
             <string name="easylist_label">EasyList:</string>
             <string name="easyprivacy_label">EasyPrivacy:</string>
index 7890d3ba37fb99392e75fd04a3b382cb9c0f9df0..17b40a540465890da3a13a018770820b51fa9434 100644 (file)
                 <string name="api">API</string>
             <string name="build">Сборка:</string>
             <string name="security_patch">Патч безопасности:</string>
-            <string name="chrome">Chrome:</string>
+            <string name="webview">WebView:</string>
             <string name="orbot">Orbot:</string>
             <string name="easylist_label">EasyList:</string>
             <string name="easyprivacy_label">EasyPrivacy:</string>
index 80120144e746f171a132e216926f56eb952eadda..3c09f50ab88956e86d145c0e5991ebcb94e3e8f7 100644 (file)
                 <string name="api">API</string>
             <string name="build">Build:</string>
             <string name="security_patch">Security Patch:</string>
-            <string name="chrome">Chrome:</string>
+            <string name="webview">WebView:</string>
             <string name="orbot">Orbot:</string>
             <string name="easylist_label">EasyList:</string>
             <string name="easyprivacy_label">EasyPrivacy:</string>