Improve logging

SignalServiceKit/src/Contacts/TSThread.h

@@ -57,6 +57,7 @@ typedef NS_ENUM(NSInteger, TSThreadFriendRequestStatus) {
 // Loki friend request handling
 // ========
 @property (nonatomic) TSThreadFriendRequestStatus friendRequestStatus;
+@property (nonatomic, readonly) NSString *friendRequestStatusDescription;
 /// Shorthand for checking that `friendRequestStatus` is `TSThreadFriendRequestStatusRequestSending`, `TSThreadFriendRequestStatusRequestSent`
 /// or `TSThreadFriendRequestStatusRequestReceived`.
 @property (nonatomic, readonly) BOOL hasPendingFriendRequest;

SignalServiceKit/src/Contacts/TSThread.m

@@ -767,8 +767,8 @@ ConversationColorName const kConversationColorName_Default = ConversationColorNa
 
 - (void)saveFriendRequestStatus:(TSThreadFriendRequestStatus)friendRequestStatus withTransaction:(YapDatabaseReadWriteTransaction *_Nullable)transaction
 {
-    OWSLogInfo(@"[Loki] Setting thread friend request status to %d.", friendRequestStatus);
     self.friendRequestStatus = friendRequestStatus;
+    OWSLogInfo(@"[Loki] Setting thread friend request status to %@.", self.friendRequestStatusDescription);
     void (^postNotification)() = ^() {
         [NSNotificationCenter.defaultCenter postNotificationName:NSNotification.threadFriendRequestStatusChanged object:self.uniqueId];
     };
@@ -781,6 +781,18 @@ ConversationColorName const kConversationColorName_Default = ConversationColorNa
     }
 }
 
+- (NSString *)friendRequestStatusDescription
+{
+    switch (self.friendRequestStatus) {
+        case TSThreadFriendRequestStatusNone: return @"none";
+        case TSThreadFriendRequestStatusRequestSending: return @"sending";
+        case TSThreadFriendRequestStatusRequestSent: return @"sent";
+        case TSThreadFriendRequestStatusRequestReceived: return @"received";
+        case TSThreadFriendRequestStatusFriends: return @"friends";
+        case TSThreadFriendRequestStatusRequestExpired: return @"expired";
+    }
+}
+
 - (BOOL)hasPendingFriendRequest
 {
     return self.friendRequestStatus == TSThreadFriendRequestStatusRequestSending || self.friendRequestStatus == TSThreadFriendRequestStatusRequestSent

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

@@ -31,7 +31,7 @@ public extension LokiAPI {
     // MARK: Internal API
     private static func getRandomSnode() -> Promise<Target> {
         return Promise<Target> { seal in
-            seal.fulfill(Target(address: "http://13.236.173.191", port: 8080)) // TODO: For debugging purposes
+            seal.fulfill(Target(address: "http://13.236.173.190", port: 8080)) // TODO: For debugging purposes
         }
     }
     
@@ -53,7 +53,7 @@ public extension LokiAPI {
     private static func parseTargets(from rawResponse: Any) -> [Target] {
         // TODO: For debugging purposes
         // ========
-        let target = Target(address: "http://13.236.173.191", port: defaultSnodePort)
+        let target = Target(address: "http://13.236.173.190", port: defaultSnodePort)
         return Array(repeating: target, count: 3)
         // ========
 //        guard let json = rawResponse as? JSON, let addresses = json["snodes"] as? [String] else {

SignalServiceKit/src/Messages/Interactions/TSMessage.h

@@ -45,6 +45,7 @@ typedef NS_ENUM(NSInteger, TSMessageFriendRequestStatus) {
 // Loki friend request handling
 // ========
 @property (nonatomic) TSMessageFriendRequestStatus friendRequestStatus;
+@property (nonatomic, readonly) NSString *friendRequestStatusDescription;
 @property (nonatomic) uint64_t friendRequestExpiresAt;
 @property (nonatomic, readonly) BOOL isFriendRequest;
 // ========

SignalServiceKit/src/Messages/Interactions/TSMessage.m

@@ -443,8 +443,8 @@ static const NSUInteger OWSMessageSchemaVersion = 4;
 
 - (void)saveFriendRequestStatus:(TSMessageFriendRequestStatus)friendRequestStatus withTransaction:(YapDatabaseReadWriteTransaction *_Nullable)transaction
 {
-    OWSLogInfo(@"[Loki] Setting message friend request status to %d.", friendRequestStatus);
     self.friendRequestStatus = friendRequestStatus;
+    OWSLogInfo(@"[Loki] Setting message friend request status to %@.", self.friendRequestStatusDescription);
     void (^postNotification)() = ^() {
         [NSNotificationCenter.defaultCenter postNotificationName:NSNotification.messageFriendRequestStatusChanged object:self.uniqueId];
     };
@@ -457,6 +457,17 @@ static const NSUInteger OWSMessageSchemaVersion = 4;
     }
 }
 
+- (NSString *)friendRequestStatusDescription
+{
+    switch (self.friendRequestStatus) {
+        case TSMessageFriendRequestStatusNone: return @"none";
+        case TSMessageFriendRequestStatusPending: return @"pending";
+        case TSMessageFriendRequestStatusAccepted: return @"accepted";
+        case TSMessageFriendRequestStatusDeclined: return @"declined";
+        case TSMessageFriendRequestStatusExpired: return @"expired";
+    }
+}
+
 - (void)saveFriendRequestExpiresAt:(u_int64_t)expiresAt withTransaction:(YapDatabaseReadWriteTransaction *_Nullable)transaction
 {
     self.friendRequestExpiresAt = expiresAt;