Merge commit 'fe9a32d1b99253de2e4b0b38653333317aa7e35a' into p2p

Signal/src/AppDelegate.m

@@ -1207,8 +1207,6 @@ static NSTimeInterval launchStartedAt;
     OWSAssertIsOnMainThread();
     OWSLogInfo(@"storageIsReady");
 
-    [LokiAPI loadSwarmCache];
-
     [self checkIfAppIsReady];
 }
 

SignalServiceKit/src/Loki/API/LokiAPI+SwarmAPI.swift

@@ -11,23 +11,22 @@ public extension LokiAPI {
     private static let swarmCacheKey = "swarmCacheKey"
     private static let swarmCacheCollection = "swarmCacheCollection"
     
-    fileprivate static var swarmCache: [String:[Target]] = [:]
+    fileprivate static var swarmCache: [String:[Target]] {
-    
+        get {
-    @objc public static func loadSwarmCache() {
             var result: [String:[Target]]? = nil
             storage.dbReadConnection.read { transaction in
                 let intermediate = transaction.object(forKey: swarmCacheKey, inCollection: swarmCacheCollection) as! [String:[TargetWrapper]]?
                 result = intermediate?.mapValues { $0.map { Target(from: $0) } }
             }
-        swarmCache = result ?? [:]
+            return result ?? [:]
         }
-    
+        set {
-    private static func saveSwarmCache() {
+            let intermediate = newValue.mapValues { $0.map { TargetWrapper(from: $0) } }
-        let intermediate = swarmCache.mapValues { $0.map { TargetWrapper(from: $0) } }
             storage.dbReadWriteConnection.readWrite { transaction in
                 transaction.setObject(intermediate, forKey: swarmCacheKey, inCollection: swarmCacheCollection)
             }
         }
+    }
     
     // MARK: Internal API
     private static func getRandomSnode() -> Promise<Target> {
@@ -41,10 +40,7 @@ public extension LokiAPI {
             return Promise<[Target]> { $0.fulfill(cachedSwarm) }
         } else {
             let parameters: [String:Any] = [ "pubKey" : hexEncodedPublicKey ]
-            return getRandomSnode().then { invoke(.getSwarm, on: $0, associatedWith: hexEncodedPublicKey, parameters: parameters) }.map { parseTargets(from: $0) }.get { swarm in
+            return getRandomSnode().then { invoke(.getSwarm, on: $0, associatedWith: hexEncodedPublicKey, parameters: parameters) }.map { parseTargets(from: $0) }.get { swarmCache[hexEncodedPublicKey] = $0 }
-                swarmCache[hexEncodedPublicKey] = swarm
-                saveSwarmCache()
-            }
         }
     }
     

SignalServiceKit/src/Loki/Utilities/Promise+Hashable.swift

@@ -3,8 +3,8 @@ import PromiseKit
 extension Promise : Hashable {
     
     public func hash(into hasher: inout Hasher) {
-        let reference = ObjectIdentifier(self).hashValue
+        let reference = ObjectIdentifier(self)
-        hasher.combine(reference)
+        hasher.combine(reference.hashValue)
     }
     
     public static func == (lhs: Promise, rhs: Promise) -> Bool {