Update version to 1.0.1

README.md

@@ -2,7 +2,7 @@
 
 [![Blank](https://img.shields.io/badge/build-passing-brightgreen)](https://github.com/KitsunePie/AppErrorsTracking)
 [![Blank](https://img.shields.io/badge/license-AGPL3.0-blue)](https://github.com/KitsunePie/AppErrorsTracking/blob/master/LICENSE)
-[![Blank](https://img.shields.io/badge/version-v1.0-green)](https://github.com/KitsunePie/AppErrorsTracking/releases)
+[![Blank](https://img.shields.io/badge/version-v1.0.1-green)](https://github.com/KitsunePie/AppErrorsTracking/releases)
 [![Blank](https://img.shields.io/github/downloads/KitsunePie/AppErrorsTracking/total?label=Release)](https://github.com/KitsunePie/AppErrorsTracking/releases)
 [![Blank](https://img.shields.io/github/downloads/Xposed-Modules-Repo/com.fankes.apperrorstracking/total?label=LSPosed%20Repo&logo=Android&style=flat&labelColor=F48FB1&logoColor=ffffff)](https://github.com/Xposed-Modules-Repo/com.fankes.apperrorstracking/releases)
 <br/><br/>

app/src/main/java/com/fankes/apperrorstracking/hook/entity/FrameworkHooker.kt

@@ -23,10 +23,12 @@
 
 package com.fankes.apperrorstracking.hook.entity
 
+import android.app.Dialog
 import android.content.Context
 import android.content.Intent
 import android.content.pm.ApplicationInfo
 import android.content.pm.PackageManager
+import android.os.Build
 import android.os.Message
 import androidx.core.graphics.drawable.IconCompat
 import androidx.core.graphics.drawable.toBitmap
@@ -51,6 +53,7 @@ import com.highcapable.yukihookapi.hook.factory.field
 import com.highcapable.yukihookapi.hook.factory.hasMethod
 import com.highcapable.yukihookapi.hook.factory.method
 import com.highcapable.yukihookapi.hook.log.loggerE
+import com.highcapable.yukihookapi.hook.type.android.BundleClass
 import com.highcapable.yukihookapi.hook.type.android.MessageClass
 
 object FrameworkHooker : YukiBaseHooker() {
@@ -58,8 +61,10 @@ object FrameworkHooker : YukiBaseHooker() {
     private const val ActivityManagerServiceClass = "com.android.server.am.ActivityManagerService"
     private const val UserControllerClass = "com.android.server.am.UserController"
     private const val AppErrorsClass = "com.android.server.am.AppErrors"
+    private const val AppErrorDialogClass = "com.android.server.am.AppErrorDialog"
     private const val AppErrorDialog_DataClass = "com.android.server.am.AppErrorDialog\$Data"
     private const val ProcessRecordClass = "com.android.server.am.ProcessRecord"
+    private const val ActivityTaskManagerService_LocalServiceClass = "com.android.server.wm.ActivityTaskManagerService\$LocalService"
 
     private val PackageListClass = VariousClass(
         "com.android.server.am.ProcessRecord\$PackageList",
@@ -150,6 +155,26 @@ object FrameworkHooker : YukiBaseHooker() {
                 }
                 intercept()
             }
+        }.ignoredHookClassNotFoundFailure()
+        /** 干掉原生错误对话框 - API 30 以下 */
+        ActivityTaskManagerService_LocalServiceClass.hook {
+            injectMember {
+                method {
+                    name = "canShowErrorDialogs"
+                    emptyParam()
+                }
+                replaceToFalse()
+            }
+        }.by { Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q }
+        /** 干掉原生错误对话框 - 如果上述方法全部失效则直接结束对话框 */
+        AppErrorDialogClass.hook {
+            injectMember {
+                method {
+                    name = "onCreate"
+                    param(BundleClass)
+                }
+                afterHook { instance<Dialog>().cancel() }
+            }
         }
         /** 注入自定义错误对话框 */
         AppErrorsClass.hook {

app/src/main/res/layout/adapter_app_errors_record.xml

@@ -44,7 +44,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="5dp"
-                android:layout_weight="1"
+                android:layout_weight="0.75"
                 android:ellipsize="end"
                 android:singleLine="true"
                 android:textColor="@color/colorTextGray"
@@ -55,7 +55,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="5dp"
-                android:layout_weight="1"
+                android:layout_weight="0.25"
                 android:alpha="0.85"
                 android:ellipsize="start"
                 android:gravity="end"

app/src/main/res/layout/adapter_app_info.xml

@@ -24,11 +24,10 @@
     </androidx.cardview.widget.CardView>
 
     <LinearLayout
-        android:layout_width="0dp"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="10dp"
         android:layout_marginEnd="10dp"
-        android:layout_weight="1"
         android:gravity="center|start"
         android:orientation="vertical">
 

build.gradle

@@ -5,7 +5,7 @@ plugins {
 }
 
 ext {
-    appVersionName = "1.0"
-    appVersionCode = 1
+    appVersionName = "1.0.1"
+    appVersionCode = 2
     enableR8 = true
 }