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

Flag voice messages as such in protos.

Browse Source 
// FREEBIE
pull/1/head
Matthew Chen 8 years ago
parent 92de9a5e72
commit b846532351
11 changed files with 175 additions and 28 deletions
Show Stats Download Patch File Download Diff File

19
protobuf/OWSSignalServiceProtos.proto
Unescape Escape View File

@ -133,13 +133,18 @@ message SyncMessage {
}
message AttachmentPointer {
optional fixed64 id = 1;
optional string contentType = 2;
optional bytes key = 3;
optional uint32 size = 4;
optional bytes thumbnail = 5;
optional bytes digest = 6;
optional string fileName = 7;
enum Flags {
VOICE_MESSAGE = 1;
}
optional fixed64 id = 1;
optional string contentType = 2;
optional bytes key = 3;
optional uint32 size = 4;
optional bytes thumbnail = 5;
optional bytes digest = 6;
optional string fileName = 7;
optional uint32 flags = 8;
}
message GroupContext {

11
src/Messages/Attachments/OWSAttachmentsProcessor.m
Unescape Escape View File

@ -79,12 +79,21 @@ static const CGFloat kAttachmentDownloadProgressTheta = 0.001f;
// digest will be empty for old clients.
NSData *digest = attachmentProto.hasDigest ? attachmentProto.digest : nil;
TSAttachmentType attachmentType = TSAttachmentTypeDefault;
if ([attachmentProto hasFlags]) {
UInt32 flags = attachmentProto.flags;
if ((flags & (UInt32)OWSSignalServiceProtosAttachmentPointerFlagsVoiceMessage) > 0) {
attachmentType = TSAttachmentTypeVoiceMessage;
}
}
TSAttachmentPointer *pointer = [[TSAttachmentPointer alloc] initWithServerId:attachmentProto.id
key:attachmentProto.key
digest:digest
contentType:attachmentProto.contentType
relay:relay
filename:attachmentProto.fileName];
filename:attachmentProto.fileName
attachmentType:attachmentType];
[attachmentIds addObject:pointer.uniqueId];

8
src/Messages/Attachments/TSAttachment.h
Unescape Escape View File

@ -6,6 +6,11 @@
NS_ASSUME_NONNULL_BEGIN
typedef NS_ENUM(NSUInteger, TSAttachmentType) {
TSAttachmentTypeDefault = 0,
TSAttachmentTypeVoiceMessage = 1,
};
@interface TSAttachment : TSYapDatabaseObject {
@protected
@ -24,6 +29,7 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, readonly) NSString *contentType;
@property (atomic, readwrite) BOOL isDownloaded;
@property (nonatomic) TSAttachmentType attachmentType;
// This constructor is used for new instances of TSAttachmentPointer,
// i.e. undownloaded incoming attachments.
@ -43,6 +49,8 @@ NS_ASSUME_NONNULL_BEGIN
- (void)upgradeFromAttachmentSchemaVersion:(NSUInteger)attachmentSchemaVersion;
- (BOOL)isVoiceMessage;
@end
NS_ASSUME_NONNULL_END

5
src/Messages/Attachments/TSAttachment.m
Unescape Escape View File

@ -110,6 +110,11 @@ NSUInteger const TSAttachmentSchemaVersion = 3;
return attachmentString;
}
- (BOOL)isVoiceMessage
{
return self.attachmentType == TSAttachmentTypeVoiceMessage;
}
#pragma mark - Logging
+ (NSString *)tag

3
src/Messages/Attachments/TSAttachmentPointer.h
Unescape Escape View File

