Merge pull request #138 from Erfa/develop

Ensure all task exceptions are handled, to prevent crashes.
Abedalkareem · Jan 29, 2024 · 431e52d · 431e52d
2 parents 0e842cb + 143d7e2
commit 431e52d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/games_services/android/src/main/kotlin/com/abedalkareem/games_services/Achievements.kt b/games_services/android/src/main/kotlin/com/abedalkareem/games_services/Achievements.kt
@@ -66,15 +66,16 @@ class Achievements(private var activityPluginBinding: ActivityPluginBinding) {
     activity ?: return
     achievementClient
       .load(true)
-      .addOnCompleteListener { task ->
-        val data = task.result.get()
+      .addOnSuccessListener { annotatedData ->
+        val data = annotatedData.get()
+
         if (data == null) {
           result.error(
             PluginError.FailedToLoadAchievements.errorCode(),
             PluginError.FailedToLoadAchievements.errorMessage(),
             null
           )
-          return@addOnCompleteListener
+          return@addOnSuccessListener
         }
         val handler = CoroutineExceptionHandler { _, exception ->
           result.error(

diff --git a/games_services/android/src/main/kotlin/com/abedalkareem/games_services/SaveGame.kt b/games_services/android/src/main/kotlin/com/abedalkareem/games_services/SaveGame.kt
@@ -55,8 +55,9 @@ class SaveGame(private var activityPluginBinding: ActivityPluginBinding) {
       .setDescription(desc)
       .build()
     snapshotsClient.open(name, true, SnapshotsClient.RESOLUTION_POLICY_MOST_RECENTLY_MODIFIED)
-      .addOnCompleteListener { task ->
-        val snapshot = task.result.data
+      .addOnSuccessListener { annotatedData ->
+        val snapshot = annotatedData.data
+
         if (snapshot != null) {
           // Set the data payload for the snapshot
           snapshot.snapshotContents.writeBytes(data.toByteArray())
@@ -77,6 +78,13 @@ class SaveGame(private var activityPluginBinding: ActivityPluginBinding) {
           )
         }
       }
+      .addOnFailureListener {
+        result.error(
+          PluginError.FailedToSaveGame.errorCode(),
+          it.localizedMessage,
+          null
+        )
+      }
   }
 
   fun deleteGame(name: String, result: MethodChannel.Result) {