mirror of https://github.com/oxen-io/session-ios
We aren't using ErrorMessage/InfoMessage. (#1412)
We incorrectly assumed some parameters were these types, but actually they were TSMessageAdapters. // FREEBIEpull/1/head
parent
722c3a5e78
commit
7c32259a92
@ -1,32 +0,0 @@
|
||||
// Created by Dylan Bourgeois on 29/11/14.
|
||||
// Copyright (c) 2014 Hexed Bits. All rights reserved.
|
||||
// Portions Copyright (c) 2016 Open Whisper Systems. All rights reserved.
|
||||
|
||||
#import "OWSDisplayedMessage.h"
|
||||
#import "TSMessageAdapter.h"
|
||||
|
||||
typedef NS_ENUM(NSInteger, OWSErrorMessageType) {
|
||||
OWSErrorMessageNoSession,
|
||||
OWSErrorMessageWrongTrustedIdentityKey,
|
||||
OWSErrorMessageInvalidKeyException,
|
||||
OWSErrorMessageMissingKeyId,
|
||||
OWSErrorMessageInvalidMessage,
|
||||
OWSErrorMessageDuplicateMessage,
|
||||
OWSErrorMessageInvalidVersion
|
||||
};
|
||||
|
||||
@interface OWSErrorMessage : OWSDisplayedMessage
|
||||
|
||||
@property (nonatomic) OWSErrorMessageType errorMessageType;
|
||||
@property (nonatomic) TSMessageAdapterType messageType;
|
||||
|
||||
#pragma mark - Initialization
|
||||
|
||||
- (instancetype)initWithErrorType:(OWSErrorMessageType)messageType
|
||||
senderId:(NSString *)senderId
|
||||
senderDisplayName:(NSString *)senderDisplayName
|
||||
date:(NSDate *)date;
|
||||
|
||||
- (NSString *)text;
|
||||
|
||||
@end
|
@ -1,75 +0,0 @@
|
||||
// Created by Dylan Bourgeois on 29/11/14.
|
||||
// Copyright (c) 2014 Hexed Bits. All rights reserved.
|
||||
|
||||
#import "OWSErrorMessage.h"
|
||||
|
||||
@implementation OWSErrorMessage
|
||||
|
||||
- (instancetype)initWithErrorType:(OWSErrorMessageType)messageType
|
||||
senderId:(NSString *)senderId
|
||||
senderDisplayName:(NSString *)senderDisplayName
|
||||
date:(NSDate *)date
|
||||
{
|
||||
self = [super initWithSenderId:senderId senderDisplayName:senderDisplayName date:date];
|
||||
if (!self) {
|
||||
return self;
|
||||
}
|
||||
|
||||
_errorMessageType = messageType;
|
||||
_messageType = TSErrorMessageAdapter;
|
||||
|
||||
return self;
|
||||
}
|
||||
|
||||
- (NSString *)text
|
||||
{
|
||||
switch (self.errorMessageType) {
|
||||
case OWSErrorMessageNoSession:
|
||||
return [NSString stringWithFormat:@"No session error"];
|
||||
break;
|
||||
case OWSErrorMessageWrongTrustedIdentityKey:
|
||||
return [NSString stringWithFormat:@"Error : Wrong trusted identity key for %@.", self.senderDisplayName];
|
||||
break;
|
||||
case OWSErrorMessageInvalidKeyException:
|
||||
return [NSString stringWithFormat:@"Error : Invalid key exception for %@.", self.senderDisplayName];
|
||||
break;
|
||||
case OWSErrorMessageMissingKeyId:
|
||||
return [NSString stringWithFormat:@"Error: Missing key identifier for %@", self.senderDisplayName];
|
||||
break;
|
||||
case OWSErrorMessageInvalidMessage:
|
||||
return [NSString stringWithFormat:@"Error: Invalid message"];
|
||||
break;
|
||||
case OWSErrorMessageDuplicateMessage:
|
||||
return [NSString stringWithFormat:@"Error: Duplicate message"];
|
||||
break;
|
||||
case OWSErrorMessageInvalidVersion:
|
||||
return [NSString stringWithFormat:@"Error: Invalid version for contact %@.", self.senderDisplayName];
|
||||
break;
|
||||
|
||||
default:
|
||||
return nil;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
- (NSUInteger)hash
|
||||
{
|
||||
return self.senderId.hash ^ self.date.hash;
|
||||
}
|
||||
|
||||
- (NSString *)description
|
||||
{
|
||||
return [NSString stringWithFormat:@"<%@: senderId=%@, senderDisplayName=%@, date=%@, type=%ld>",
|
||||
[self class],
|
||||
self.senderId,
|
||||
self.senderDisplayName,
|
||||
self.date,
|
||||
(long)self.errorMessageType];
|
||||
}
|
||||
|
||||
- (TSMessageAdapterType)messageType
|
||||
{
|
||||
return TSErrorMessageAdapter;
|
||||
}
|
||||
|
||||
@end
|
@ -1,23 +0,0 @@
|
||||
// Created by Dylan Bourgeois on 29/11/14.
|
||||
// Copyright (c) 2014 Hexed Bits. All rights reserved.
|
||||
// Portions Copyright (c) 2016 Open Whisper Systems. All rights reserved.
|
||||
|
||||
#import "OWSDisplayedMessage.h"
|
||||
#import "TSInfoMessage.h"
|
||||
#import "TSMessageAdapter.h"
|
||||
|
||||
@interface OWSInfoMessage : OWSDisplayedMessage
|
||||
|
||||
@property (nonatomic) TSInfoMessageType infoMessageType;
|
||||
@property (nonatomic) TSMessageAdapterType messageType;
|
||||
|
||||
#pragma mark - Initialization
|
||||
|
||||
- (instancetype)initWithInfoType:(TSInfoMessageType)messageType
|
||||
senderId:(NSString *)senderId
|
||||
senderDisplayName:(NSString *)senderDisplayName
|
||||
date:(NSDate *)date;
|
||||
|
||||
- (NSString *)text;
|
||||
|
||||
@end
|
@ -1,55 +0,0 @@
|
||||
// Created by Dylan Bourgeois on 29/11/14.
|
||||
// Copyright (c) 2014 Hexed Bits. All rights reserved.
|
||||
// Portions Copyright (c) 2016 Open Whisper Systems. All rights reserved.
|
||||
|
||||
#import "OWSInfoMessage.h"
|
||||
|
||||
@implementation OWSInfoMessage
|
||||
|
||||
- (instancetype)initWithInfoType:(TSInfoMessageType)messageType
|
||||
senderId:(NSString *)senderId
|
||||
senderDisplayName:(NSString *)senderDisplayName
|
||||
date:(NSDate *)date
|
||||
{
|
||||
//@discussion: NSParameterAssert() ?
|
||||
|
||||
self = [super initWithSenderId:senderId senderDisplayName:senderDisplayName date:date];
|
||||
if (!self) {
|
||||
return self;
|
||||
}
|
||||
|
||||
_infoMessageType = messageType;
|
||||
_messageType = TSInfoMessageAdapter;
|
||||
|
||||
return self;
|
||||
}
|
||||
|
||||
- (NSString *)text
|
||||
{
|
||||
switch (self.infoMessageType) {
|
||||
case TSInfoMessageTypeSessionDidEnd:
|
||||
return [NSString stringWithFormat:@"Session with %@ ended.", self.senderDisplayName];
|
||||
break;
|
||||
|
||||
default:
|
||||
return nil;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
- (NSUInteger)hash
|
||||
{
|
||||
return self.senderId.hash ^ self.date.hash;
|
||||
}
|
||||
|
||||
- (NSString *)description
|
||||
{
|
||||
return [NSString stringWithFormat:@"<%@: senderId=%@, senderDisplayName=%@, date=%@, type=%ld>",
|
||||
[self class],
|
||||
self.senderId,
|
||||
self.senderDisplayName,
|
||||
self.date,
|
||||
(long)self.infoMessageType];
|
||||
}
|
||||
|
||||
@end
|
Loading…
Reference in New Issue