chore: 版本更新至 5.14.3

fix: 捕抓清理安装包时的 concurrent 异常

See merge request halo/android/assistant-android!419

app/src/main/java/com/gh/common/constant/Config.java

@@ -381,7 +381,6 @@ public class Config {
                             mNightModeSetting = data.getNightMode();
                             if (HaloApp.getInstance().isNewForThisVersion && mNightModeSetting != null && mNightModeSetting.getInstall()) {
                                 DarkModeUtils.INSTANCE.updateFollowSystemDarkModeToSp(true);
-                                DarkModeUtils.INSTANCE.updateAppDarkModeStatusToSp(true);
                                 DarkModeUtils.INSTANCE.initDarkMode();
                             }
 

app/src/main/java/com/gh/download/DownloadManager.java

@@ -36,6 +36,7 @@ import com.gh.common.util.PackageUtils;
 import com.gh.gamecenter.core.utils.PageSwitchDataHelper;
 import com.gh.gamecenter.core.utils.SPUtils;
 import com.gh.gamecenter.BuildConfig;
+import com.gh.gamecenter.core.utils.SentryHelper;
 import com.gh.gamecenter.download.DownloadedGameIdAndPackageNameDao;
 import com.gh.gamecenter.entity.ApkEntity;
 import com.gh.gamecenter.entity.GameEntity;
@@ -389,12 +390,16 @@ public class DownloadManager implements DownloadStatusListener {
      * 清理不存在本地 APK 文件的任务
      */
     public void clearTasksThatFileBeenDeleted() {
-        for (DownloadEntity entity : getAllDownloadEntity()) {
-            if (entity.getStatus() == DownloadStatus.done) {
-                if (FileUtils.isEmptyFile(entity.getPath())) {
-                    cancel(entity.getUrl());
+        try {
+            for (DownloadEntity entity : getAllDownloadEntity()) {
+                if (entity.getStatus() == DownloadStatus.done) {
+                    if (FileUtils.isEmptyFile(entity.getPath())) {
+                        cancel(entity.getUrl());
+                    }
                 }
             }
+        } catch (Exception e) {
+            SentryHelper.INSTANCE.onEvent("CLEAR_DELETED_TASK_ERROR", "exception_digest", e.getLocalizedMessage());
         }
     }
 

dependencies.gradle

@@ -7,8 +7,8 @@ ext {
     targetSdkVersion = 28
 
     // application info (每个大版本之间的 versionCode 增加 20)
-    versionCode = 631
-    versionName = "5.14.1"
+    versionCode = 633
+    versionName = "5.14.3"
     applicationId = "com.gh.gamecenter"
 
     // AndroidX

module_common/src/main/java/com/gh/gamecenter/common/base/activity/BaseActivity.java

@@ -80,6 +80,9 @@ import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.List;
 
+import io.sentry.Breadcrumb;
+import io.sentry.Sentry;
+import io.sentry.SentryLevel;
 import kotlin.Pair;
 import pub.devrel.easypermissions.EasyPermissions;
 
@@ -564,12 +567,19 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy
             // 这里根据调用栈是否存在 DarkModeUtils 来确定是否为系统回调
             StackTraceElement[] trace = Thread.currentThread().getStackTrace();
             for (StackTraceElement element : trace) {
-                if (element.getClassName().contains(DarkModeUtils.class.getSimpleName())) {
+                if (element.getClassName().equals(DarkModeUtils.class.getName())) {
                     isCalledBySystem = false;
                     break;
                 }
             }
 
+            Breadcrumb breadcrumb = new Breadcrumb();
+            breadcrumb.setCategory("onConfigurationChanged");
+            breadcrumb.setMessage("IsCalledBySystem " + isCalledBySystem + ","
+                    + this.getClass().getSimpleName() + " lifecycle is " + getLifecycle().getCurrentState());
+            breadcrumb.setLevel(SentryLevel.INFO);
+            Sentry.addBreadcrumb(breadcrumb);
+
             if (BuildConfig.IS_DARK_MODE_ON && mIsDarkModeOn != DarkModeUtils.INSTANCE.isDarkModeOn(this)) {
                 // 当且仅当页面处于可见状态时响应新的 UiMode，并将它传递下去
                 // （在不可见的 activity 调用 onConfigurationChanged 方法有一定概率触发 ANR）

module_common/src/main/java/com/gh/gamecenter/common/utils/Extensions.kt

@@ -1,6 +1,7 @@
 package com.gh.gamecenter.common.utils
 
 import android.animation.Animator
+import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.ClipData
 import android.content.ClipboardManager
@@ -331,7 +332,8 @@ fun Fragment.ifLogin(entrance: String, action: (() -> Unit)? = null) {
 }
 
 fun Context.ifLogin(entrance: String, action: (() -> Unit)? = null) {
-    val checkLoginConfig = ARouter.getInstance().build(RouteConsts.provider.checkLogin).navigation() as? ICheckLoginProvider
+    val checkLoginConfig =
+        ARouter.getInstance().build(RouteConsts.provider.checkLogin).navigation() as? ICheckLoginProvider
     checkLoginConfig?.checkLogin(this, entrance, action)
 }
 
@@ -379,8 +381,10 @@ fun String.containHtmlTag(): Boolean {
  */
 fun Fragment.showRegulationTestDialogIfNeeded(action: (() -> Unit)) {
     val provider = ARouter.getInstance().build(RouteConsts.provider.directUtils).navigation() as? IDirectProvider
-    val userManagerProvider = ARouter.getInstance().build(RouteConsts.provider.userManager).navigation() as? IUserManagerProvider
-    val dialogUtils = ARouter.getInstance().build(RouteConsts.provider.dialogUtils).navigation() as? IDialogUtilsProvider
+    val userManagerProvider =
+        ARouter.getInstance().build(RouteConsts.provider.userManager).navigation() as? IUserManagerProvider
+    val dialogUtils =
+        ARouter.getInstance().build(RouteConsts.provider.dialogUtils).navigation() as? IDialogUtilsProvider
     if (userManagerProvider?.userShouldTakeRegulationBaseOnLastRemind() == true) {
         dialogUtils?.showRegulationTestDialog(requireContext(),
             { provider?.directToRegulationTestPage(requireContext()) },
@@ -392,8 +396,10 @@ fun Fragment.showRegulationTestDialogIfNeeded(action: (() -> Unit)) {
 
 fun Context.showRegulationTestDialogIfNeeded(action: (() -> Unit)) {
     val provider = ARouter.getInstance().build(RouteConsts.provider.directUtils).navigation() as? IDirectProvider
-    val userManagerProvider = ARouter.getInstance().build(RouteConsts.provider.userManager).navigation() as? IUserManagerProvider
-    val dialogUtils = ARouter.getInstance().build(RouteConsts.provider.dialogUtils).navigation() as? IDialogUtilsProvider
+    val userManagerProvider =
+        ARouter.getInstance().build(RouteConsts.provider.userManager).navigation() as? IUserManagerProvider
+    val dialogUtils =
+        ARouter.getInstance().build(RouteConsts.provider.dialogUtils).navigation() as? IDialogUtilsProvider
     if (userManagerProvider?.userShouldTakeRegulationBaseOnLastRemind() == true) {
         dialogUtils?.showRegulationTestDialog(this,
             { provider?.directToRegulationTestPage(this) },
@@ -864,8 +870,10 @@ fun CharSequence.interceptUrlSpanAndRoundImageSpan(clickedCallback: ((url: Strin
 
                     override fun onClick(widget: View) {
                         clickedCallback?.invoke(it.url)
-                        val webActivityProvider = ARouter.getInstance().build(RouteConsts.provider.webActivity).navigation() as? IWebProvider
-                        val provider = ARouter.getInstance().build(RouteConsts.provider.defaultUrlHandler).navigation() as IDefaultUrlHandlerProvider
+                        val webActivityProvider =
+                            ARouter.getInstance().build(RouteConsts.provider.webActivity).navigation() as? IWebProvider
+                        val provider = ARouter.getInstance().build(RouteConsts.provider.defaultUrlHandler)
+                            .navigation() as IDefaultUrlHandlerProvider
                         if (!provider.interceptUrl(widget.context, it.url, "")) {
                             webActivityProvider?.getIntent(widget.context, it.url, true)?.run {
                                 widget.context.startActivity(this)
@@ -992,8 +1000,10 @@ fun Context.doOnMainProcessOnly(callback: EmptyCallback) {
  * 虽然现在我们没有了友盟以后只是单进程APP，但在 debug 模式下还有 whatTheStack 这个进程如果不限定主进程会出现奇奇怪怪的问题 (BroadcastReceiver相关)
  */
 inline fun Context.doOnMainProcessOnly(f: () -> Unit) {
-    val buildConfig = ARouter.getInstance().build(RouteConsts.provider.buildConfig).navigation() as? IBuildConfigProvider
-    val packageUtilsConfig = ARouter.getInstance().build(RouteConsts.provider.packageUtils).navigation() as? IPackageUtilsProvider
+    val buildConfig =
+        ARouter.getInstance().build(RouteConsts.provider.buildConfig).navigation() as? IBuildConfigProvider
+    val packageUtilsConfig =
+        ARouter.getInstance().build(RouteConsts.provider.packageUtils).navigation() as? IPackageUtilsProvider
     val processName = packageUtilsConfig?.obtainProcessName(this)
     if (processName == null || buildConfig?.getApplicationId() == processName) {
         f.invoke()
@@ -1005,8 +1015,10 @@ inline fun Context.doOnMainProcessOnly(f: () -> Unit) {
 }
 
 inline fun doOnMainProcessOnly(f: () -> Unit) {
-    val buildConfig = ARouter.getInstance().build(RouteConsts.provider.buildConfig).navigation() as? IBuildConfigProvider
-    val packageUtilsConfig = ARouter.getInstance().build(RouteConsts.provider.packageUtils).navigation() as? IPackageUtilsProvider
+    val buildConfig =
+        ARouter.getInstance().build(RouteConsts.provider.buildConfig).navigation() as? IBuildConfigProvider
+    val packageUtilsConfig =
+        ARouter.getInstance().build(RouteConsts.provider.packageUtils).navigation() as? IPackageUtilsProvider
     val processName = packageUtilsConfig?.obtainProcessName(HaloApp.getInstance())
     if (processName == null || buildConfig?.getApplicationId() == processName) {
         f.invoke()
@@ -1251,9 +1263,19 @@ fun String.emojiCount(): Int {
 /**
  * WebView启用强制深色模式
  */
+@SuppressLint("RequiresFeature")
 fun WebView.enableForceDark(isDarkModeOn: Boolean) {
-    if (BuildConfig.IS_DARK_MODE_ON && WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK)) {
-        WebSettingsCompat.setForceDark(settings, if (isDarkModeOn) WebSettingsCompat.FORCE_DARK_ON else WebSettingsCompat.FORCE_DARK_OFF)
+    val isFeatureSupported = try {
+        WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK)
+    } catch (throwable: Throwable) {
+        throwable.printStackTrace()
+        false
+    }
+    if (BuildConfig.IS_DARK_MODE_ON && isFeatureSupported) {
+        WebSettingsCompat.setForceDark(
+            settings,
+            if (isDarkModeOn) WebSettingsCompat.FORCE_DARK_ON else WebSettingsCompat.FORCE_DARK_OFF
+        )
     }
 }