oxen-io/session-ios
1
0
Fork 0
mirror of https://github.com/oxen-io/session-ios.git synced 2023-12-13 21:30:14 +01:00
Code Issues Projects Releases Wiki Activity

Clean

Browse source
This commit is contained in:
nielsandriesse 2020-07-10 09:03:54 +10:00
parent aa7bb0ea5c
commit 563a148b93
3 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
SignalServiceKit/src/Loki/Protocol/Closed Groups/ClosedGroupsProtocol.swift
View file

@ -385,6 +385,7 @@ public final class ClosedGroupsProtocol : NSObject {
return result
}
/// - Note: Deprecated.
@objc(shouldIgnoreClosedGroupUpdateMessage:inThread:wrappedIn:)
public static func shouldIgnoreClosedGroupUpdateMessage(_ dataMessage: SSKProtoDataMessage, in thread: TSGroupThread, wrappedIn envelope: SSKProtoEnvelope) -> Bool {
guard thread.groupModel.groupType == .closedGroup else { return true }

3
SignalServiceKit/src/Loki/Protocol/Sync Messages/SyncMessagesProtocol.swift
View file

@ -175,6 +175,7 @@ public final class SyncMessagesProtocol : NSObject {
SessionMetaProtocol.updateProfileKeyIfNeeded(for: userMasterPublicKey, using: dataMessage)
}
/// - Note: Deprecated.
@objc(handleClosedGroupUpdateSyncMessageIfNeeded:wrappedIn:transaction:)
public static func handleClosedGroupUpdateSyncMessageIfNeeded(_ transcript: OWSIncomingSentMessageTranscript, wrappedIn envelope: SSKProtoEnvelope, using transaction: YapDatabaseReadWriteTransaction) {
// Check preconditions
@ -199,6 +200,7 @@ public final class SyncMessagesProtocol : NSObject {
infoMessage.save(with: transaction)
}
/// - Note: Deprecated.
@objc(handleClosedGroupQuitSyncMessageIfNeeded:wrappedIn:transaction:)
public static func handleClosedGroupQuitSyncMessageIfNeeded(_ transcript: OWSIncomingSentMessageTranscript, wrappedIn envelope: SSKProtoEnvelope, using transaction: YapDatabaseReadWriteTransaction) {
// Check preconditions
@ -259,6 +261,7 @@ public final class SyncMessagesProtocol : NSObject {
}
}
/// - Note: Deprecated.
@objc(handleClosedGroupSyncMessageIfNeeded:wrappedIn:transaction:)
public static func handleClosedGroupSyncMessageIfNeeded(_ syncMessage: SSKProtoSyncMessage, wrappedIn envelope: SSKProtoEnvelope, using transaction: YapDatabaseReadWriteTransaction) {
let publicKey = envelope.source! // Set during UD decryption

23
SignalServiceKit/src/Messages/OWSMessageManager.m
View file

@ -102,7 +102,7 @@ NS_ASSUME_NONNULL_BEGIN
[NSNotificationCenter.defaultCenter removeObserver:self];
}
#pragma mark - Dependencies
#pragma mark -
- (id<OWSCallMessageHandler>)callMessageHandler
{
@ -208,7 +208,7 @@ NS_ASSUME_NONNULL_BEGIN
}
}
#pragma mark - Blocking
#pragma mark -
- (BOOL)isEnvelopeSenderBlocked:(SSKProtoEnvelope *)envelope
{
@ -234,7 +234,7 @@ NS_ASSUME_NONNULL_BEGIN
}
}
#pragma mark - message handling
#pragma mark -
- (void)throws_processEnvelope:(SSKProtoEnvelope *)envelope
plaintextData:(NSData *_Nullable)plaintextData
@ -435,7 +435,7 @@ NS_ASSUME_NONNULL_BEGIN
}
OWSLogInfo(@"Handling content: <Content: %@>.", [self descriptionForContent:contentProto]);
// Loki: Ignore friend requests from before restoration
// Loki: Ignore friend requests from before restoration (deprecated)
if ([LKFriendRequestProtocol isFriendRequestFromBeforeRestoration:envelope]) {
[LKLogger print:@"[Loki] Ignoring friend request from before restoration."];
return;
@ -455,12 +455,12 @@ NS_ASSUME_NONNULL_BEGIN
return;
}
// Loki: Handle session restoration request if needed
// Loki: Handle session restoration request if needed (deprecated)
if ([LKSessionManagementProtocol isSessionRestorationRequest:contentProto.dataMessage]) {
return;
}
// Loki: Handle friend request acceptance if needed
// Loki: Handle friend request acceptance if needed (deprecated)
[LKFriendRequestProtocol handleFriendRequestAcceptanceIfNeeded:envelope in:transaction];
// Loki: Handle device linking message if needed
@ -594,6 +594,7 @@ NS_ASSUME_NONNULL_BEGIN
}
}
// Loki: Handle SSK logic if needed
[LKClosedGroupsProtocol handleSharedSenderKeysUpdateIfNeeded:dataMessage from:envelope.source transaction:transaction];
if (dataMessage.group) {
@ -1004,10 +1005,10 @@ NS_ASSUME_NONNULL_BEGIN
];
} else {
if (transcript.isGroupUpdate) {
// Loki: Handle closed group updated sync message
// Loki: Handle closed group updated sync message (deprecated)
[LKSyncMessagesProtocol handleClosedGroupUpdateSyncMessageIfNeeded:transcript wrappedIn:envelope transaction:transaction];
} else if (transcript.isGroupQuit) {
// Loki: Handle closed group quit sync message
// Loki: Handle closed group quit sync message (deprecated)
[LKSyncMessagesProtocol handleClosedGroupQuitSyncMessageIfNeeded:transcript wrappedIn:envelope transaction:transaction];
} else {
[OWSRecordTranscriptJob
@ -1060,7 +1061,7 @@ NS_ASSUME_NONNULL_BEGIN
// Loki: Handle contact sync message
[LKSyncMessagesProtocol handleContactSyncMessageIfNeeded:syncMessage wrappedIn:envelope transaction:transaction];
} else if (syncMessage.groups != nil) {
// Loki: Handle closed groups sync message
// Loki: Handle closed groups sync message (deprecated)
[LKSyncMessagesProtocol handleClosedGroupSyncMessageIfNeeded:syncMessage wrappedIn:envelope transaction:transaction];
} else if (syncMessage.openGroups != nil) {
// Loki: Handle open group sync message
@ -1368,7 +1369,7 @@ NS_ASSUME_NONNULL_BEGIN
switch (dataMessage.group.type) {
case SSKProtoGroupContextTypeUpdate: {
// Loki: Ignore updates from non-admins
// Loki: Ignore updates from non-admins (deprecated)
if (oldGroupThread != nil && [LKClosedGroupsProtocol shouldIgnoreClosedGroupUpdateMessage:dataMessage inThread:oldGroupThread wrappedIn:envelope]) {
return nil;
}
@ -1596,7 +1597,7 @@ NS_ASSUME_NONNULL_BEGIN
[incomingMessage.attachmentIds addObject:pointer.uniqueId];
}
// Loki: Handle friend request if needed
// Loki: Handle friend request if needed (deprecated)
[LKFriendRequestProtocol handleFriendRequestMessageIfNeededFromEnvelope:envelope using:transaction];
// Loki: Ignore empty data messages