Merge pull request #807 from ably/feature/fix-npe-ably-completion-lis…

…tener Fix NPE from Ably CompletionListeners
ably · Nov 17, 2022 · 0fecfcc · 0fecfcc
2 parents b7d4863 + f6fdc23
commit 0fecfcc
Showing 1 changed file with 25 additions and 10 deletions.
diff --git a/common/src/main/java/com/ably/tracking/common/Ably.kt b/common/src/main/java/com/ably/tracking/common/Ably.kt
@@ -453,8 +453,11 @@ constructor(
                             continuation.resume(Unit)
                         }
 
-                        override fun onError(reason: ErrorInfo) {
-                            continuation.resumeWithException(reason.toTrackingException())
+                        override fun onError(reason: ErrorInfo?) {
+                            continuation.resumeWithException(
+                                reason?.toTrackingException()
+                                    ?: ConnectionException(ErrorInformation("Unknown error when leaving presence ${channel.name}"))
+                            )
                         }
                     }
                 )
@@ -545,8 +548,11 @@ constructor(
                             continuation.resume(Unit)
                         }
 
-                        override fun onError(reason: ErrorInfo) {
-                            continuation.resumeWithException(reason.toTrackingException())
+                        override fun onError(reason: ErrorInfo?) {
+                            continuation.resumeWithException(
+                                reason?.toTrackingException()
+                                    ?: ConnectionException(ErrorInformation("Unknown error when sending message ${channel.name}"))
+                            )
                         }
                     }
                 )
@@ -720,8 +726,11 @@ constructor(
                             continuation.resume(Unit)
                         }
 
-                        override fun onError(reason: ErrorInfo) {
-                            continuation.resumeWithException(reason.toTrackingException())
+                        override fun onError(reason: ErrorInfo?) {
+                            continuation.resumeWithException(
+                                reason?.toTrackingException()
+                                    ?: ConnectionException(ErrorInformation("Unknown error when updating presence ${channel.name}"))
+                            )
                         }
                     }
                 )
@@ -870,8 +879,11 @@ constructor(
                             continuation.resume(Unit)
                         }
 
-                        override fun onError(reason: ErrorInfo) {
-                            continuation.resumeWithException(reason.toTrackingException())
+                        override fun onError(reason: ErrorInfo?) {
+                            continuation.resumeWithException(
+                                reason?.toTrackingException()
+                                    ?: ConnectionException(ErrorInformation("Unknown error when entering presence $name"))
+                            )
                         }
                     }
                 )
@@ -893,8 +905,11 @@ constructor(
                         continuation.resume(Unit)
                     }
 
-                    override fun onError(reason: ErrorInfo) {
-                        continuation.resumeWithException(reason.toTrackingException())
+                    override fun onError(reason: ErrorInfo?) {
+                        continuation.resumeWithException(
+                            reason?.toTrackingException()
+                                ?: ConnectionException(ErrorInformation("Unknown error when attaching channel $name"))
+                        )
                     }
                 })
             } catch (ablyException: AblyException) {