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

Regenerate protos

Browse Source
pull/228/head
nielsandriesse 5 years ago
parent d096a2c574
commit 450c100896
15 changed files with 22 additions and 94 deletions
Show Stats Download Patch File Download Diff File

5
Signal/src/AppDelegate.m
Unescape Escape View File

@ -162,11 +162,6 @@ static NSTimeInterval launchStartedAt;
return AppEnvironment.shared.legacyNotificationActionHandler;
}
- (LKFriendRequestExpirationJob *)lokiFriendRequestExpirationJob
{
return SSKEnvironment.shared.lokiFriendRequestExpirationJob;
}
#pragma mark -
- (void)applicationDidEnterBackground:(UIApplication *)application

2
Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.h
Unescape Escape View File

@ -5,14 +5,12 @@
#import "ConversationViewCell.h"
@class OWSMessageBubbleView;
@protocol LKFriendRequestViewDelegate;
NS_ASSUME_NONNULL_BEGIN
@interface OWSMessageCell : ConversationViewCell
@property (nonatomic, readonly) OWSMessageBubbleView *messageBubbleView;
@property (nonatomic, nullable, weak) id<LKFriendRequestViewDelegate> friendRequestViewDelegate;
+ (NSString *)cellReuseIdentifier;

1
Signal/src/ViewControllers/ConversationView/ConversationViewController.m
Unescape Escape View File

