keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Clean

Browse Source
pull/341/head
Niels Andriesse 3 years ago
parent fde7e86888
commit b7160cbb11
5 changed files with 63 additions and 63 deletions
Show Stats Download Patch File Download Diff File

66
SessionMessagingKit/Messages/Control Messages/ClosedGroupControlMessage.swift
Unescape Escape View File

@ -18,9 +18,9 @@ public final class ClosedGroupControlMessage : ControlMessage {
case update(name: String, members: [Data])
case encryptionKeyPair([KeyPairWrapper]) // The new encryption key pair encrypted for each member individually
case nameChange(name: String)
case usersAdded(members: [Data])
case usersRemoved(members: [Data])
case userLeft
case membersAdded(members: [Data])
case membersRemoved(members: [Data])
case memberLeft
public var description: String {
switch self {
@ -28,9 +28,9 @@ public final class ClosedGroupControlMessage : ControlMessage {
case .update: return "update"
case .encryptionKeyPair: return "encryptionKeyPair"
case .nameChange: return "nameChange"
case .usersAdded: return "usersAdded"
case .usersRemoved: return "usersRemoved"
case .userLeft: return "userLeft"
case .membersAdded: return "membersAdded"
case .membersRemoved: return "membersRemoved"
case .memberLeft: return "memberLeft"
}
}
}
@ -93,9 +93,9 @@ public final class ClosedGroupControlMessage : ControlMessage {
return !name.isEmpty
case .encryptionKeyPair: return true
case .nameChange(let name): return !name.isEmpty
case .usersAdded(let members): return !members.isEmpty
case .usersRemoved(let members): return !members.isEmpty
case .userLeft: return true
case .membersAdded(let members): return !members.isEmpty
case .membersRemoved(let members): return !members.isEmpty
case .memberLeft: return true
}
}
@ -121,14 +121,14 @@ public final class ClosedGroupControlMessage : ControlMessage {
case "nameChange":
guard let name = coder.decodeObject(forKey: "name") as? String else { return nil }
self.kind = .nameChange(name: name)
case "usersAdded":
case "membersAdded":
guard let members = coder.decodeObject(forKey: "members") as? [Data] else { return nil }
self.kind = .usersAdded(members: members)
case "usersRemoved":
self.kind = .membersAdded(members: members)
case "membersRemoved":
guard let members = coder.decodeObject(forKey: "members") as? [Data] else { return nil }
self.kind = .usersRemoved(members: members)
case "userLeft":
self.kind = .userLeft
self.kind = .membersRemoved(members: members)
case "memberLeft":
self.kind = .memberLeft
default: return nil
}
}
@ -154,14 +154,14 @@ public final class ClosedGroupControlMessage : ControlMessage {
case .nameChange(let name):
coder.encode("nameChange", forKey: "kind")
coder.encode(name, forKey: "name")
case .usersAdded(let members):
coder.encode("usersAdded", forKey: "kind")
case .membersAdded(let members):
coder.encode("membersAdded", forKey: "kind")
coder.encode(members, forKey: "members")
case .usersRemoved(let members):
coder.encode("usersRemoved", forKey: "kind")
case .membersRemoved(let members):
coder.encode("membersRemoved", forKey: "kind")
coder.encode(members, forKey: "members")
case .userLeft:
coder.encode("userLeft", forKey: "kind")
case .memberLeft:
coder.encode("memberLeft", forKey: "kind")
}
}
@ -190,12 +190,12 @@ public final class ClosedGroupControlMessage : ControlMessage {
case .nameChange:
guard let name = closedGroupControlMessageProto.name else { return nil }
kind = .nameChange(name: name)
case .usersAdded:
kind = .usersAdded(members: closedGroupControlMessageProto.members)
case .usersRemoved:
kind = .usersRemoved(members: closedGroupControlMessageProto.members)
case .userLeft:
kind = .userLeft
case .membersAdded:
kind = .membersAdded(members: closedGroupControlMessageProto.members)
case .membersRemoved:
kind = .membersRemoved(members: closedGroupControlMessageProto.members)
case .memberLeft:
kind = .memberLeft
}
return ClosedGroupControlMessage(kind: kind)
}
@ -231,14 +231,14 @@ public final class ClosedGroupControlMessage : ControlMessage {
case .nameChange(let name):
closedGroupControlMessage = SNProtoDataMessageClosedGroupControlMessage.builder(type: .nameChange)
closedGroupControlMessage.setName(name)
case .usersAdded(let members):
closedGroupControlMessage = SNProtoDataMessageClosedGroupControlMessage.builder(type: .usersAdded)
case .membersAdded(let members):
closedGroupControlMessage = SNProtoDataMessageClosedGroupControlMessage.builder(type: .membersAdded)
closedGroupControlMessage.setMembers(members)
case .usersRemoved(let members):
closedGroupControlMessage = SNProtoDataMessageClosedGroupControlMessage.builder(type: .usersRemoved)
case .membersRemoved(let members):
closedGroupControlMessage = SNProtoDataMessageClosedGroupControlMessage.builder(type: .membersRemoved)
closedGroupControlMessage.setMembers(members)
case .userLeft:
closedGroupControlMessage = SNProtoDataMessageClosedGroupControlMessage.builder(type: .userLeft)
case .memberLeft:
closedGroupControlMessage = SNProtoDataMessageClosedGroupControlMessage.builder(type: .memberLeft)
}
let contentProto = SNProtoContent.builder()
let dataMessageProto = SNProtoDataMessage.builder()

