Merge branch 'dev' of https://github.com/loki-project/loki-messenger-ios into sync-closed-group

Pods

@@ -1 +1 @@
-Subproject commit c171262c7dec75b47e89cde64b6ab2908b200c6b
+Subproject commit eeaffe766824af6c6b7e7351da6bddb1e9d99611

Signal/src/ViewControllers/ConversationView/ConversationViewController.m

@@ -88,6 +88,7 @@
 #import <YapDatabase/YapDatabaseAutoView.h>
 #import <YapDatabase/YapDatabaseViewChange.h>
 #import <YapDatabase/YapDatabaseViewConnection.h>
+#import <SignalMetaDataKit/SignalMetadataKit-Swift.h>
 
 @import Photos;
 

SignalServiceKit/src/Contacts/Threads/TSContactThread.h

@@ -3,15 +3,16 @@
 //
 
 #import "TSThread.h"
-#import <SignalMetadataKit/SignalMetadataKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
 extern NSString *const TSContactThreadPrefix;
 
+typedef NS_ENUM(NSInteger, LKSessionResetStatus);
+
 @interface TSContactThread : TSThread
 
-// Loki: The current session reset state for this thread
+// Loki: The current session reset status for this thread
 @property (atomic) LKSessionResetStatus sessionResetStatus;
 @property (atomic, readonly) NSArray<NSString *> *sessionRestoreDevices;
 

SignalServiceKit/src/Contacts/Threads/TSContactThread.m

@@ -11,6 +11,7 @@
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 #import <YapDatabase/YapDatabaseConnection.h>
 #import <YapDatabase/YapDatabaseTransaction.h>
+#import <SignalMetadataKit/SignalMetadataKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

SignalServiceKit/src/Loki/API/LokiFileServerProxy.swift

@@ -49,11 +49,11 @@ internal class LokiFileServerProxy : LokiHTTPClient {
         var headers = getCanonicalHeaders(for: request)
         return LokiAPI.getRandomSnode().then { [server = self.server, keyPair = self.keyPair, httpSession = self.httpSession] proxy -> Promise<Any> in
             let url = "\(proxy.address):\(proxy.port)/file_proxy"
-            print("[Loki] Proxying file server request through \(proxy).")
             guard let urlAsString = request.url?.absoluteString, let serverURLEndIndex = urlAsString.range(of: server)?.upperBound,
                 serverURLEndIndex < urlAsString.endIndex else { throw Error.endpointParsingFailed }
             let endpointStartIndex = urlAsString.index(after: serverURLEndIndex)
             let endpoint = String(urlAsString[endpointStartIndex..<urlAsString.endIndex])
+            print("[Loki] Proxying file server request (\(endpoint)) through \(proxy).")
             let parametersAsString: String
             if let tsRequest = request as? TSRequest {
                 headers["Content-Type"] = "application/json"