@ -4736,7 +4736,6 @@ typedef enum : NSUInteger {
if ([cell isKindOfClass:[OWSMessageCell class]]) {
OWSMessageCell *messageCell = (OWSMessageCell *)cell;
messageCell.messageBubbleView.delegate = self;
messageCell.friendRequestViewDelegate = self;
}
cell.conversationStyle = self.conversationStyle;

6
SignalServiceKit/protobuf/SignalService.proto
Unescape Escape View File

@ -23,7 +23,7 @@ message Envelope {
RECEIPT = 5;
UNIDENTIFIED_SENDER = 6;
CLOSED_GROUP_CIPHERTEXT = 7; // Loki
FRIEND_REQUEST = 101; // Loki: Contains pre keys and a message; uses simple encryption
FALLBACK_MESSAGE = 101; // Loki: Encrypted using the fallback session cipher. Contains a pre key bundle if it's a session request.
}
// @required
@ -137,9 +137,7 @@ message DataMessage {
END_SESSION = 1;
EXPIRATION_TIMER_UPDATE = 2;
PROFILE_KEY_UPDATE = 4;
SESSION_RESTORE = 64;
UNLINK_DEVICE = 128;
SESSION_REQUEST = 256;
}
message Quote {
@ -247,7 +245,7 @@ message DataMessage {
INFO = 1; // groupPublicKey, name, senderKeys, members, admins
SENDER_KEY_REQUEST = 2; // groupPublicKey
SENDER_KEY = 3; // groupPublicKey, senderKeys
}
message SenderKey {

15
SignalServiceKit/src/Loki/Database/Deprecated/OWSPrimaryStorage+Loki.h
Unescape Escape View File

@ -8,21 +8,6 @@
NS_ASSUME_NONNULL_BEGIN
typedef NS_ENUM(NSInteger, LKFriendRequestStatus) {
/// New conversation; no messages sent or received.
LKFriendRequestStatusNone,
/// This state is used to lock the input early while sending.
LKFriendRequestStatusRequestSending,
/// Friend request sent; awaiting response.
LKFriendRequestStatusRequestSent,
/// Friend request received; awaiting user input.
LKFriendRequestStatusRequestReceived,
/// We're friends with the other user.
LKFriendRequestStatusFriends,
/// A friend request was sent, but it timed out (i.e. the other user didn't accept within the allocated time).
LKFriendRequestStatusRequestExpired
};
@interface OWSPrimaryStorage (Loki)
# pragma mark - Pre Key Record Management

6
SignalServiceKit/src/Loki/Protocol/Session Management/SessionRequestMessage.swift
Unescape Escape View File

@ -21,12 +21,6 @@ internal final class SessionRequestMessage : TSOutgoingMessage {
try super.init(dictionary: dictionary)
}
@objc internal override func dataMessageBuilder() -> Any? {
guard let builder = super.dataMessageBuilder() as? SSKProtoDataMessage.SSKProtoDataMessageBuilder else { return nil }
builder.setFlags(UInt32(SSKProtoDataMessage.SSKProtoDataMessageFlags.sessionRequest.rawValue))
return builder
}
override func prepareCustomContentBuilder(_ recipient: SignalRecipient) -> Any? {
guard let contentBuilder = super.prepareCustomContentBuilder(recipient) as? SSKProtoContent.SSKProtoContentBuilder else { return nil }
// Attach a null message

14
SignalServiceKit/src/Messages/Interactions/TSMessage.h
Unescape Escape View File

@ -17,16 +17,6 @@ NS_ASSUME_NONNULL_BEGIN
@class TSQuotedMessage;
@class YapDatabaseReadWriteTransaction;
typedef NS_ENUM(NSInteger, LKMessageFriendRequestStatus) {
LKMessageFriendRequestStatusNone,
LKMessageFriendRequestStatusSendingOrFailed,
/// Either sent or received.
LKMessageFriendRequestStatusPending,
LKMessageFriendRequestStatusAccepted,
LKMessageFriendRequestStatusDeclined,
LKMessageFriendRequestStatusExpired
} __deprecated_enum_msg("no longer used as of version 1.1.2");
@interface TSMessage : TSInteraction <OWSPreviewText>
@property (nonatomic, readonly) NSMutableArray<NSString *> *attachmentIds;
@ -85,10 +75,6 @@ typedef NS_ENUM(NSInteger, LKMessageFriendRequestStatus) {
- (void)updateWithLinkPreview:(OWSLinkPreview *)linkPreview transaction:(YapDatabaseReadWriteTransaction *)transaction;
#pragma mark - Loki Friend Request Handling
- (void)saveFriendRequestExpiresAt:(u_int64_t)expiresAt withTransaction:(YapDatabaseReadWriteTransaction *_Nullable)transaction;
#pragma mark - Open Groups
- (void)saveOpenGroupServerMessageID:(uint64_t)serverMessageID in:(YapDatabaseReadWriteTransaction *_Nullable)transaction;

16
SignalServiceKit/src/Messages/OWSMessageDecrypter.m
Unescape Escape View File

@ -215,9 +215,9 @@ NSError *EnsureDecryptError(NSError *_Nullable error, NSString *fallbackErrorDes
}
switch (envelope.type) {
case SSKProtoEnvelopeTypeFriendRequest: {
case SSKProtoEnvelopeTypeFallbackMessage: {
[LKStorage writeSyncWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
[self decryptFriendRequestMessage:envelope
[self decryptFallbackMessage:envelope
envelopeData:envelopeData
successBlock:^(OWSMessageDecryptResult *result) {
OWSLogDebug(@"Decrypted friend request message.");
@ -318,10 +318,10 @@ NSError *EnsureDecryptError(NSError *_Nullable error, NSString *fallbackErrorDes
failureBlock();
}
- (void)decryptFriendRequestMessage:(SSKProtoEnvelope *)envelope
envelopeData:(NSData *)envelopeData
successBlock:(void (^)(OWSMessageDecryptResult *result))successBlock
failureBlock:(void (^)(NSError *_Nullable error))failureBlock
- (void)decryptFallbackMessage:(SSKProtoEnvelope *)envelope
envelopeData:(NSData *)envelopeData
successBlock:(void (^)(OWSMessageDecryptResult *result))successBlock
failureBlock:(void (^)(NSError *_Nullable error))failureBlock
{
OWSAssertDebug(envelope);
OWSAssertDebug(envelopeData);
@ -341,7 +341,7 @@ NSError *EnsureDecryptError(NSError *_Nullable error, NSString *fallbackErrorDes
NSData *_Nullable plaintextData = [[cipher decrypt:encryptedData] removePadding];
if (!plaintextData) {
NSString *errorString = [NSString stringWithFormat:@"Failed to decrypt friend request message from: %@.", recipientId];
NSString *errorString = [NSString stringWithFormat:@"Failed to decrypt fallback message from: %@.", recipientId];
NSError *error = OWSErrorWithCodeDescription(OWSErrorCodeFailedToDecryptMessage, errorString);
return failureBlock(error);
}
@ -610,7 +610,7 @@ NSError *EnsureDecryptError(NSError *_Nullable error, NSString *fallbackErrorDes
[envelopeBuilder setSource:source];
[envelopeBuilder setSourceDevice:(uint32_t)sourceDeviceId];
if (decryptResult.messageType == SMKMessageTypeLokiFriendRequest) {
[envelopeBuilder setType:SSKProtoEnvelopeTypeFriendRequest];
[envelopeBuilder setType:SSKProtoEnvelopeTypeFallbackMessage];
OWSLogInfo(@"SMKMessageTypeLokiFriendRequest");
}
NSError *envelopeBuilderError;

4
SignalServiceKit/src/Messages/OWSMessageHandler.m
Unescape Escape View File

@ -36,8 +36,8 @@ NSString *envelopeAddress(SSKProtoEnvelope *envelope)
return @"PreKeyEncryptedMessage";
case SSKProtoEnvelopeTypeUnidentifiedSender:
return @"UnidentifiedSender";
case SSKProtoEnvelopeTypeFriendRequest:
return @"LokiFriendRequest";
case SSKProtoEnvelopeTypeFallbackMessage:
return @"FallbackMessage";
case SSKProtoEnvelopeTypeClosedGroupCiphertext:
return @"ClosedGroupCiphertext";
default:

2
SignalServiceKit/src/Messages/OWSMessageManager.m
Unescape Escape View File

@ -271,7 +271,7 @@ NS_ASSUME_NONNULL_BEGIN
[self checkForUnknownLinkedDevice:envelope transaction:transaction];
switch (envelope.type) {
case SSKProtoEnvelopeTypeFriendRequest:
case SSKProtoEnvelopeTypeFallbackMessage:
case SSKProtoEnvelopeTypeCiphertext:
case SSKProtoEnvelopeTypePrekeyBundle:
case SSKProtoEnvelopeTypeClosedGroupCiphertext:

4
SignalServiceKit/src/Messages/OWSMessageSender.m
Unescape Escape View File

@ -1111,9 +1111,7 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
}
NSDictionary *signalMessageInfo = deviceMessages.firstObject;
SSKProtoEnvelopeType type = ((NSNumber *)signalMessageInfo[@"type"]).integerValue;
if ([message isKindOfClass:OWSEndSessionMessage.class]) {
type = SSKProtoEnvelopeTypeFriendRequest;
} else if ([messageSend.thread isKindOfClass:TSGroupThread.class] && ((TSGroupThread *)messageSend.thread).usesSharedSenderKeys) {
if ([messageSend.thread isKindOfClass:TSGroupThread.class] && ((TSGroupThread *)messageSend.thread).usesSharedSenderKeys) {
type = SSKProtoEnvelopeTypeClosedGroupCiphertext;
}
uint64_t timestamp = message.timestamp;

12
SignalServiceKit/src/Protos/Generated/SSKProto.swift
Unescape Escape View File

@ -24,7 +24,7 @@ public enum SSKProtoError: Error {
case receipt = 5
case unidentifiedSender = 6
case closedGroupCiphertext = 7
case friendRequest = 101
case fallbackMessage = 101
}
private class func SSKProtoEnvelopeTypeWrap(_ value: SignalServiceProtos_Envelope.TypeEnum) -> SSKProtoEnvelopeType {
@ -36,7 +36,7 @@ public enum SSKProtoError: Error {
case .receipt: return .receipt
case .unidentifiedSender: return .unidentifiedSender
case .closedGroupCiphertext: return .closedGroupCiphertext
case .friendRequest: return .friendRequest
case .fallbackMessage: return .fallbackMessage
}
}
@ -49,7 +49,7 @@ public enum SSKProtoError: Error {
case .receipt: return .receipt
case .unidentifiedSender: return .unidentifiedSender
case .closedGroupCiphertext: return .closedGroupCiphertext
case .friendRequest: return .friendRequest
case .fallbackMessage: return .fallbackMessage
}
}
@ -3646,9 +3646,7 @@ extension SSKProtoDataMessageClosedGroupUpdate.SSKProtoDataMessageClosedGroupUpd
case endSession = 1
case expirationTimerUpdate = 2
case profileKeyUpdate = 4
case sessionRestore = 64
case unlinkDevice = 128
case sessionRequest = 256
}
private class func SSKProtoDataMessageFlagsWrap(_ value: SignalServiceProtos_DataMessage.Flags) -> SSKProtoDataMessageFlags {
@ -3656,9 +3654,7 @@ extension SSKProtoDataMessageClosedGroupUpdate.SSKProtoDataMessageClosedGroupUpd
case .endSession: return .endSession
case .expirationTimerUpdate: return .expirationTimerUpdate
case .profileKeyUpdate: return .profileKeyUpdate
case .sessionRestore: return .sessionRestore
case .unlinkDevice: return .unlinkDevice
case .sessionRequest: return .sessionRequest
}
}
@ -3667,9 +3663,7 @@ extension SSKProtoDataMessageClosedGroupUpdate.SSKProtoDataMessageClosedGroupUpd
case .endSession: return .endSession
case .expirationTimerUpdate: return .expirationTimerUpdate
case .profileKeyUpdate: return .profileKeyUpdate
case .sessionRestore: return .sessionRestore
case .unlinkDevice: return .unlinkDevice
case .sessionRequest: return .sessionRequest
}
}

18
SignalServiceKit/src/Protos/Generated/SignalService.pb.swift
Unescape Escape View File

@ -134,8 +134,8 @@ struct SignalServiceProtos_Envelope {
/// Loki
case closedGroupCiphertext // = 7
/// Loki: Contains pre keys and a message; uses simple encryption
case friendRequest // = 101
/// Loki: Encrypted using the fallback session cipher. Contains a pre key bundle if it's a session request.
case fallbackMessage // = 101
init() {
self = .unknown
@ -150,7 +150,7 @@ struct SignalServiceProtos_Envelope {
case 5: self = .receipt
case 6: self = .unidentifiedSender
case 7: self = .closedGroupCiphertext
case 101: self = .friendRequest
case 101: self = .fallbackMessage
default: return nil
}
}
@ -164,7 +164,7 @@ struct SignalServiceProtos_Envelope {
case .receipt: return 5
case .unidentifiedSender: return 6
case .closedGroupCiphertext: return 7
case .friendRequest: return 101
case .fallbackMessage: return 101
}
}
@ -840,9 +840,7 @@ struct SignalServiceProtos_DataMessage {
case endSession // = 1
case expirationTimerUpdate // = 2
case profileKeyUpdate // = 4
case sessionRestore // = 64
case unlinkDevice // = 128
case sessionRequest // = 256
init() {
self = .endSession
@ -853,9 +851,7 @@ struct SignalServiceProtos_DataMessage {
case 1: self = .endSession
case 2: self = .expirationTimerUpdate
case 4: self = .profileKeyUpdate
case 64: self = .sessionRestore
case 128: self = .unlinkDevice
case 256: self = .sessionRequest
default: return nil
}
}
@ -865,9 +861,7 @@ struct SignalServiceProtos_DataMessage {
case .endSession: return 1
case .expirationTimerUpdate: return 2
case .profileKeyUpdate: return 4
case .sessionRestore: return 64
case .unlinkDevice: return 128
case .sessionRequest: return 256
}
}
@ -2935,7 +2929,7 @@ extension SignalServiceProtos_Envelope.TypeEnum: SwiftProtobuf._ProtoNameProvidi
5: .same(proto: "RECEIPT"),
6: .same(proto: "UNIDENTIFIED_SENDER"),
7: .same(proto: "CLOSED_GROUP_CIPHERTEXT"),
101: .same(proto: "FRIEND_REQUEST"),
101: .same(proto: "FALLBACK_MESSAGE"),
]
}
@ -3510,9 +3504,7 @@ extension SignalServiceProtos_DataMessage.Flags: SwiftProtobuf._ProtoNameProvidi
1: .same(proto: "END_SESSION"),
2: .same(proto: "EXPIRATION_TIMER_UPDATE"),
4: .same(proto: "PROFILE_KEY_UPDATE"),
64: .same(proto: "SESSION_RESTORE"),
128: .same(proto: "UNLINK_DEVICE"),
256: .same(proto: "SESSION_REQUEST"),
]
}

2
SignalServiceKit/src/SSKEnvironment.h
Unescape Escape View File

@ -26,7 +26,6 @@ NS_ASSUME_NONNULL_BEGIN
@class TSNetworkManager;
@class TSSocketManager;
@class YapDatabaseConnection;
@class LKFriendRequestExpirationJob; // Loki
@protocol ContactsManagerProtocol;
@protocol NotificationsProtocol;
@ -111,7 +110,6 @@ NS_ASSUME_NONNULL_BEGIN
@property (atomic, readonly) YapDatabaseConnection *sessionStoreDBConnection;
@property (atomic, readonly) YapDatabaseConnection *migrationDBConnection;
@property (atomic, readonly) YapDatabaseConnection *analyticsDBConnection;
@property (nonatomic) LKFriendRequestExpirationJob *lokiFriendRequestExpirationJob; // Loki
- (BOOL)isComplete;

9
SignalServiceKit/src/SSKEnvironment.m
Unescape Escape View File

@ -197,15 +197,6 @@ static SSKEnvironment *sharedSSKEnvironment;
}
}
- (void)setLokiFriendRequestExpirationJob:(LKFriendRequestExpirationJob *)lokiFriendRequestExpirationJob {
@synchronized(self) {
OWSAssertDebug(lokiFriendRequestExpirationJob);
OWSAssertDebug(_lokiFriendRequestExpirationJob == nil);
_lokiFriendRequestExpirationJob = lokiFriendRequestExpirationJob;
}
}
- (BOOL)isComplete
{
return self.notificationsManager != nil;

Write Preview
Loading…
Cancel
Save