From 25cd1d03b7e040a4ad8234e2b7747907ff00dbc7 Mon Sep 17 00:00:00 2001 From: Perry Valdez Date: Sat, 6 May 2023 10:03:33 +0800 Subject: [PATCH 1/3] Skip WebView check for Huawei phones --- .../src/main/java/org/lichess/mobileapp/MainActivity.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/android/app/src/main/java/org/lichess/mobileapp/MainActivity.java b/android/app/src/main/java/org/lichess/mobileapp/MainActivity.java index 0a1d5b2fa..3558dcde2 100644 --- a/android/app/src/main/java/org/lichess/mobileapp/MainActivity.java +++ b/android/app/src/main/java/org/lichess/mobileapp/MainActivity.java @@ -80,6 +80,11 @@ public void onDestroy() { private PackageInfo getCurrentWebViewPackageInfo() { try { + // Skip check for Huawei phones + if (info.packageName.equals("com.huawei.webview")) { + return true; + } + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { /* Starting with Android O (API 26) they added a new method specific for this */ return WebView.getCurrentWebViewPackage(); From 6e62d316627e0f6e88d1ad57a9a44250399ef7b6 Mon Sep 17 00:00:00 2001 From: Perry Valdez Date: Sat, 6 May 2023 12:56:29 +0800 Subject: [PATCH 2/3] Corrected code for skipping checks on Huawei phones --- .../main/java/org/lichess/mobileapp/MainActivity.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/android/app/src/main/java/org/lichess/mobileapp/MainActivity.java b/android/app/src/main/java/org/lichess/mobileapp/MainActivity.java index 3558dcde2..44f26c549 100644 --- a/android/app/src/main/java/org/lichess/mobileapp/MainActivity.java +++ b/android/app/src/main/java/org/lichess/mobileapp/MainActivity.java @@ -37,6 +37,11 @@ public void onCreate(Bundle savedInstanceState) { PackageInfo pInfo = getCurrentWebViewPackageInfo(); if (pInfo != null) { + // Skip check for Huawei phones + if (info.packageName.startsWith("com.huawei.")) { + return; + } + try { Integer majorVersion = Integer.parseInt(pInfo.versionName.split(Pattern.quote("."))[0]); if (majorVersion < MIN_VERSION) { @@ -80,11 +85,6 @@ public void onDestroy() { private PackageInfo getCurrentWebViewPackageInfo() { try { - // Skip check for Huawei phones - if (info.packageName.equals("com.huawei.webview")) { - return true; - } - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { /* Starting with Android O (API 26) they added a new method specific for this */ return WebView.getCurrentWebViewPackage(); From fc23f8139c7f3e7be0b92e0d9bb9d921a015c902 Mon Sep 17 00:00:00 2001 From: Perry Valdez Date: Sat, 6 May 2023 13:02:52 +0800 Subject: [PATCH 3/3] Corrected code for skipping checks on Huawei phones --- .../app/src/main/java/org/lichess/mobileapp/MainActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/app/src/main/java/org/lichess/mobileapp/MainActivity.java b/android/app/src/main/java/org/lichess/mobileapp/MainActivity.java index 44f26c549..c2b1f2f6e 100644 --- a/android/app/src/main/java/org/lichess/mobileapp/MainActivity.java +++ b/android/app/src/main/java/org/lichess/mobileapp/MainActivity.java @@ -38,7 +38,7 @@ public void onCreate(Bundle savedInstanceState) { PackageInfo pInfo = getCurrentWebViewPackageInfo(); if (pInfo != null) { // Skip check for Huawei phones - if (info.packageName.startsWith("com.huawei.")) { + if (pInfo.packageName.startsWith("com.huawei.")) { return; }