address review comments

mParticle · Dec 11, 2024 · d90811a · d90811a
1 parent fde1b04
commit d90811a
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/android-core/src/main/java/com/mparticle/internal/BaseHandler.kt b/android-core/src/main/java/com/mparticle/internal/BaseHandler.kt
@@ -17,7 +17,7 @@ open class BaseHandler : Handler {
     private var handling = false
     private val messageQueue: ConcurrentHashMap<Message, Boolean> = ConcurrentHashMap<Message, Boolean>()
 
-    fun getMessageQueue(): Set<Message?> {
+    fun getMessageQueue(): Set<Message> {
         return messageQueue.keys
     }
 
@@ -75,12 +75,10 @@ open class BaseHandler : Handler {
     }
 
     fun removeMessage(what: Int) {
-        val messages: Set<Message?> = messageQueue.keys
+        val messages: Set<Message> = messageQueue.keys
         for (message in messages) {
-            message?.let {
-                if (message.what == what) {
-                    messageQueue.remove(message)
-                }
+            if (message.what == what) {
+                messageQueue.remove(message)
             }
         }
         super.removeMessages(what)