fix update expiries testing on testnet

Session/Meta/Session-Info.plist

@@ -68,8 +68,12 @@
 		<dict>
 			<key>public.loki.foundation</key>
 			<dict>
+				<key>NSExceptionAllowsInsecureHTTPLoads</key>
+				<true/>
+				<key>NSIncludesSubdomains</key>
+				<true/>
 				<key>NSExceptionRequiresForwardSecrecy</key>
-				<false/>
+				<true/>
 			</dict>
 			<key>storage.seed1.loki.network</key>
 			<dict>
@@ -90,7 +94,7 @@
 	<key>NSContactsUsageDescription</key>
 	<string>Signal uses your contacts to find users you know. We do not store your contacts on the server.</string>
 	<key>NSFaceIDUsageDescription</key>
-	<string>Session's Screen Lock feature uses Face ID.</string>
+	<string>Session&apos;s Screen Lock feature uses Face ID.</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>com.loki-project.loki-messenger</string>
 	<key>NSMicrophoneUsageDescription</key>

SessionMessagingKit/Jobs/Types/DisappearingMessagesJob.swift

@@ -131,6 +131,10 @@ public extension DisappearingMessagesJob {
                         .updateAll(db, Interaction.Columns.expiresInSeconds.set(to: expiresInSeconds))
                 }
             }.retainUntilComplete()
+            
+            let swarm = SnodeAPI.swarmCache.wrappedValue[getUserHexEncodedPublicKey(db)] ?? []
+            let snode = swarm.randomElement()!
+            SnodeAPI.getExpiries(from: snode, associatedWith: getUserHexEncodedPublicKey(db), of: expirationInfos.map { $0.serverHash }).retainUntilComplete()
         }
         
         return updateNextRunIfNeeded(db)

SessionSnodeKit/SnodeAPI.swift

@@ -784,8 +784,6 @@ public final class SnodeAPI {
             return Promise(error: SnodeAPIError.generic)
         }
         
-        let publicKey = (Features.useTestnet ? publicKey.removingIdPrefixIfNeeded() : publicKey)
-        
         let updatedExpiryMsWithNetworkOffset: UInt64 = UInt64(updatedExpiryMs + SnodeAPI.clockOffsetMs.wrappedValue)
         
         let shortenOrExtend: String? = {
@@ -813,7 +811,7 @@ public final class SnodeAPI {
                         throw SnodeAPIError.signingFailed
                     }
                     
-                    let parameters: JSON = [
+                    var parameters: JSON = [
                         "pubkey" : publicKey,
                         "pubkey_ed25519" : userED25519KeyPair.publicKey.toHexString(),
                         "expiry": updatedExpiryMsWithNetworkOffset,
@@ -821,6 +819,9 @@ public final class SnodeAPI {
                         "signature": signature.toBase64()
                     ]
                     
+                    if shortenOnly { parameters["shorten"] = true }
+                    if extendOnly { parameters["extend"] = true }
+                    
                     return attempt(maxRetryCount: maxRetryCount, recoveringOn: Threading.workQueue) {
                         invoke(.expire, on: snode, associatedWith: publicKey, parameters: parameters)
                             .map2 { responseData -> [String: (hashes: [String], expiry: UInt64, unchanged: [String: UInt64]?)] in
@@ -891,7 +892,6 @@ public final class SnodeAPI {
             return Promise(error: SnodeAPIError.noKeyPair)
         }
         
-        let publicKey = (Features.useTestnet ? publicKey.removingIdPrefixIfNeeded() : publicKey)
         let userX25519PublicKey: String = getUserHexEncodedPublicKey()
         
         return attempt(maxRetryCount: maxRetryCount, recoveringOn: Threading.workQueue) {