18
SessionMessagingKit/Protos/Generated/SNProto.swift
Unescape Escape View File

@ -2407,9 +2407,9 @@ extension SNProtoDataMessageClosedGroupControlMessageKeyPairWrapper.SNProtoDataM
case update = 2
case encryptionKeyPair = 3
case nameChange = 4
case usersAdded = 5
case usersRemoved = 6
case userLeft = 7
case membersAdded = 5
case membersRemoved = 6
case memberLeft = 7
}
private class func SNProtoDataMessageClosedGroupControlMessageTypeWrap(_ value: SessionProtos_DataMessage.ClosedGroupControlMessage.TypeEnum) -> SNProtoDataMessageClosedGroupControlMessageType {
@ -2418,9 +2418,9 @@ extension SNProtoDataMessageClosedGroupControlMessageKeyPairWrapper.SNProtoDataM
case .update: return .update
case .encryptionKeyPair: return .encryptionKeyPair
case .nameChange: return .nameChange
case .usersAdded: return .usersAdded
case .usersRemoved: return .usersRemoved
case .userLeft: return .userLeft
case .membersAdded: return .membersAdded
case .membersRemoved: return .membersRemoved
case .memberLeft: return .memberLeft
}
}
@ -2430,9 +2430,9 @@ extension SNProtoDataMessageClosedGroupControlMessageKeyPairWrapper.SNProtoDataM
case .update: return .update
case .encryptionKeyPair: return .encryptionKeyPair
case .nameChange: return .nameChange
case .usersAdded: return .usersAdded
case .usersRemoved: return .usersRemoved
case .userLeft: return .userLeft
case .membersAdded: return .membersAdded
case .membersRemoved: return .membersRemoved
case .memberLeft: return .memberLeft
}
}

24
SessionMessagingKit/Protos/Generated/SessionProtos.pb.swift
Unescape Escape View File