@ -24,7 +24,8 @@ typedef NS_ENUM(NSUInteger, TSAttachmentPointerState) {
digest:(nullable NSData *)digest
contentType:(NSString *)contentType
relay:(NSString *)relay
filename:(nullable NSString *)filename NS_DESIGNATED_INITIALIZER;
filename:(nullable NSString *)filename
attachmentType:(TSAttachmentType)attachmentType NS_DESIGNATED_INITIALIZER;
@property (nonatomic, readonly) NSString *relay;
@property (nonatomic, readonly, nullable) NSString *filename;

2
src/Messages/Attachments/TSAttachmentPointer.m
Unescape Escape View File

@ -31,6 +31,7 @@ NS_ASSUME_NONNULL_BEGIN
contentType:(NSString *)contentType
relay:(NSString *)relay
filename:(nullable NSString *)filename
attachmentType:(TSAttachmentType)attachmentType
{
self = [super initWithServerId:serverId encryptionKey:key contentType:contentType];
if (!self) {
@ -41,6 +42,7 @@ NS_ASSUME_NONNULL_BEGIN
_state = TSAttachmentPointerStateEnqueued;
_relay = relay;
_filename = filename;
self.attachmentType = attachmentType;
return self;
}

1
src/Messages/Attachments/TSAttachmentStream.m
Unescape Escape View File

@ -44,6 +44,7 @@ NS_ASSUME_NONNULL_BEGIN
// attachments which don't need to be uploaded.
_isUploaded = YES;
_filename = pointer.filename;
self.attachmentType = pointer.attachmentType;
return self;
}

7
src/Messages/Interactions/TSOutgoingMessage.h
Unescape Escape View File

@ -57,6 +57,11 @@ typedef NS_ENUM(NSInteger, TSGroupMetaMessage) {
attachmentIds:(NSMutableArray<NSString *> *)attachmentIds
expiresInSeconds:(uint32_t)expiresInSeconds;
- (instancetype)initWithTimestamp:(uint64_t)timestamp
inThread:(nullable TSThread *)thread
isVoiceMessage:(BOOL)isVoiceMessage
expiresInSeconds:(uint32_t)expiresInSeconds;
- (instancetype)initWithTimestamp:(uint64_t)timestamp
inThread:(nullable TSThread *)thread
messageBody:(nullable NSString *)body
@ -95,6 +100,8 @@ typedef NS_ENUM(NSInteger, TSGroupMetaMessage) {
*/
@property (nonatomic, readonly) BOOL isLegacyMessage;
@property (nonatomic, readonly) BOOL isVoiceMessage;
/**
* Signal Identifier (e.g. e164 number) or nil if in a group thread.
*/

21
src/Messages/Interactions/TSOutgoingMessage.m
Unescape Escape View File

@ -22,6 +22,7 @@ NSString *const kTSOutgoingMessageSentRecipientAll = @"kTSOutgoingMessageSentRec
@property (atomic) NSString *customMessage;
@property (atomic) NSString *mostRecentFailureText;
@property (atomic) BOOL wasDelivered;
// For outgoing, non-legacy group messages sent from this client, this
// contains the list of recipients to whom the message has been sent.
//
@ -110,6 +111,24 @@ NSString *const kTSOutgoingMessageSentRecipientAll = @"kTSOutgoingMessageSentRec
expireStartedAt:0];
}
- (instancetype)initWithTimestamp:(uint64_t)timestamp
inThread:(nullable TSThread *)thread
isVoiceMessage:(BOOL)isVoiceMessage
expiresInSeconds:(uint32_t)expiresInSeconds
{
self = [self initWithTimestamp:timestamp
inThread:thread
messageBody:nil
attachmentIds:[NSMutableArray new]
expiresInSeconds:expiresInSeconds
expireStartedAt:0];
if (self) {
_isVoiceMessage = isVoiceMessage;
}
return self;
}
- (instancetype)initWithTimestamp:(uint64_t)timestamp
inThread:(nullable TSThread *)thread
messageBody:(nullable NSString *)body
@ -452,7 +471,7 @@ NSString *const kTSOutgoingMessageSentRecipientAll = @"kTSOutgoingMessageSentRec
[builder setFileName:filename];
[builder setKey:attachmentStream.encryptionKey];
[builder setDigest:attachmentStream.digest];
[builder setFlags:(self.isVoiceMessage ? OWSSignalServiceProtosAttachmentPointerFlagsVoiceMessage : 0)];
return [builder build];
}

