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

use master public key instead of user public key when adding self as a member and an admin

Browse source
This commit is contained in:
Ryan ZHAO 2020-02-18 14:01:48 +11:00
parent b206f2944e
commit a245595bc5
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Signal/src/Loki/View Controllers/NewClosedGroupVC.swift
View file

@ -168,11 +168,14 @@ final class NewClosedGroupVC : UIViewController, UITableViewDataSource, UITableV
return showError(title: NSLocalizedString("A closed group cannot have more than 10 members", comment: ""))
}
let userHexEncodedPublicKey = getUserHexEncodedPublicKey()
let members = [String](selectedContacts) + [ userHexEncodedPublicKey ]
var admins: [String]!
OWSPrimaryStorage.shared().dbReadConnection.readWrite { transaction in
admins = Array(LokiDatabaseUtilities.getLinkedDeviceHexEncodedPublicKeys(for: userHexEncodedPublicKey, in: transaction))
let storage = OWSPrimaryStorage.shared()
var masterHexEncodedPublicKey = ""
storage.dbReadConnection.readWrite { transaction in
masterHexEncodedPublicKey = storage.getMasterHexEncodedPublicKey(for: userHexEncodedPublicKey, in: transaction) ?? userHexEncodedPublicKey
}
let members = [String](selectedContacts) + [ masterHexEncodedPublicKey ]
let admins = [ masterHexEncodedPublicKey ]
let groupID = LKGroupUtilities.getEncodedClosedGroupIDAsData(Randomness.generateRandomBytes(kGroupIdLength)!.toHexString())
let group = TSGroupModel(title: name, memberIds: members, image: nil, groupId: groupID, groupType: .closedGroup, adminIds: admins)
let thread = TSGroupThread.getOrCreateThread(with: group)