Merge pull request #68 from boswelja/fix-serialization-receiver-crash

fix: Only pass on deserialized message if the path matches the serializer
boswelja · Nov 17, 2021 · db4c797 · db4c797
2 parents 3cb069f + 783d001
commit db4c797
Showing 1 changed file with 17 additions and 15 deletions.
diff --git a/...tion/src/androidMain/kotlin/com/boswelja/watchconnection/serialization/MessageReceiver.kt b/...tion/src/androidMain/kotlin/com/boswelja/watchconnection/serialization/MessageReceiver.kt
@@ -36,22 +36,24 @@ public abstract class MessageReceiver<T>(
         // Get message details
         val message = MessageReceiverUtils.getReceivedMessageFromIntent(intent)
 
-        val pendingResult = goAsync()
-        coroutineScope.launch {
-            // Deserialize and pass message on
-            val deserializedData = serializer.deserialize(message.data)
-            try {
-                onMessageReceived(
-                    context,
-                    ReceivedMessage(
-                        message.sourceUid,
-                        message.path,
-                        deserializedData
+        if (serializer.messagePaths.contains(message.path)) {
+            val pendingResult = goAsync()
+            coroutineScope.launch {
+                // Deserialize and pass message on
+                val deserializedData = serializer.deserialize(message.data)
+                try {
+                    onMessageReceived(
+                        context,
+                        ReceivedMessage(
+                            message.sourceUid,
+                            message.path,
+                            deserializedData
+                        )
                     )
-                )
-            } finally {
-                pendingResult.finish()
-                coroutineScope.cancel()
+                } finally {
+                    pendingResult.finish()
+                    coroutineScope.cancel()
+                }
             }
         }
     }