fix: showActivityId

gkd-kit · Dec 25, 2024 · b29fd1a · b29fd1a
1 parent a5c740f
commit b29fd1a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 29 deletions.
diff --git a/app/src/main/kotlin/li/songe/gkd/data/ActionLog.kt b/app/src/main/kotlin/li/songe/gkd/data/ActionLog.kt
@@ -13,6 +13,7 @@ import androidx.room.Update
 import androidx.room.migration.AutoMigrationSpec
 import kotlinx.coroutines.flow.Flow
 import li.songe.gkd.util.format
+import li.songe.gkd.util.getShowActivityId
 
 @Entity(
     tableName = "action_log",
@@ -30,20 +31,7 @@ data class ActionLog(
     @ColumnInfo(name = "rule_key") val ruleKey: Int? = null,
 ) {
 
-    val showActivityId by lazy {
-        if (activityId != null) {
-            if (activityId.startsWith(
-                    appId
-                )
-            ) {
-                activityId.substring(appId.length)
-            } else {
-                activityId
-            }
-        } else {
-            null
-        }
-    }
+    val showActivityId by lazy { getShowActivityId(appId, activityId) }
 
     val date by lazy { ctime.format("MM-dd HH:mm:ss SSS") }
 

diff --git a/app/src/main/kotlin/li/songe/gkd/data/ActivityLog.kt b/app/src/main/kotlin/li/songe/gkd/data/ActivityLog.kt
@@ -11,6 +11,7 @@ import androidx.room.Query
 import androidx.room.migration.AutoMigrationSpec
 import kotlinx.coroutines.flow.Flow
 import li.songe.gkd.util.format
+import li.songe.gkd.util.getShowActivityId
 
 @Entity(
     tableName = "activity_log_v2",
@@ -23,20 +24,7 @@ data class ActivityLog(
     @ColumnInfo(name = "app_id") val appId: String,
     @ColumnInfo(name = "activity_id") val activityId: String? = null,
 ) {
-    val showActivityId by lazy {
-        if (activityId != null) {
-            if (activityId.startsWith(
-                    appId
-                )
-            ) {
-                activityId.substring(appId.length)
-            } else {
-                activityId
-            }
-        } else {
-            null
-        }
-    }
+    val showActivityId by lazy { getShowActivityId(appId, activityId) }
     val date by lazy { ctime.format("MM-dd HH:mm:ss SSS") }
 
     @Dao

diff --git a/app/src/main/kotlin/li/songe/gkd/util/Others.kt b/app/src/main/kotlin/li/songe/gkd/util/Others.kt
@@ -27,4 +27,16 @@ fun Bitmap.isEmptyBitmap(): Boolean {
     return true
 }
 
-class InterruptRuleMatchException() : Exception()
+class InterruptRuleMatchException() : Exception()
+
+fun getShowActivityId(appId: String, activityId: String?) {
+    if (activityId != null) {
+        if (activityId.startsWith(appId) && activityId.getOrNull(appId.length) == '.') {
+            activityId.substring(appId.length)
+        } else {
+            activityId
+        }
+    } else {
+        null
+    }
+}