21
src/Messages/OWSSignalServiceProtos.pb.h
Unescape Escape View File

@ -1,4 +1,6 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
//
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
//
#import <ProtocolBuffers/ProtocolBuffers.h>
@ -123,6 +125,13 @@ typedef NS_ENUM(SInt32, OWSSignalServiceProtosSyncMessageRequestType) {
BOOL OWSSignalServiceProtosSyncMessageRequestTypeIsValidValue(OWSSignalServiceProtosSyncMessageRequestType value);
NSString *NSStringFromOWSSignalServiceProtosSyncMessageRequestType(OWSSignalServiceProtosSyncMessageRequestType value);
typedef NS_ENUM(SInt32, OWSSignalServiceProtosAttachmentPointerFlags) {
OWSSignalServiceProtosAttachmentPointerFlagsVoiceMessage = 1,
};
BOOL OWSSignalServiceProtosAttachmentPointerFlagsIsValidValue(OWSSignalServiceProtosAttachmentPointerFlags value);
NSString *NSStringFromOWSSignalServiceProtosAttachmentPointerFlags(OWSSignalServiceProtosAttachmentPointerFlags value);
typedef NS_ENUM(SInt32, OWSSignalServiceProtosGroupContextType) {
OWSSignalServiceProtosGroupContextTypeUnknown = 0,
OWSSignalServiceProtosGroupContextTypeUpdate = 1,
@ -1290,6 +1299,7 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro
#define AttachmentPointer_thumbnail @"thumbnail"
#define AttachmentPointer_digest @"digest"
#define AttachmentPointer_fileName @"fileName"
#define AttachmentPointer_flags @"flags"
@interface OWSSignalServiceProtosAttachmentPointer : PBGeneratedMessage<GeneratedMessageProtocol> {
@private
BOOL hasId_:1;
@ -1299,6 +1309,7 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro
BOOL hasThumbnail_:1;
BOOL hasDigest_:1;
BOOL hasSize_:1;
BOOL hasFlags_ : 1;
UInt64 id;
NSString* contentType;
NSString* fileName;
@ -1306,6 +1317,7 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro
NSData* thumbnail;
NSData* digest;
UInt32 size;
UInt32 flags;
}
- (BOOL) hasId;
- (BOOL) hasContentType;
@ -1314,6 +1326,7 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro
- (BOOL) hasThumbnail;
- (BOOL) hasDigest;
- (BOOL) hasFileName;
- (BOOL)hasFlags;
@property (readonly) UInt64 id;
@property (readonly, strong) NSString* contentType;
@property (readonly, strong) NSData* key;
@ -1321,6 +1334,7 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro
@property (readonly, strong) NSData* thumbnail;
@property (readonly, strong) NSData* digest;
@property (readonly, strong) NSString* fileName;
@property (readonly) UInt32 flags;
+ (instancetype) defaultInstance;
- (instancetype) defaultInstance;
@ -1391,6 +1405,11 @@ NSString *NSStringFromOWSSignalServiceProtosGroupContextType(OWSSignalServicePro
- (NSString*) fileName;
- (OWSSignalServiceProtosAttachmentPointerBuilder*) setFileName:(NSString*) value;
- (OWSSignalServiceProtosAttachmentPointerBuilder*) clearFileName;
- (BOOL)hasFlags;
- (UInt32)flags;
- (OWSSignalServiceProtosAttachmentPointerBuilder *)setFlags:(UInt32)value;
- (OWSSignalServiceProtosAttachmentPointerBuilder *)clearFlags;
@end
#define GroupContext_id @"id"

105
src/Messages/OWSSignalServiceProtos.pb.m
Unescape Escape View File

@ -1,4 +1,6 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
//
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
//
#import "OWSSignalServiceProtos.pb.h"
// @@protoc_insertion_point(imports)
@ -5375,6 +5377,7 @@ static OWSSignalServiceProtosSyncMessageRead* defaultOWSSignalServiceProtosSyncM
@property (strong) NSData* thumbnail;
@property (strong) NSData* digest;
@property (strong) NSString* fileName;
@property UInt32 flags;
@end
@implementation OWSSignalServiceProtosAttachmentPointer
@ -5428,6 +5431,15 @@ static OWSSignalServiceProtosSyncMessageRead* defaultOWSSignalServiceProtosSyncM
hasFileName_ = !!_value_;
}
@synthesize fileName;
- (BOOL)hasFlags
{
return !!hasFlags_;
}
- (void)setHasFlags:(BOOL)_value_
{
hasFlags_ = !!_value_;
}
@synthesize flags;
- (instancetype) init {
if ((self = [super init])) {
self.id = 0L;
@ -5437,6 +5449,7 @@ static OWSSignalServiceProtosSyncMessageRead* defaultOWSSignalServiceProtosSyncM
self.thumbnail = [NSData data];
self.digest = [NSData data];
self.fileName = @"";
self.flags = 0;
}
return self;
}
@ -5477,6 +5490,9 @@ static OWSSignalServiceProtosAttachmentPointer* defaultOWSSignalServiceProtosAtt
if (self.hasFileName) {
[output writeString:7 value:self.fileName];
}
if (self.hasFlags) {
[output writeUInt32:8 value:self.flags];
}
[self.unknownFields writeToCodedOutputStream:output];
}
- (SInt32) serializedSize {
@ -5507,6 +5523,9 @@ static OWSSignalServiceProtosAttachmentPointer* defaultOWSSignalServiceProtosAtt
if (self.hasFileName) {
size_ += computeStringSize(7, self.fileName);
}
if (self.hasFlags) {
size_ += computeUInt32Size(8, self.flags);
}
size_ += self.unknownFields.serializedSize;
memoizedSerializedSize = size_;
return size_;
@ -5563,6 +5582,9 @@ static OWSSignalServiceProtosAttachmentPointer* defaultOWSSignalServiceProtosAtt
if (self.hasFileName) {
[output appendFormat:@"%@%@: %@\n", indent, @"fileName", self.fileName];
}
if (self.hasFlags) {
[output appendFormat:@"%@%@: %@\n", indent, @"flags", [NSNumber numberWithInteger:self.flags]];
}
[self.unknownFields writeDescriptionTo:output withIndent:indent];
}
- (void) storeInDictionary:(NSMutableDictionary *)dictionary {
@ -5587,6 +5609,9 @@ static OWSSignalServiceProtosAttachmentPointer* defaultOWSSignalServiceProtosAtt
if (self.hasFileName) {
[dictionary setObject: self.fileName forKey: @"fileName"];
}
if (self.hasFlags) {
[dictionary setObject:[NSNumber numberWithInteger:self.flags] forKey:@"flags"];
}
[self.unknownFields storeInDictionary:dictionary];
}
- (BOOL) isEqual:(id)other {
@ -5597,22 +5622,19 @@ static OWSSignalServiceProtosAttachmentPointer* defaultOWSSignalServiceProtosAtt
return NO;
}
OWSSignalServiceProtosAttachmentPointer *otherMessage = other;
return
self.hasId == otherMessage.hasId &&
(!self.hasId || self.id == otherMessage.id) &&
self.hasContentType == otherMessage.hasContentType &&
(!self.hasContentType || [self.contentType isEqual:otherMessage.contentType]) &&
self.hasKey == otherMessage.hasKey &&
(!self.hasKey || [self.key isEqual:otherMessage.key]) &&
self.hasSize == otherMessage.hasSize &&
(!self.hasSize || self.size == otherMessage.size) &&
self.hasThumbnail == otherMessage.hasThumbnail &&
(!self.hasThumbnail || [self.thumbnail isEqual:otherMessage.thumbnail]) &&
self.hasDigest == otherMessage.hasDigest &&
(!self.hasDigest || [self.digest isEqual:otherMessage.digest]) &&
self.hasFileName == otherMessage.hasFileName &&
(!self.hasFileName || [self.fileName isEqual:otherMessage.fileName]) &&
(self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields]));
return self.hasId == otherMessage.hasId && (!self.hasId || self.id == otherMessage.id)
&& self.hasContentType == otherMessage.hasContentType
&& (!self.hasContentType || [self.contentType isEqual:otherMessage.contentType])
&& self.hasKey == otherMessage.hasKey && (!self.hasKey || [self.key isEqual:otherMessage.key])
&& self.hasSize == otherMessage.hasSize && (!self.hasSize || self.size == otherMessage.size)
&& self.hasThumbnail == otherMessage.hasThumbnail
&& (!self.hasThumbnail || [self.thumbnail isEqual:otherMessage.thumbnail])
&& self.hasDigest == otherMessage.hasDigest && (!self.hasDigest || [self.digest isEqual:otherMessage.digest])
&& self.hasFileName == otherMessage.hasFileName
&& (!self.hasFileName || [self.fileName isEqual:otherMessage.fileName]) && self.hasFlags == otherMessage.hasFlags
&& (!self.hasFlags || self.flags == otherMessage.flags)
&& (self.unknownFields == otherMessage.unknownFields
|| (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields]));
}
- (NSUInteger) hash {
__block NSUInteger hashCode = 7;
@ -5637,11 +5659,33 @@ static OWSSignalServiceProtosAttachmentPointer* defaultOWSSignalServiceProtosAtt
if (self.hasFileName) {
hashCode = hashCode * 31 + [self.fileName hash];
}
if (self.hasFlags) {
hashCode = hashCode * 31 + [[NSNumber numberWithInteger:self.flags] hash];
}
hashCode = hashCode * 31 + [self.unknownFields hash];
return hashCode;
}
@end
BOOL OWSSignalServiceProtosAttachmentPointerFlagsIsValidValue(OWSSignalServiceProtosAttachmentPointerFlags value)
{
switch (value) {
case OWSSignalServiceProtosAttachmentPointerFlagsVoiceMessage:
return YES;
default:
return NO;
}
}
NSString *NSStringFromOWSSignalServiceProtosAttachmentPointerFlags(OWSSignalServiceProtosAttachmentPointerFlags value)
{
switch (value) {
case OWSSignalServiceProtosAttachmentPointerFlagsVoiceMessage:
return @"OWSSignalServiceProtosAttachmentPointerFlagsVoiceMessage";
default:
return nil;
}
}
@interface OWSSignalServiceProtosAttachmentPointerBuilder()
@property (strong) OWSSignalServiceProtosAttachmentPointer* resultAttachmentPointer;
@end
@ -5701,6 +5745,9 @@ static OWSSignalServiceProtosAttachmentPointer* defaultOWSSignalServiceProtosAtt
if (other.hasFileName) {
[self setFileName:other.fileName];
}
if (other.hasFlags) {
[self setFlags:other.flags];
}
[self mergeUnknownFields:other.unknownFields];
return self;
}
@ -5750,6 +5797,10 @@ static OWSSignalServiceProtosAttachmentPointer* defaultOWSSignalServiceProtosAtt
[self setFileName:[input readString]];
break;
}
case 64: {
[self setFlags:[input readUInt32]];
break;
}
}
}
}
@ -5865,6 +5916,26 @@ static OWSSignalServiceProtosAttachmentPointer* defaultOWSSignalServiceProtosAtt
resultAttachmentPointer.fileName = @"";
return self;
}
- (BOOL)hasFlags
{
return resultAttachmentPointer.hasFlags;
}
- (UInt32)flags
{
return resultAttachmentPointer.flags;
}
- (OWSSignalServiceProtosAttachmentPointerBuilder *)setFlags:(UInt32)value
{
resultAttachmentPointer.hasFlags = YES;
resultAttachmentPointer.flags = value;
return self;
}
- (OWSSignalServiceProtosAttachmentPointerBuilder *)clearFlags
{
resultAttachmentPointer.hasFlags = NO;
resultAttachmentPointer.flags = 0;
return self;
}
@end
@interface OWSSignalServiceProtosGroupContext ()

Write Preview
Loading…
Cancel
Save