Merge pull request #1976 from Infomaniak/version-webview

Changing the way we log the version of WebViews and also handling only official WebViews from Google

Author: tevincent

app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListViewModel.kt

@@ -66,18 +66,32 @@ class ThreadListViewModel @Inject constructor(
     }
 
     fun checkWebViewVersion(canShowWebViewOutdated: Boolean) {
-        val (webViewVersionName, webViewMajorVersion) =
-            WebViewCompat.getCurrentWebViewPackage(appContext)?.versionName?.let { versionName ->
-                val majorVersion = runCatching { versionName.substringBefore('.').toInt() }.getOrDefault(0)
-                versionName to majorVersion
-            } ?: (null to 0)
+        val webViewPackage = WebViewCompat.getCurrentWebViewPackage(appContext)
+        val webViewPackageName = webViewPackage?.packageName
 
-        val badMajorVersion = webViewMajorVersion < WEBVIEW_MIN_VERSION
-        if (badMajorVersion) SentryDebug.sendWebViewVersionName(webViewVersionName, webViewMajorVersion)
-        isWebViewOutdated.value = canShowWebViewOutdated && badMajorVersion
+        val (webViewVersionName, webViewMajorVersion) = webViewPackage?.versionName?.let { versionName ->
+            val majorVersion = runCatching {
+                versionName.substringBefore('.').toInt()
+            }.getOrDefault(defaultValue = DEFAULT_WEBVIEW_VERSION)
+
+            return@let versionName to majorVersion
+        } ?: (null to DEFAULT_WEBVIEW_VERSION)
+
+        val hasOutdatedMajorVersion = when (webViewPackageName) {
+            WEBVIEW_OFFICIAL_PACKAGE_NAME -> webViewMajorVersion < WEBVIEW_OFFICIAL_MIN_VERSION
+            else -> false // We'll add other package names in the future if needed here
+        }
+
+        // TODO: (23/07) Remove this log in a few weeks/month if we don't have any Sentry anymore
+        if (hasOutdatedMajorVersion) {
+            SentryDebug.sendWebViewVersionName(webViewPackageName, webViewVersionName, webViewMajorVersion)
+        }
+        isWebViewOutdated.value = canShowWebViewOutdated && hasOutdatedMajorVersion
     }
 
     companion object {
-        private const val WEBVIEW_MIN_VERSION = 124
+        private const val WEBVIEW_OFFICIAL_PACKAGE_NAME = "com.google.android.webview"
+        private const val WEBVIEW_OFFICIAL_MIN_VERSION = 124
+        private const val DEFAULT_WEBVIEW_VERSION = 0
     }
 }

app/src/main/java/com/infomaniak/mail/utils/SentryDebug.kt

@@ -299,10 +299,11 @@ object SentryDebug {
         }
     }
 
-    fun sendWebViewVersionName(webViewVersionName: String?, majorVersion: Int) {
+    fun sendWebViewVersionName(webViewPackageName: String?, webViewVersionName: String?, majorVersion: Int) {
         Sentry.withScope { scope ->
-            scope.setExtra("webViewVersionName", webViewVersionName.toString())
-            scope.setExtra("majorVersion", "$majorVersion")
+            scope.setTag("webViewPackageName", "$webViewPackageName")
+            scope.setTag("webViewVersionName", "$webViewVersionName")
+            scope.setTag("majorVersion", "$majorVersion")
             Sentry.captureMessage(
                 "WebView version name might be null on some devices. Checking that the version name is ok.",
                 SentryLevel.INFO,