From 97c74bb3dcbfc7a246b1e4edf012f21523927dc6 Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Wed, 28 Apr 2021 14:10:44 +1000
Subject: [PATCH] Fix polling

---
 .../messaging/sending_receiving/pollers/Poller.kt          | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/Poller.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/Poller.kt
index 5a862d89af..e2754b4090 100644
--- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/Poller.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/Poller.kt
@@ -93,11 +93,8 @@ class Poller {
                 task { Unit } // The long polling connection has been canceled; don't recurse
             } else {
                 val messages = SnodeAPI.parseRawMessagesResponse(rawResponse, snode, userPublicKey)
-                messages.forEach { message ->
-                    val rawMessageAsJSON = message as? Map<*, *>
-                    val base64EncodedData = rawMessageAsJSON?.get("data") as? String
-                    val data = base64EncodedData?.let { Base64.decode(it) } ?: return@forEach
-                    val job = MessageReceiveJob(MessageWrapper.unwrap(data).toByteArray(), false)
+                messages.forEach { envelope ->
+                    val job = MessageReceiveJob(envelope.toByteArray(), false)
                     JobQueue.shared.add(job)
                 }
                 poll(snode, deferred)