|
|
|
@ -9,6 +9,7 @@ import PromiseKit
|
|
|
|
// • Document the expected cases for everything.
|
|
|
|
// • Document the expected cases for everything.
|
|
|
|
// • Express those cases in tests.
|
|
|
|
// • Express those cases in tests.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/// See [The Session Friend Request Protocol](https://github.com/loki-project/session-protocol-docs/wiki/Friend-Requests) for more information.
|
|
|
|
@objc(LKFriendRequestProtocol)
|
|
|
|
@objc(LKFriendRequestProtocol)
|
|
|
|
public final class FriendRequestProtocol : NSObject {
|
|
|
|
public final class FriendRequestProtocol : NSObject {
|
|
|
|
|
|
|
|
|
|
|
|
@ -20,11 +21,11 @@ public final class FriendRequestProtocol : NSObject {
|
|
|
|
// Accept all outstanding friend requests associated with this user and try to establish sessions with the
|
|
|
|
// Accept all outstanding friend requests associated with this user and try to establish sessions with the
|
|
|
|
// subset of their devices that haven't sent a friend request.
|
|
|
|
// subset of their devices that haven't sent a friend request.
|
|
|
|
let senderID = friendRequest.authorId
|
|
|
|
let senderID = friendRequest.authorId
|
|
|
|
let linkedDeviceThreads = LokiDatabaseUtilities.getLinkedDeviceThreads(for: senderID, in: transaction)
|
|
|
|
let linkedDeviceThreads = LokiDatabaseUtilities.getLinkedDeviceThreads(for: senderID, in: transaction) // This doesn't create new threads if they don't exist yet
|
|
|
|
for thread in linkedDeviceThreads {
|
|
|
|
for thread in linkedDeviceThreads {
|
|
|
|
if thread.hasPendingFriendRequest {
|
|
|
|
if thread.hasPendingFriendRequest {
|
|
|
|
// TODO: The Obj-C implementation was actually sending this to self.thread. I'm assuming that's not what we meant.
|
|
|
|
sendFriendRequestAcceptanceMessage(to: thread.contactIdentifier(), in: thread, using: transaction) // NOT senderID
|
|
|
|
sendFriendRequestAcceptanceMessage(to: senderID, in: thread, using: transaction)
|
|
|
|
thread.saveFriendRequestStatus(.friends, with: transaction)
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
let autoGeneratedFRMessageSend = MultiDeviceProtocol.getAutoGeneratedMultiDeviceFRMessageSend(for: senderID, in: transaction)
|
|
|
|
let autoGeneratedFRMessageSend = MultiDeviceProtocol.getAutoGeneratedMultiDeviceFRMessageSend(for: senderID, in: transaction)
|
|
|
|
OWSDispatch.sendingQueue().async {
|
|
|
|
OWSDispatch.sendingQueue().async {
|
|
|
|
@ -33,7 +34,6 @@ public final class FriendRequestProtocol : NSObject {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
thread.saveFriendRequestStatus(.friends, with: transaction)
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@objc(sendFriendRequestAcceptanceMessageToHexEncodedPublicKey:in:using:)
|
|
|
|
@objc(sendFriendRequestAcceptanceMessageToHexEncodedPublicKey:in:using:)
|
|
|
|
@ -46,7 +46,8 @@ public final class FriendRequestProtocol : NSObject {
|
|
|
|
@objc(declineFriendRequest:in:using:)
|
|
|
|
@objc(declineFriendRequest:in:using:)
|
|
|
|
public static func declineFriendRequest(_ friendRequest: TSIncomingMessage, in thread: TSThread, using transaction: YapDatabaseReadWriteTransaction) {
|
|
|
|
public static func declineFriendRequest(_ friendRequest: TSIncomingMessage, in thread: TSThread, using transaction: YapDatabaseReadWriteTransaction) {
|
|
|
|
thread.saveFriendRequestStatus(.none, with: transaction)
|
|
|
|
thread.saveFriendRequestStatus(.none, with: transaction)
|
|
|
|
// Delete pre keys
|
|
|
|
// Delete the pre key bundle for the given contact. This ensures that if we send a
|
|
|
|
|
|
|
|
// new message after this, it restarts the friend request process from scratch.
|
|
|
|
let senderID = friendRequest.authorId
|
|
|
|
let senderID = friendRequest.authorId
|
|
|
|
storage.removePreKeyBundle(forContact: senderID, transaction: transaction)
|
|
|
|
storage.removePreKeyBundle(forContact: senderID, transaction: transaction)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -65,7 +66,7 @@ public final class FriendRequestProtocol : NSObject {
|
|
|
|
// This can happen if Alice sent Bob a friend request, Bob declined, but then Bob changed his
|
|
|
|
// This can happen if Alice sent Bob a friend request, Bob declined, but then Bob changed his
|
|
|
|
// mind and sent a friend request to Alice. In this case we want Alice to auto-accept the request
|
|
|
|
// mind and sent a friend request to Alice. In this case we want Alice to auto-accept the request
|
|
|
|
// and send a friend request accepted message back to Bob. We don't check that sending the
|
|
|
|
// and send a friend request accepted message back to Bob. We don't check that sending the
|
|
|
|
// friend request accepted message succeeded. Even if it doesn't, the thread's current friend
|
|
|
|
// friend request accepted message succeeds. Even if it doesn't, the thread's current friend
|
|
|
|
// request status will be set to LKThreadFriendRequestStatusFriends for Alice making it possible
|
|
|
|
// request status will be set to LKThreadFriendRequestStatusFriends for Alice making it possible
|
|
|
|
// for Alice to send messages to Bob. When Bob receives a message, his thread's friend request status
|
|
|
|
// for Alice to send messages to Bob. When Bob receives a message, his thread's friend request status
|
|
|
|
// will then be set to LKThreadFriendRequestStatusFriends. If we do check for a successful send
|
|
|
|
// will then be set to LKThreadFriendRequestStatusFriends. If we do check for a successful send
|
|
|
|
@ -101,11 +102,13 @@ public final class FriendRequestProtocol : NSObject {
|
|
|
|
existingFriendRequestMessage.isFriendRequest {
|
|
|
|
existingFriendRequestMessage.isFriendRequest {
|
|
|
|
existingFriendRequestMessage.saveFriendRequestStatus(.accepted, with: transaction)
|
|
|
|
existingFriendRequestMessage.saveFriendRequestStatus(.accepted, with: transaction)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
// Send our P2P details
|
|
|
|
// Send our P2P details
|
|
|
|
if let addressMessage = LokiP2PAPI.onlineBroadcastMessage(forThread: thread) {
|
|
|
|
if let addressMessage = LokiP2PAPI.onlineBroadcastMessage(forThread: thread) {
|
|
|
|
let messageSenderJobQueue = SSKEnvironment.shared.messageSenderJobQueue
|
|
|
|
let messageSenderJobQueue = SSKEnvironment.shared.messageSenderJobQueue
|
|
|
|
messageSenderJobQueue.add(message: addressMessage, transaction: transaction)
|
|
|
|
messageSenderJobQueue.add(message: addressMessage, transaction: transaction)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
*/
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@objc(handleFriendRequestMessageIfNeeded:associatedWith:wrappedIn:in:using:)
|
|
|
|
@objc(handleFriendRequestMessageIfNeeded:associatedWith:wrappedIn:in:using:)
|
|
|
|
@ -146,8 +149,7 @@ public final class FriendRequestProtocol : NSObject {
|
|
|
|
let linkedDeviceThreads = LokiDatabaseUtilities.getLinkedDeviceThreads(for: hexEncodedPublicKey, in: transaction)
|
|
|
|
let linkedDeviceThreads = LokiDatabaseUtilities.getLinkedDeviceThreads(for: hexEncodedPublicKey, in: transaction)
|
|
|
|
for thread in linkedDeviceThreads {
|
|
|
|
for thread in linkedDeviceThreads {
|
|
|
|
thread.enumerateInteractions(with: transaction) { interaction, _ in
|
|
|
|
thread.enumerateInteractions(with: transaction) { interaction, _ in
|
|
|
|
guard let incomingMessage = interaction as? TSIncomingMessage,
|
|
|
|
guard let incomingMessage = interaction as? TSIncomingMessage, incomingMessage.friendRequestStatus != .none else { return }
|
|
|
|
incomingMessage.friendRequestStatus != .none else { return }
|
|
|
|
|
|
|
|
incomingMessage.saveFriendRequestStatus(.none, with: transaction)
|
|
|
|
incomingMessage.saveFriendRequestStatus(.none, with: transaction)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
nielsandriesse
4 years ago