Merge remote-tracking branch 'origin/release' into dev

# Conflicts: # dependencies.gradle
2023-01-11 11:11:02 +08:00
parent a5cdc5b432 a337494d22
commit 362ac1415c
7 changed files with 46 additions and 31 deletions
--- a/app/src/main/java/com/gh/common/util/PackageUtils.java
+++ b/app/src/main/java/com/gh/common/util/PackageUtils.java
@ -1014,7 +1014,7 @@ public class PackageUtils {
    public static boolean checkWebViewIsAvailable(Context context) {
        List<String> webViewAbiList = HaloApp.getInstance().getWebViewAbiList();

-        if (webViewAbiList != null) {
+        if (webViewAbiList != null && !webViewAbiList.isEmpty()) {
            if (webViewAbiList.size() == 2 && webViewAbiList.contains("x86") && webViewAbiList.contains("x86_64")) {
                return true;
            }