@ -1104,11 +1104,11 @@ struct SessionProtos_DataMessage {
case nameChange // = 4
/// members
case usersAdded // = 5
case membersAdded // = 5
/// members
case usersRemoved // = 6
case userLeft // = 7
case membersRemoved // = 6
case memberLeft // = 7
init() {
self = .new
@ -1120,9 +1120,9 @@ struct SessionProtos_DataMessage {
case 2: self = .update
case 3: self = .encryptionKeyPair
case 4: self = .nameChange
case 5: self = .usersAdded
case 6: self = .usersRemoved
case 7: self = .userLeft
case 5: self = .membersAdded
case 6: self = .membersRemoved
case 7: self = .memberLeft
default: return nil
}
}
@ -1133,9 +1133,9 @@ struct SessionProtos_DataMessage {
case .update: return 2
case .encryptionKeyPair: return 3
case .nameChange: return 4
case .usersAdded: return 5
case .usersRemoved: return 6
case .userLeft: return 7
case .membersAdded: return 5
case .membersRemoved: return 6
case .memberLeft: return 7
}
}
@ -3094,9 +3094,9 @@ extension SessionProtos_DataMessage.ClosedGroupControlMessage.TypeEnum: SwiftPro
2: .same(proto: "UPDATE"),
3: .same(proto: "ENCRYPTION_KEY_PAIR"),
4: .same(proto: "NAME_CHANGE"),
5: .same(proto: "USERS_ADDED"),
6: .same(proto: "USERS_REMOVED"),
7: .same(proto: "USER_LEFT"),
5: .same(proto: "MEMBERS_ADDED"),
6: .same(proto: "MEMBERS_REMOVED"),
7: .same(proto: "MEMBER_LEFT"),
]
}

6
SessionMessagingKit/Protos/SessionProtos.proto
Unescape Escape View File

@ -166,9 +166,9 @@ message DataMessage {
UPDATE = 2; // name, members
ENCRYPTION_KEY_PAIR = 3; // wrappers
NAME_CHANGE = 4; // name
USERS_ADDED = 5; // members
USERS_REMOVED = 6; // members
USER_LEFT = 7;
MEMBERS_ADDED = 5; // members
MEMBERS_REMOVED = 6; // members
MEMBER_LEFT = 7;
}
message KeyPair {

12
SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift
Unescape Escape View File

@ -232,9 +232,9 @@ extension MessageReceiver {
case .update: handleClosedGroupUpdated(message, using: transaction) // Deprecated
case .encryptionKeyPair: handleClosedGroupEncryptionKeyPair(message, using: transaction)
case .nameChange: handleClosedGroupNameChanged(message, using: transaction)
case .usersAdded: handleClosedGroupMembersAdded(message, using: transaction)
case .usersRemoved: handleClosedGroupMembersRemoved(message, using: transaction)
case .userLeft: handleClosedGroupMemberLeft(message, using: transaction)
case .membersAdded: handleClosedGroupMembersAdded(message, using: transaction)
case .membersRemoved: handleClosedGroupMembersRemoved(message, using: transaction)
case .memberLeft: handleClosedGroupMemberLeft(message, using: transaction)
}
}
@ -326,7 +326,7 @@ extension MessageReceiver {
}
private static func handleClosedGroupMembersAdded(_ message: ClosedGroupControlMessage, using transaction: Any) {
guard case let .usersAdded(membersAsData) = message.kind else { return }
guard case let .membersAdded(membersAsData) = message.kind else { return }
let transaction = transaction as! YapDatabaseReadWriteTransaction
let members = membersAsData.map { $0.toHexString() }
performIfValid(for: message, using: transaction) { groupID, thread, group in
@ -342,7 +342,7 @@ extension MessageReceiver {
}
private static func handleClosedGroupMembersRemoved(_ message: ClosedGroupControlMessage, using transaction: Any) {
guard case let .usersRemoved(membersAsData) = message.kind else { return }
guard case let .membersRemoved(membersAsData) = message.kind else { return }
let transaction = transaction as! YapDatabaseReadWriteTransaction
let members = membersAsData.map { $0.toHexString() }
guard let groupPublicKey = message.groupPublicKey else { return }
@ -384,7 +384,7 @@ extension MessageReceiver {
}
private static func handleClosedGroupMemberLeft(_ message: ClosedGroupControlMessage, using transaction: Any) {
guard case .userLeft = message.kind else { return }
guard case .memberLeft = message.kind else { return }
let transaction = transaction as! YapDatabaseReadWriteTransaction
guard let groupPublicKey = message.groupPublicKey else { return }
performIfValid(for: message, using: transaction) { groupID, thread, group in

Write Preview
Loading…
Cancel
Save