diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist
index 9d7c02e10..378a5f3ca 100644
--- a/Signal/Signal-Info.plist
+++ b/Signal/Signal-Info.plist
@@ -5,9 +5,9 @@
BuildDetails
CarthageVersion
- 0.34.0
+ 0.33.0
OSXVersion
- 10.15.2
+ 10.15.3
WebRTCCommit
1445d719bf05280270e9f77576f80f973fd847f8 M73
diff --git a/Signal/src/Loki/View Controllers/DeviceLinkingModal.swift b/Signal/src/Loki/View Controllers/DeviceLinkingModal.swift
index b4ba804f8..a2853b9da 100644
--- a/Signal/src/Loki/View Controllers/DeviceLinkingModal.swift
+++ b/Signal/src/Loki/View Controllers/DeviceLinkingModal.swift
@@ -165,9 +165,9 @@ final class DeviceLinkingModal : Modal, DeviceLinkingSessionDelegate {
let linkingAuthorizationMessage = DeviceLinkingUtilities.getLinkingAuthorizationMessage(for: deviceLink)
ThreadUtil.enqueue(linkingAuthorizationMessage)
SSKEnvironment.shared.messageSender.send(linkingAuthorizationMessage, success: {
- let _ = [SSKEnvironment.shared.syncManager.syncAllContacts(),
- SSKEnvironment.shared.syncManager.syncAllGroups(),
- SSKEnvironment.shared.syncManager.syncAllOpenGroups()]
+ SSKEnvironment.shared.syncManager.syncAllContacts()
+ SSKEnvironment.shared.syncManager.syncAllGroups()
+ SSKEnvironment.shared.syncManager.syncAllOpenGroups()
}) { _ in
print("[Loki] Failed to send device link authorization message.")
}
diff --git a/SignalMessaging/contacts/OWSSyncManager.m b/SignalMessaging/contacts/OWSSyncManager.m
index cc45632e3..c101ad773 100644
--- a/SignalMessaging/contacts/OWSSyncManager.m
+++ b/SignalMessaging/contacts/OWSSyncManager.m
@@ -17,7 +17,7 @@
#import
#import
#import
-#import
+#import
#import
#import
#import
@@ -369,15 +369,15 @@ NSString *const kSyncManagerLastContactSyncKey = @"kTSStorageManagerOWSSyncManag
- (AnyPromise *)syncAllOpenGroups
{
- OWSSyncOpenGroupsMessage *syncOpenGroupsMessage = [[OWSSyncOpenGroupsMessage alloc] init];
+ LKSyncOpenGroupsMessage *syncOpenGroupsMessage = [[LKSyncOpenGroupsMessage alloc] init];
AnyPromise *promise = [AnyPromise promiseWithResolverBlock:^(PMKResolver resolve) {
[self.messageSender sendMessage:syncOpenGroupsMessage
success:^{
- OWSLogInfo(@"Successfully sent open groups syn message.");
+ OWSLogInfo(@"Successfully sent open group sync message.");
resolve(@(1));
}
failure:^(NSError *error) {
- OWSLogError(@"Failed to send open group sync message with error: %@.", error);
+ OWSLogError(@"Failed to send open group sync message due to error: %@.", error);
resolve(error);
}];
}];
diff --git a/SignalServiceKit/protobuf/SignalService.proto b/SignalServiceKit/protobuf/SignalService.proto
index a0dfae957..3db6d5025 100644
--- a/SignalServiceKit/protobuf/SignalService.proto
+++ b/SignalServiceKit/protobuf/SignalService.proto
@@ -321,11 +321,11 @@ message SyncMessage {
optional AttachmentPointer blob = 1;
optional bytes data = 101; // Loki
}
-
+
// Loki
message OpenGroupDetails {
- optional string url = 1;
- optional uint64 channelId = 2;
+ optional string url = 1;
+ optional uint64 channelId = 2;
}
message Blocked {
diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncOpenGroupsMessage.h b/SignalServiceKit/src/Loki/Messaging/LKSyncOpenGroupsMessage.h
similarity index 80%
rename from SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncOpenGroupsMessage.h
rename to SignalServiceKit/src/Loki/Messaging/LKSyncOpenGroupsMessage.h
index 6a8fbe51a..0231ca47e 100644
--- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncOpenGroupsMessage.h
+++ b/SignalServiceKit/src/Loki/Messaging/LKSyncOpenGroupsMessage.h
@@ -4,7 +4,7 @@ NS_ASSUME_NONNULL_BEGIN
@class LKPublicChat;
-@interface OWSSyncOpenGroupsMessage : OWSOutgoingSyncMessage
+@interface LKSyncOpenGroupsMessage : OWSOutgoingSyncMessage
- (instancetype)init NS_DESIGNATED_INITIALIZER;
diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncOpenGroupsMessage.m b/SignalServiceKit/src/Loki/Messaging/LKSyncOpenGroupsMessage.m
similarity index 53%
rename from SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncOpenGroupsMessage.m
rename to SignalServiceKit/src/Loki/Messaging/LKSyncOpenGroupsMessage.m
index e5ae00d31..4df3ca9e3 100644
--- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncOpenGroupsMessage.m
+++ b/SignalServiceKit/src/Loki/Messaging/LKSyncOpenGroupsMessage.m
@@ -1,10 +1,10 @@
-#import "OWSSyncOpenGroupsMessage.h"
+#import "LKSyncOpenGroupsMessage.h"
#import "OWSPrimaryStorage.h"
#import
NS_ASSUME_NONNULL_BEGIN
-@implementation OWSSyncOpenGroupsMessage
+@implementation LKSyncOpenGroupsMessage
- (instancetype)init
{
@@ -19,26 +19,24 @@ NS_ASSUME_NONNULL_BEGIN
- (nullable SSKProtoSyncMessageBuilder *)syncMessageBuilder
{
NSError *error;
- NSMutableArray *sessionOpenGroups = @[].mutableCopy;
+ NSMutableArray *openGroups = @[].mutableCopy;
__block NSDictionary *publicChats;
[OWSPrimaryStorage.sharedManager.dbReadConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
publicChats = [LKDatabaseUtilities getAllPublicChats:transaction];
}];
for (LKPublicChat *openGroup in publicChats.allValues) {
- SSKProtoSyncMessageOpenGroupsBuilder *openGroupBuilder = [SSKProtoSyncMessageOpenGroups builder];
- [openGroupBuilder setUrl:openGroup.server];
- [openGroupBuilder setChannel:openGroup.channel];
- SSKProtoSyncMessageOpenGroups *_Nullable openGroupProto = [openGroupBuilder buildAndReturnError:&error];
- if (error || !openGroupProto) {
- OWSFailDebug(@"could not build protobuf: %@", error);
+ SSKProtoSyncMessageOpenGroupsBuilder *openGroupMessageBuilder = [SSKProtoSyncMessageOpenGroups builder];
+ [openGroupMessageBuilder setUrl:openGroup.server];
+ [openGroupMessageBuilder setChannel:openGroup.channel];
+ SSKProtoSyncMessageOpenGroups *_Nullable openGroupMessageProto = [openGroupMessageBuilder buildAndReturnError:&error];
+ if (error || !openGroupMessageProto) {
+ OWSFailDebug(@"Couldn't build protobuf due to error: %@", error);
return nil;
}
- [sessionOpenGroups addObject:openGroupProto];
+ [openGroups addObject:openGroupMessageProto];
}
-
SSKProtoSyncMessageBuilder *syncMessageBuilder = [SSKProtoSyncMessage builder];
- [syncMessageBuilder setOpenGroups:sessionOpenGroups];
-
+ [syncMessageBuilder setOpenGroups:openGroups];
return syncMessageBuilder;
}