From f1ec7e67b1b4db0fdf451159015733757a2df9c9 Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Fri, 12 Jun 2020 11:15:10 +1000
Subject: [PATCH] Undo hack

---
 SignalServiceKit/src/Loki/API/LokiAPI+SwarmAPI.swift     | 4 ++--
 SignalServiceKit/src/Loki/API/LokiPoller.swift           | 2 +-
 SignalServiceKit/src/Network/MessageSenderJobQueue.swift | 3 ---
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/SignalServiceKit/src/Loki/API/LokiAPI+SwarmAPI.swift b/SignalServiceKit/src/Loki/API/LokiAPI+SwarmAPI.swift
index 16b698809..d2b0161ba 100644
--- a/SignalServiceKit/src/Loki/API/LokiAPI+SwarmAPI.swift
+++ b/SignalServiceKit/src/Loki/API/LokiAPI+SwarmAPI.swift
@@ -114,13 +114,13 @@ public extension LokiAPI {
         }
     }
     
-    internal static func getSwarm(for hexEncodedPublicKey: String) -> Promise<[LokiAPITarget]> {
+    internal static func getSwarm(for hexEncodedPublicKey: String, isForcedReload: Bool = false) -> Promise<[LokiAPITarget]> {
         if swarmCache[hexEncodedPublicKey] == nil {
             storage.dbReadConnection.read { transaction in
                 swarmCache[hexEncodedPublicKey] = storage.getSwarm(for: hexEncodedPublicKey, in: transaction)
             }
         }
-        if let cachedSwarm = swarmCache[hexEncodedPublicKey], cachedSwarm.count >= minimumSwarmSnodeCount {
+        if let cachedSwarm = swarmCache[hexEncodedPublicKey], cachedSwarm.count >= minimumSwarmSnodeCount && !isForcedReload {
             return Promise<[LokiAPITarget]> { $0.fulfill(cachedSwarm) }
         } else {
             print("[Loki] Getting swarm for: \(hexEncodedPublicKey).")
diff --git a/SignalServiceKit/src/Loki/API/LokiPoller.swift b/SignalServiceKit/src/Loki/API/LokiPoller.swift
index f084185c8..04efdd97d 100644
--- a/SignalServiceKit/src/Loki/API/LokiPoller.swift
+++ b/SignalServiceKit/src/Loki/API/LokiPoller.swift
@@ -54,7 +54,7 @@ public final class LokiPoller : NSObject {
     // MARK: Private API
     private func setUpPolling() {
         guard !hasStopped else { return }
-        LokiAPI.getSwarm(for: getUserHexEncodedPublicKey()).then2 { [weak self] _ -> Promise<Void> in
+        LokiAPI.getSwarm(for: getUserHexEncodedPublicKey(), isForcedReload: true).then2 { [weak self] _ -> Promise<Void> in
             guard let strongSelf = self else { return Promise { $0.fulfill(()) } }
             strongSelf.usedSnodes.removeAll()
             let (promise, seal) = Promise<Void>.pending()
diff --git a/SignalServiceKit/src/Network/MessageSenderJobQueue.swift b/SignalServiceKit/src/Network/MessageSenderJobQueue.swift
index 8fe066e77..f049bf23b 100644
--- a/SignalServiceKit/src/Network/MessageSenderJobQueue.swift
+++ b/SignalServiceKit/src/Network/MessageSenderJobQueue.swift
@@ -73,9 +73,6 @@ public class MessageSenderJobQueue: NSObject, JobQueue {
             return
         }
         self.add(jobRecord: jobRecord, transaction: transaction)
-        transaction.addCompletionQueue(DispatchQueue.global()) {
-            self.workStep() // Loki: Hack to make message sending faster until we have decentralized multi device and no more proof of work
-        }
     }
 
     // MARK: JobQueue