fix: Deserialize enum GameScores and cleanup proguard rules

Gimbergsson · Jan 17, 2025 · 1b71023 · 1b71023
1 parent 020842b
commit 1b71023
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 17 deletions.
diff --git a/androidos/proguard-rules.pro b/androidos/proguard-rules.pro
@@ -20,11 +20,6 @@
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
 
--keep class com.google.android.gms.common.data.EntityBuffer { *; }
--keep class com.google.android.gms.common.data.AbstractDataBuffer { *; }
--keep class com.google.android.gms.wearable.DataEventBuffer { *; }
--keep class com.google.android.gms.wearable.DataEvent { *; }
-
 # Classes from :androidos module
 -keep class se.dennisgimbergsson.tennisscoreboard.MainActivity { *; }
 

diff --git a/androidos/src/main/java/se/dennisgimbergsson/tennisscoreboard/di/AppModule.kt b/androidos/src/main/java/se/dennisgimbergsson/tennisscoreboard/di/AppModule.kt
@@ -11,6 +11,8 @@ import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
 import io.appwrite.Client
+import se.dennisgimbergsson.shared.GameScoresDeserializer
+import se.dennisgimbergsson.shared.enums.GameScores
 import se.dennisgimbergsson.shared.utils.Constants
 import se.dennisgimbergsson.shared.utils.DefaultDispatcherProvider
 import se.dennisgimbergsson.shared.utils.DispatcherProvider
@@ -26,7 +28,9 @@ annotation class DeveloperPreferences
 object AppModule {
 
     @Provides
-    fun gson(): Gson = GsonBuilder().create()
+    fun gson(): Gson = GsonBuilder()
+        .registerTypeAdapter(GameScores::class.java, GameScoresDeserializer())
+        .create()
 
     @Provides
     fun appwriteClient(): Client = Client()

diff --git a/androidos/src/main/java/se/dennisgimbergsson/tennisscoreboard/services/ScoreboardWorker.kt b/androidos/src/main/java/se/dennisgimbergsson/tennisscoreboard/services/ScoreboardWorker.kt
@@ -11,7 +11,9 @@ import com.google.android.gms.wearable.DataMap
 import com.google.android.gms.wearable.DataMapItem
 import com.google.android.gms.wearable.Wearable
 import com.google.gson.GsonBuilder
+import se.dennisgimbergsson.shared.GameScoresDeserializer
 import se.dennisgimbergsson.shared.data.models.Scoreboard
+import se.dennisgimbergsson.shared.enums.GameScores
 import se.dennisgimbergsson.shared.extensions.logAndroidMessage
 import se.dennisgimbergsson.shared.utils.Constants
 
@@ -63,6 +65,10 @@ class ScoreboardWorker(
 
     private fun getScoreboardUpdate(dataMap: DataMap): Scoreboard {
         val json = dataMap.getString(Constants.Keys.SCOREBOARD_UPDATE)
-        return GsonBuilder().create().fromJson(json, Scoreboard::class.java) ?: Scoreboard()
+        logAndroidMessage(message = "json: $json")
+        return GsonBuilder()
+            .registerTypeAdapter(GameScores::class.java, GameScoresDeserializer())
+            .create()
+            .fromJson(json, Scoreboard::class.java) ?: Scoreboard()
     }
 }
diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
@@ -53,6 +53,9 @@ dependencies {
 
     implementation(libs.material)
 
+    // 3rd-party libraries
+    implementation(libs.gson)
+
     testImplementation(libs.androidx.arch.core)
     testImplementation(libs.kotlinx.corutines.test)
 

diff --git a/shared/proguard-rules.pro b/shared/proguard-rules.pro
@@ -20,7 +20,8 @@
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
 
-#-keep class se.dennisgimbergsson.shared.data.models.** { *; }
-#-keep @se.dennisgimbergsson.shared.utils.ThemedPreview class *
-#-keep @se.dennisgimbergsson.shared.utils.LocalePreview class *
-#-keep @se.dennisgimbergsson.shared.utils.WearPreview class *
+# Classes from :shared module
+-keep class se.dennisgimbergsson.shared.data.models.** { *; }
+-keep @se.dennisgimbergsson.shared.utils.ThemedPreview class *
+-keep @se.dennisgimbergsson.shared.utils.LocalePreview class *
+-keep @se.dennisgimbergsson.shared.utils.WearPreview class *
diff --git a/shared/src/main/java/se/dennisgimbergsson/shared/GameScoresDeserializer.kt b/shared/src/main/java/se/dennisgimbergsson/shared/GameScoresDeserializer.kt
@@ -0,0 +1,19 @@
+package se.dennisgimbergsson.shared
+
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import se.dennisgimbergsson.shared.enums.GameScores
+import java.lang.reflect.Type
+
+class GameScoresDeserializer : JsonDeserializer<GameScores> {
+
+    override fun deserialize(
+        json: JsonElement?,
+        typeOfT: Type?,
+        context: JsonDeserializationContext?
+    ): GameScores {
+        val stringValue = json?.asString
+        return GameScores.entries.find { it.name == stringValue } ?: GameScores.ZERO
+    }
+}
diff --git a/shared/src/main/java/se/dennisgimbergsson/shared/data/models/Score.kt b/shared/src/main/java/se/dennisgimbergsson/shared/data/models/Score.kt
@@ -4,9 +4,9 @@ import se.dennisgimbergsson.shared.enums.GameScores
 import se.dennisgimbergsson.shared.enums.GameScores.ZERO
 
 data class Score(
-    var gameScore: GameScores = ZERO,
-    var wonGames: Int = 0,
-    var wonSets: Int = 0
+    val gameScore: GameScores = ZERO,
+    val wonGames: Int = 0,
+    val wonSets: Int = 0
 ) {
     fun isNotCleared() = !isCleared()
 

diff --git a/wearos/proguard-rules.pro b/wearos/proguard-rules.pro
@@ -20,9 +20,6 @@
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
 
-#-keep class com.google.android.gms.wearable.PutDataRequest { *; }
--keep class * extends android.os.Parcelable { *; }
-
 # Classes from :wearos module
 -keep class se.dennisgimbergsson.tennisscoreboard.ui.screens.MainActivity { *; }