From 6b7723c0380d43dd1461107b3d29620dc83fabfa Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Wed, 31 Oct 2018 10:46:29 -0700 Subject: [PATCH] =?utf8?q?Change=20=E2=80=9CChrome=E2=80=9D=20to=20?= =?utf8?q?=E2=80=9CWebView=E2=80=9D=20in=20About=20>=20Version.=20=20https?= =?utf8?q?://redmine.stoutner.com/issues/339?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../privacybrowser/fragments/AboutTabFragment.java | 12 ++++++------ app/src/main/res/layout/about_tab_version.xml | 2 +- app/src/main/res/values-de/strings.xml | 4 ++-- app/src/main/res/values-es/strings.xml | 2 +- app/src/main/res/values-it/strings.xml | 2 +- app/src/main/res/values-ru/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) 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 9b9f4fba..d4bd52fc 100644 --- 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,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); diff --git a/app/src/main/res/layout/about_tab_version.xml b/app/src/main/res/layout/about_tab_version.xml index df2eccd4..a973821e 100644 --- a/app/src/main/res/layout/about_tab_version.xml +++ b/app/src/main/res/layout/about_tab_version.xml @@ -144,7 +144,7 @@ android:layout_width="wrap_content" /> diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 7025760e..8e789628 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -184,7 +184,7 @@ Fehler Über Quelltext 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. @@ -391,7 +391,7 @@ API Build: Sicherheits-Patch: - Chrome: + WebView: Orbot: EasyList: EasyPrivacy: diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 4ba42bfe..533c70f2 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -513,7 +513,7 @@ API Versión de compilación: Parche de seguridad: - Chrome: + WebView: Orbot: EasyList: EasyPrivacy: diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index d3df4a7e..22393f87 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -512,7 +512,7 @@ API Build: Patch si sicurezza: - Chrome: + WebView: Orbot: EasyList: EasyPrivacy: diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 7890d3ba..17b40a54 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -508,7 +508,7 @@ API Сборка: Патч безопасности: - Chrome: + WebView: Orbot: EasyList: EasyPrivacy: diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 80120144..3c09f50a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -581,7 +581,7 @@ API Build: Security Patch: - Chrome: + WebView: Orbot: EasyList: EasyPrivacy: -- 2.43.0