From f14b7d8f205e503395dadd33b9ec492433e2e5cb Mon Sep 17 00:00:00 2001
From: fankesyooni <qzmmcn@163.com>
Date: Mon, 3 Oct 2022 01:29:06 +0800
Subject: [PATCH] Added @Keep to data beans for R8

---
 .../bean/AppErrorsDisplayBean.kt              | 15 ++++++-------
 .../bean/AppErrorsInfoBean.kt                 | 21 ++++++++++---------
 .../apperrorstracking/bean/AppFiltersBean.kt  |  6 +++++-
 .../apperrorstracking/bean/AppInfoBean.kt     |  7 ++++++-
 .../bean/MutedErrorsAppBean.kt                |  6 +++++-
 5 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/com/fankes/apperrorstracking/bean/AppErrorsDisplayBean.kt b/app/src/main/java/com/fankes/apperrorstracking/bean/AppErrorsDisplayBean.kt
index 1e905e2..491fe40 100644
--- a/app/src/main/java/com/fankes/apperrorstracking/bean/AppErrorsDisplayBean.kt
+++ b/app/src/main/java/com/fankes/apperrorstracking/bean/AppErrorsDisplayBean.kt
@@ -21,6 +21,7 @@
  */
 package com.fankes.apperrorstracking.bean
 
+import androidx.annotation.Keep
 import java.io.Serializable
 
 /**
@@ -34,11 +35,11 @@ import java.io.Serializable
  * @param isShowReopenButton 是否显示重新打开按钮
  */
 data class AppErrorsDisplayBean(
-    var packageName: String,
-    var processName: String,
-    var appName: String,
-    var title: String,
-    var isShowAppInfoButton: Boolean,
-    var isShowCloseAppButton: Boolean,
-    var isShowReopenButton: Boolean
+    @Keep var packageName: String,
+    @Keep var processName: String,
+    @Keep var appName: String,
+    @Keep var title: String,
+    @Keep var isShowAppInfoButton: Boolean,
+    @Keep var isShowCloseAppButton: Boolean,
+    @Keep var isShowReopenButton: Boolean
 ) : Serializable
\ No newline at end of file
diff --git a/app/src/main/java/com/fankes/apperrorstracking/bean/AppErrorsInfoBean.kt b/app/src/main/java/com/fankes/apperrorstracking/bean/AppErrorsInfoBean.kt
index aa7e27e..86cc4b8 100644
--- a/app/src/main/java/com/fankes/apperrorstracking/bean/AppErrorsInfoBean.kt
+++ b/app/src/main/java/com/fankes/apperrorstracking/bean/AppErrorsInfoBean.kt
@@ -23,6 +23,7 @@ package com.fankes.apperrorstracking.bean
 
 import android.app.ApplicationErrorReport
 import android.os.Build
+import androidx.annotation.Keep
 import com.fankes.apperrorstracking.locale.LocaleString
 import com.fankes.apperrorstracking.utils.factory.difference
 import com.fankes.apperrorstracking.utils.factory.toUtcTime
@@ -43,16 +44,16 @@ import java.util.*
  * @param timestamp 记录时间戳
  */
 data class AppErrorsInfoBean(
-    var packageName: String,
-    var isNativeCrash: Boolean,
-    var exceptionClassName: String,
-    var exceptionMessage: String,
-    var throwFileName: String,
-    var throwClassName: String,
-    var throwMethodName: String,
-    var throwLineNumber: Int,
-    var stackTrace: String,
-    var timestamp: Long,
+    @Keep var packageName: String,
+    @Keep var isNativeCrash: Boolean,
+    @Keep var exceptionClassName: String,
+    @Keep var exceptionMessage: String,
+    @Keep var throwFileName: String,
+    @Keep var throwClassName: String,
+    @Keep var throwMethodName: String,
+    @Keep var throwLineNumber: Int,
+    @Keep var stackTrace: String,
+    @Keep var timestamp: Long,
 ) : Serializable {
 
     companion object {
diff --git a/app/src/main/java/com/fankes/apperrorstracking/bean/AppFiltersBean.kt b/app/src/main/java/com/fankes/apperrorstracking/bean/AppFiltersBean.kt
index 97473f0..4fd33dd 100644
--- a/app/src/main/java/com/fankes/apperrorstracking/bean/AppFiltersBean.kt
+++ b/app/src/main/java/com/fankes/apperrorstracking/bean/AppFiltersBean.kt
@@ -21,6 +21,7 @@
  */
 package com.fankes.apperrorstracking.bean
 
+import androidx.annotation.Keep
 import java.io.Serializable
 
 /**
@@ -28,4 +29,7 @@ import java.io.Serializable
  * @param name 名称或包名
  * @param isContainsSystem 是否包含系统应用
  */
-data class AppFiltersBean(var name: String = "", var isContainsSystem: Boolean = false) : Serializable
\ No newline at end of file
+data class AppFiltersBean(
+    @Keep var name: String = "",
+    @Keep var isContainsSystem: Boolean = false
+) : Serializable
\ No newline at end of file
diff --git a/app/src/main/java/com/fankes/apperrorstracking/bean/AppInfoBean.kt b/app/src/main/java/com/fankes/apperrorstracking/bean/AppInfoBean.kt
index 6eb46e4..269c06b 100644
--- a/app/src/main/java/com/fankes/apperrorstracking/bean/AppInfoBean.kt
+++ b/app/src/main/java/com/fankes/apperrorstracking/bean/AppInfoBean.kt
@@ -22,6 +22,7 @@
 package com.fankes.apperrorstracking.bean
 
 import android.graphics.drawable.Drawable
+import androidx.annotation.Keep
 import java.io.Serializable
 
 /**
@@ -30,4 +31,8 @@ import java.io.Serializable
  * @param name APP 名称
  * @param packageName APP 包名
  */
-data class AppInfoBean(var icon: Drawable? = null, var name: String, var packageName: String) : Serializable
\ No newline at end of file
+data class AppInfoBean(
+    @Keep var icon: Drawable? = null,
+    @Keep var name: String,
+    @Keep var packageName: String
+) : Serializable
\ No newline at end of file
diff --git a/app/src/main/java/com/fankes/apperrorstracking/bean/MutedErrorsAppBean.kt b/app/src/main/java/com/fankes/apperrorstracking/bean/MutedErrorsAppBean.kt
index 3feef79..84bd0a6 100644
--- a/app/src/main/java/com/fankes/apperrorstracking/bean/MutedErrorsAppBean.kt
+++ b/app/src/main/java/com/fankes/apperrorstracking/bean/MutedErrorsAppBean.kt
@@ -21,6 +21,7 @@
  */
 package com.fankes.apperrorstracking.bean
 
+import androidx.annotation.Keep
 import java.io.Serializable
 
 /**
@@ -28,7 +29,10 @@ import java.io.Serializable
  * @param type 类型
  * @param packageName 包名
  */
-data class MutedErrorsAppBean(var type: MuteType, var packageName: String) : Serializable {
+data class MutedErrorsAppBean(
+    @Keep var type: MuteType,
+    @Keep var packageName: String
+) : Serializable {
 
     /**
      * 已忽略的异常类型