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

Rework quoted reply debug UI.

Browse Source
pull/1/head
Matthew Chen 7 years ago
parent 4915c127cb
commit fb1f3b5572
2 changed files with 105 additions and 157 deletions
Show Stats Download Patch File Download Diff File

5
Signal/src/ViewControllers/ConversationView/ConversationViewItem.m
Unescape Escape View File

@ -431,7 +431,10 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType)
self.displayableBodyText = [[DisplayableText alloc] initWithFullText:@"" displayText:@"" isTextTruncated:NO]; self.displayableBodyText = [[DisplayableText alloc] initWithFullText:@"" displayText:@"" isTextTruncated:NO];
} }
DDLogInfo(@"%@ --- %@ %@", self.logTag, self.interaction.uniqueId, self.displayableBodyText.displayText); DDLogInfo(@"%@ --- %@ %@",
self.logTag,
self.interaction.uniqueId,
(self.hasBodyText ? self.displayableBodyText.displayText : @""));
} }
- (OWSMessageCellType)messageCellType - (OWSMessageCellType)messageCellType

179
Signal/src/ViewControllers/DebugUI/DebugUIMessages.m
Unescape Escape View File

@ -1921,8 +1921,7 @@ isQuotedMessageAttachmentDownloaded:(BOOL)isQuotedMessageAttachmentDownloaded
} }
[label appendString:@")"]; [label appendString:@")"];
return [DebugUIMessagesSingleAction return [DebugUIMessagesSingleAction actionWithLabel:label
actionWithLabel:label
unstaggeredActionBlock:^(NSUInteger index, YapDatabaseReadWriteTransaction *transaction) { unstaggeredActionBlock:^(NSUInteger index, YapDatabaseReadWriteTransaction *transaction) {
TSQuotedMessage *_Nullable quotedMessage = nil; TSQuotedMessage *_Nullable quotedMessage = nil;
if (isQuotedMessageIncoming) { if (isQuotedMessageIncoming) {
@ -1966,6 +1965,13 @@ isQuotedMessageAttachmentDownloaded:(BOOL)isQuotedMessageAttachmentDownloaded
quotedMessage:quotedMessage quotedMessage:quotedMessage
transaction:transaction]; transaction:transaction];
} }
}
prepareBlock:^(ActionSuccessBlock success, ActionFailureBlock failure) {
if (quotedMessageAssetLoader.prepareBlock) {
quotedMessageAssetLoader.prepareBlock(success, failure);
} else {
success();
}
}]; }];
} }
@ -1978,15 +1984,6 @@ isQuotedMessageAttachmentDownloaded:(BOOL)isQuotedMessageAttachmentDownloaded
@"consectetur adipiscing elit."; @"consectetur adipiscing elit.";
NSString *longText = [self randomOversizeText]; NSString *longText = [self randomOversizeText];
// NSArray<NSString *> *messageBodies = @[
// @"Hi",
// @"1️⃣",
// @"1️⃣2️⃣",
// @"1️⃣2️⃣3️⃣",
// @"落",
// @"﷽",
// ];
NSMutableArray<DebugUIMessagesAction *> *actions = [NSMutableArray new]; NSMutableArray<DebugUIMessagesAction *> *actions = [NSMutableArray new];
if (includeLabels) { if (includeLabels) {
@ -2097,18 +2094,12 @@ isQuotedMessageAttachmentDownloaded:(BOOL)isQuotedMessageAttachmentDownloaded
replyMessageState:TSOutgoingMessageStateUnsent replyMessageState:TSOutgoingMessageStateUnsent
replyIsDelivered:NO replyIsDelivered:NO
replyIsRead:NO], replyIsRead:NO],
]];
if (includeLabels) {
[actions
addObject:[self fakeIncomingTextMessageAction:thread text:@"⚠️ Quoted Replies (Attachments) ⚠️"]];
}
[actions addObjectsFromArray:@[
[self fakeQuotedReplyAction:thread [self fakeQuotedReplyAction:thread
quotedMessageLabel:@"Jpg" quotedMessageLabel:@"Mp3"
isQuotedMessageIncoming:NO isQuotedMessageIncoming:NO
quotedMessageBody:nil quotedMessageBody:nil
quotedMessageAssetLoader:[DebugUIMessagesAssetLoader jpegInstance] quotedMessageAssetLoader:[DebugUIMessagesAssetLoader mp3Instance]
isQuotedMessageAttachmentDownloaded:NO isQuotedMessageAttachmentDownloaded:NO
quotedMessageMessageState:TSOutgoingMessageStateUnsent quotedMessageMessageState:TSOutgoingMessageStateUnsent
replyLabel:@"Short Text" replyLabel:@"Short Text"
@ -2119,10 +2110,10 @@ isQuotedMessageAttachmentDownloaded:(BOOL)isQuotedMessageAttachmentDownloaded
replyIsRead:NO], replyIsRead:NO],
[self fakeQuotedReplyAction:thread [self fakeQuotedReplyAction:thread
quotedMessageLabel:@"Jpg" quotedMessageLabel:@"Mp3"
isQuotedMessageIncoming:NO isQuotedMessageIncoming:NO
quotedMessageBody:shortText quotedMessageBody:shortText
quotedMessageAssetLoader:[DebugUIMessagesAssetLoader jpegInstance] quotedMessageAssetLoader:[DebugUIMessagesAssetLoader mp3Instance]
isQuotedMessageAttachmentDownloaded:NO isQuotedMessageAttachmentDownloaded:NO
quotedMessageMessageState:TSOutgoingMessageStateUnsent quotedMessageMessageState:TSOutgoingMessageStateUnsent
replyLabel:@"Short Text" replyLabel:@"Short Text"
@ -2131,103 +2122,105 @@ isQuotedMessageAttachmentDownloaded:(BOOL)isQuotedMessageAttachmentDownloaded
replyMessageState:TSOutgoingMessageStateUnsent replyMessageState:TSOutgoingMessageStateUnsent
replyIsDelivered:NO replyIsDelivered:NO
replyIsRead:NO], replyIsRead:NO],
]];
// [actions addObject:[self fakeShortIncomingTextMessageAction:thread]];
void (^createActions)(BOOL, BOOL) = ^(BOOL isQuotedMessageIncoming, BOOL isReplyIncoming) {
[actions addObjectsFromArray:@[
[self fakeQuotedReplyAction:thread [self fakeQuotedReplyAction:thread
quotedMessageLabel:@"Short Text" quotedMessageLabel:@"Mp4"
isQuotedMessageIncoming:isQuotedMessageIncoming isQuotedMessageIncoming:NO
quotedMessageBody:shortText quotedMessageBody:nil
quotedMessageAssetLoader:nil quotedMessageAssetLoader:[DebugUIMessagesAssetLoader mp4Instance]
isQuotedMessageAttachmentDownloaded:NO isQuotedMessageAttachmentDownloaded:NO
quotedMessageMessageState:TSOutgoingMessageStateUnsent quotedMessageMessageState:TSOutgoingMessageStateUnsent
replyLabel:@"Short Text" replyLabel:@"Short Text"
isReplyIncoming:isReplyIncoming isReplyIncoming:NO
replyMessageBody:shortText replyMessageBody:shortText
replyMessageState:TSOutgoingMessageStateUnsent replyMessageState:TSOutgoingMessageStateUnsent
replyIsDelivered:NO replyIsDelivered:NO
replyIsRead:NO], replyIsRead:NO],
[self fakeQuotedReplyAction:thread [self fakeQuotedReplyAction:thread
quotedMessageLabel:@"Short Text" quotedMessageLabel:@"Mp4"
isQuotedMessageIncoming:isQuotedMessageIncoming isQuotedMessageIncoming:NO
quotedMessageBody:shortText quotedMessageBody:shortText
quotedMessageAssetLoader:nil quotedMessageAssetLoader:[DebugUIMessagesAssetLoader mp4Instance]
isQuotedMessageAttachmentDownloaded:NO isQuotedMessageAttachmentDownloaded:NO
quotedMessageMessageState:TSOutgoingMessageStateUnsent quotedMessageMessageState:TSOutgoingMessageStateUnsent
replyLabel:@"Medium Text" replyLabel:@"Short Text"
isReplyIncoming:isReplyIncoming isReplyIncoming:NO
replyMessageBody:mediumText replyMessageBody:shortText
replyMessageState:TSOutgoingMessageStateUnsent replyMessageState:TSOutgoingMessageStateUnsent
replyIsDelivered:NO replyIsDelivered:NO
replyIsRead:NO], replyIsRead:NO],
[self fakeQuotedReplyAction:thread [self fakeQuotedReplyAction:thread
quotedMessageLabel:@"Medium Text" quotedMessageLabel:@"Gif"
isQuotedMessageIncoming:isQuotedMessageIncoming isQuotedMessageIncoming:NO
quotedMessageBody:mediumText quotedMessageBody:nil
quotedMessageAssetLoader:nil quotedMessageAssetLoader:[DebugUIMessagesAssetLoader gifInstance]
isQuotedMessageAttachmentDownloaded:NO isQuotedMessageAttachmentDownloaded:NO
quotedMessageMessageState:TSOutgoingMessageStateUnsent quotedMessageMessageState:TSOutgoingMessageStateUnsent
replyLabel:@"Short Text" replyLabel:@"Short Text"
isReplyIncoming:isReplyIncoming isReplyIncoming:NO
replyMessageBody:shortText replyMessageBody:shortText
replyMessageState:TSOutgoingMessageStateUnsent replyMessageState:TSOutgoingMessageStateUnsent
replyIsDelivered:NO replyIsDelivered:NO
replyIsRead:NO], replyIsRead:NO],
[self fakeQuotedReplyAction:thread [self fakeQuotedReplyAction:thread
quotedMessageLabel:@"Medium Text" quotedMessageLabel:@"Gif"
isQuotedMessageIncoming:isQuotedMessageIncoming isQuotedMessageIncoming:NO
quotedMessageBody:mediumText quotedMessageBody:shortText
quotedMessageAssetLoader:nil quotedMessageAssetLoader:[DebugUIMessagesAssetLoader gifInstance]
isQuotedMessageAttachmentDownloaded:NO isQuotedMessageAttachmentDownloaded:NO
quotedMessageMessageState:TSOutgoingMessageStateUnsent quotedMessageMessageState:TSOutgoingMessageStateUnsent
replyLabel:@"Medium Text" replyLabel:@"Short Text"
isReplyIncoming:isReplyIncoming isReplyIncoming:NO
replyMessageBody:mediumText replyMessageBody:shortText
replyMessageState:TSOutgoingMessageStateUnsent replyMessageState:TSOutgoingMessageStateUnsent
replyIsDelivered:NO replyIsDelivered:NO
replyIsRead:NO], replyIsRead:NO],
]];
if (includeLabels) {
[actions addObject:[self fakeIncomingTextMessageAction:thread
text:@"⚠️ Quoted Replies (Attachment Layout) ⚠️"]];
}
[actions addObjectsFromArray:@[
[self fakeQuotedReplyAction:thread [self fakeQuotedReplyAction:thread
quotedMessageLabel:@"Long Text" quotedMessageLabel:@"Jpg"
isQuotedMessageIncoming:isQuotedMessageIncoming isQuotedMessageIncoming:NO
quotedMessageBody:longText quotedMessageBody:nil
quotedMessageAssetLoader:nil quotedMessageAssetLoader:[DebugUIMessagesAssetLoader jpegInstance]
isQuotedMessageAttachmentDownloaded:NO isQuotedMessageAttachmentDownloaded:NO
quotedMessageMessageState:TSOutgoingMessageStateUnsent quotedMessageMessageState:TSOutgoingMessageStateUnsent
replyLabel:@"Long Text" replyLabel:@"Short Text"
isReplyIncoming:isReplyIncoming isReplyIncoming:NO
replyMessageBody:longText replyMessageBody:shortText
replyMessageState:TSOutgoingMessageStateUnsent replyMessageState:TSOutgoingMessageStateUnsent
replyIsDelivered:NO replyIsDelivered:NO
replyIsRead:NO], replyIsRead:NO],
// Attachments
[self fakeQuotedReplyAction:thread [self fakeQuotedReplyAction:thread
quotedMessageLabel:@"Jpg" quotedMessageLabel:@"Jpg"
isQuotedMessageIncoming:isQuotedMessageIncoming isQuotedMessageIncoming:NO
quotedMessageBody:nil quotedMessageBody:shortText
quotedMessageAssetLoader:[DebugUIMessagesAssetLoader compactPortraitPngInstance] quotedMessageAssetLoader:[DebugUIMessagesAssetLoader jpegInstance]
isQuotedMessageAttachmentDownloaded:NO isQuotedMessageAttachmentDownloaded:NO
quotedMessageMessageState:TSOutgoingMessageStateUnsent quotedMessageMessageState:TSOutgoingMessageStateUnsent
replyLabel:@"Short Text" replyLabel:@"Short Text"
isReplyIncoming:isReplyIncoming isReplyIncoming:NO
replyMessageBody:shortText replyMessageBody:shortText
replyMessageState:TSOutgoingMessageStateUnsent replyMessageState:TSOutgoingMessageStateUnsent
replyIsDelivered:NO replyIsDelivered:NO
replyIsRead:NO], replyIsRead:NO],
]];
void (^directionActions)(BOOL, BOOL) = ^(BOOL isQuotedMessageIncoming, BOOL isReplyIncoming) {
[actions addObjectsFromArray:@[
[self fakeQuotedReplyAction:thread [self fakeQuotedReplyAction:thread
quotedMessageLabel:@"Jpg" quotedMessageLabel:@"Short Text"
isQuotedMessageIncoming:isQuotedMessageIncoming isQuotedMessageIncoming:isQuotedMessageIncoming
quotedMessageBody:shortText quotedMessageBody:shortText
quotedMessageAssetLoader:[DebugUIMessagesAssetLoader jpegInstance] quotedMessageAssetLoader:nil
isQuotedMessageAttachmentDownloaded:NO isQuotedMessageAttachmentDownloaded:NO
quotedMessageMessageState:TSOutgoingMessageStateUnsent quotedMessageMessageState:TSOutgoingMessageStateUnsent
replyLabel:@"Short Text" replyLabel:@"Short Text"
@ -2241,61 +2234,13 @@ isQuotedMessageAttachmentDownloaded:(BOOL)isQuotedMessageAttachmentDownloaded
if (includeLabels) { if (includeLabels) {
[actions addObject:[self fakeIncomingTextMessageAction:thread [actions addObject:[self fakeIncomingTextMessageAction:thread
text:@"⚠️ Quoted Replies (Outgoing to Outgoing) ⚠️"]]; text:@"⚠️ Quoted Replies (Incoming v. Outgoing) ⚠️"]];
}
createActions(NO, NO);
if (includeLabels) {
[actions addObject:[self fakeIncomingTextMessageAction:thread
text:@"⚠️ Quoted Replies (Incoming to Outgoing) ⚠️"]];
}
createActions(YES, NO);
if (includeLabels) {
[actions addObject:[self fakeIncomingTextMessageAction:thread
text:@"⚠️ Quoted Replies (Outgoing to Incoming) ⚠️"]];
}
createActions(NO, YES);
if (includeLabels) {
[actions addObject:[self fakeIncomingTextMessageAction:thread
text:@"⚠️ Quoted Replies (Incoming to Incoming) ⚠️"]];
} }
createActions(YES, YES); directionActions(NO, NO);
directionActions(YES, NO);
directionActions(NO, YES);
directionActions(YES, YES);
// for (NSString *messageBody in messageBodies) {
// [actions addObject:[self fakeIncomingTextMessageAction:thread text:messageBody]];
// }
//
// if (includeLabels) {
// [actions addObject:[self fakeOutgoingTextMessageAction:thread
// messageState:TSOutgoingMessageStateSentToService
// text:@"⚠️ Outgoing Statuses ⚠️"]];
// }
// [actions addObjectsFromArray:@[
// [self fakeShortOutgoingTextMessageAction:thread
// messageState:TSOutgoingMessageStateUnsent], [self
// fakeShortOutgoingTextMessageAction:thread
// messageState:TSOutgoingMessageStateAttemptingOut], [self
// fakeShortOutgoingTextMessageAction:thread
// messageState:TSOutgoingMessageStateSentToService], [self
// fakeShortOutgoingTextMessageAction:thread
// messageState:TSOutgoingMessageStateSentToService
// isDelivered:YES
// isRead:NO],
// [self fakeShortOutgoingTextMessageAction:thread
// messageState:TSOutgoingMessageStateSentToService
// isDelivered:YES
// isRead:YES],
// ]];
//
// if (includeLabels) {
// [actions addObject:[self fakeOutgoingTextMessageAction:thread
// messageState:TSOutgoingMessageStateSentToService
// text:@"⚠️ Outgoing Message Bodies ⚠️"]];
// }
// for (NSString *messageBody in messageBodies) {
// [actions addObject:[self fakeOutgoingTextMessageAction:thread
// messageState:TSOutgoingMessageStateSentToService
// text:messageBody]];
// }
return actions; return actions;
} }

Write Preview
Loading…
Cancel
Save