From 92f3dcdeca968f7d65d29d845be65f35da8fe701 Mon Sep 17 00:00:00 2001
From: Niels Andriesse <andriesseniels@gmail.com>
Date: Thu, 14 Nov 2019 13:32:35 +1100
Subject: [PATCH] Update public chat poller for multi device

---
 .../src/Loki/API/Public Chat/LokiPublicChatPoller.swift     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/SignalServiceKit/src/Loki/API/Public Chat/LokiPublicChatPoller.swift b/SignalServiceKit/src/Loki/API/Public Chat/LokiPublicChatPoller.swift
index 807614ada..35c8f44ca 100644
--- a/SignalServiceKit/src/Loki/API/Public Chat/LokiPublicChatPoller.swift	
+++ b/SignalServiceKit/src/Loki/API/Public Chat/LokiPublicChatPoller.swift	
@@ -157,7 +157,11 @@ public final class LokiPublicChatPoller : NSObject {
         // Poll
         let _ = LokiPublicChatAPI.getMessages(for: publicChat.channel, on: publicChat.server).done(on: DispatchQueue.global()) { messages in
             messages.forEach { message in
-                if message.hexEncodedPublicKey != userHexEncodedPublicKey {
+                var wasSentByCurrentUser = false
+                OWSPrimaryStorage.shared().dbReadConnection.read { transaction in
+                    wasSentByCurrentUser = LokiDatabaseUtilities.isUserLinkedDevice(message.hexEncodedPublicKey, transaction: transaction)
+                }
+                if !wasSentByCurrentUser {
                     processIncomingMessage(message)
                 } else {
                     processOutgoingMessage(message)