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

fixup debug UI

Browse Source
pull/1/head
Michael Kirk 7 years ago
parent 5ba5e98260
commit eb97e82d19
2 changed files with 71 additions and 82 deletions
Show Stats Download Patch File Download Diff File

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

@ -84,13 +84,12 @@ NS_ASSUME_NONNULL_BEGIN
actionBlock:^{ actionBlock:^{
[DebugUIMessages deleteAllMessagesInThread:thread]; [DebugUIMessages deleteAllMessagesInThread:thread];
}]]; }]];
[items addObject:[OWSTableItem itemWithTitle:@"Send All Contact Shares" [items addObject:[OWSTableItem itemWithTitle:@"👷 Send All Contact Shares"
actionBlock:^{ actionBlock:^{
[DebugUIMessages sendAllContacts:thread]; [DebugUIMessages sendAllContacts:thread];
}]]; }]];
[items addObjectsFromArray:[self itemsForActions:@[ [items addObjectsFromArray:[self itemsForActions:@[
[DebugUIMessages fakeAllContactShareAction:thread],
[DebugUIMessages sendMessageVariationsAction:thread], [DebugUIMessages sendMessageVariationsAction:thread],
// Send Media // Send Media
[DebugUIMessages sendAllMediaAction:thread], [DebugUIMessages sendAllMediaAction:thread],
@ -108,7 +107,6 @@ NS_ASSUME_NONNULL_BEGIN
// Exemplary // Exemplary
[DebugUIMessages allFakeAction:thread], [DebugUIMessages allFakeAction:thread],
[DebugUIMessages allFakeBackDatedAction:thread], [DebugUIMessages allFakeBackDatedAction:thread],
[DebugUIMessages allContactShareAction:thread],
]]]; ]]];
[items addObjectsFromArray:@[ [items addObjectsFromArray:@[
@ -3033,7 +3031,6 @@ typedef OWSContact * (^OWSContactBlock)(YapDatabaseReadWriteTransaction *transac
address2, address2,
]; ];
// MJK
UIImage *avatarImage = UIImage *avatarImage =
[OWSAvatarBuilder buildRandomAvatarWithDiameter:200]; [OWSAvatarBuilder buildRandomAvatarWithDiameter:200];
NSData *avatarImageData NSData *avatarImageData
@ -3043,15 +3040,13 @@ typedef OWSContact * (^OWSContactBlock)(YapDatabaseReadWriteTransaction *transac
byteCount:avatarImageData.length byteCount:avatarImageData.length
sourceFilename:nil]; sourceFilename:nil];
NSError *error; NSError *error;
BOOL success = BOOL success =
[attachmentStream writeData:avatarImageData error:&error]; [attachmentStream writeData:avatarImageData error:&error];
OWSAssert(success && !error); OWSAssert(success && !error);
[attachmentStream saveWithTransaction:transaction]; [attachmentStream saveWithTransaction:transaction];
[contact setAvatarAttachmentStream:attachmentStream];
contact.avatarAttachmentInfo = [[OWSAttachmentInfo alloc]
initWithAttachmentStream:attachmentStream];
return contact; return contact;
}]]; }]];
[actions addObject:[self fakeContactShareMessageAction:thread [actions addObject:[self fakeContactShareMessageAction:thread
@ -3098,12 +3093,12 @@ typedef OWSContact * (^OWSContactBlock)(YapDatabaseReadWriteTransaction *transac
return actions; return actions;
} }
+ (DebugUIMessagesAction *)allContactShareAction:(TSThread *)thread + (DebugUIMessagesAction *)fakeAllContactShareAction:(TSThread *)thread
{ {
OWSAssert(thread); OWSAssert(thread);
return return
[DebugUIMessagesGroupAction allGroupActionWithLabel:@"All Fake Contact Shares" [DebugUIMessagesGroupAction allGroupActionWithLabel:@"👷 All Fake Contact Shares"
subactions:[self allFakeContactShareActions:thread includeLabels:YES]]; subactions:[self allFakeContactShareActions:thread includeLabels:YES]];
} }
@ -3120,14 +3115,12 @@ typedef OWSContact * (^OWSContactBlock)(YapDatabaseReadWriteTransaction *transac
YapDatabaseReadWriteTransaction *transaction, YapDatabaseReadWriteTransaction *transaction,
ActionSuccessBlock success, ActionSuccessBlock success,
ActionFailureBlock failure) { ActionFailureBlock failure) {
// dispatch_async(dispatch_get_main_queue(), ^{
OWSContact *contact = contactBlock(transaction); OWSContact *contact = contactBlock(transaction);
DDLogVerbose(@"%@ sending contact: %@", self.logTag, contact.debugDescription); DDLogVerbose(@"%@ sending contact: %@", self.logTag, contact.debugDescription);
OWSMessageSender *messageSender = [Environment current].messageSender; OWSMessageSender *messageSender = [Environment current].messageSender;
[ThreadUtil sendMessageWithContactShare:contact inThread:thread messageSender:messageSender completion:nil]; [ThreadUtil sendMessageWithContactShare:contact inThread:thread messageSender:messageSender completion:nil];
success(); success();
// });
}]; }];
} }
@ -3143,32 +3136,32 @@ typedef OWSContact * (^OWSContactBlock)(YapDatabaseReadWriteTransaction *transac
text:@"⚠️ Send Share Contact ⚠️"]]; text:@"⚠️ Send Share Contact ⚠️"]];
} }
// [actions addObject:[self sendContactShareMessageAction:thread [actions addObject:[self sendContactShareMessageAction:thread
// label:@"Name & Number" label:@"Name & Number"
// contactBlock:^(YapDatabaseReadWriteTransaction *transaction){ contactBlock:^(YapDatabaseReadWriteTransaction *transaction) {
// OWSContact *contact = [OWSContact new]; OWSContact *contact = [OWSContact new];
// contact.givenName = @"Alice"; contact.givenName = @"Alice";
// OWSContactPhoneNumber *phoneNumber = [OWSContactPhoneNumber OWSContactPhoneNumber *phoneNumber = [OWSContactPhoneNumber new];
// new]; phoneNumber.phoneType = OWSContactPhoneType_Home; phoneNumber.phoneType = OWSContactPhoneType_Home;
// phoneNumber.phoneNumber = @"+13213214321"; phoneNumber.phoneNumber = @"+13213214321";
// contact.phoneNumbers = @[ contact.phoneNumbers = @[
// phoneNumber, phoneNumber,
// ]; ];
// return contact; return contact;
// }]]; }]];
// [actions addObject:[self sendContactShareMessageAction:thread [actions addObject:[self sendContactShareMessageAction:thread
// label:@"Name & Email" label:@"Name & Email"
// contactBlock:^(YapDatabaseReadWriteTransaction *transaction){ contactBlock:^(YapDatabaseReadWriteTransaction *transaction) {
// OWSContact *contact = [OWSContact new]; OWSContact *contact = [OWSContact new];
// contact.givenName = @"Bob"; contact.givenName = @"Bob";
// OWSContactEmail *email = [OWSContactEmail new]; OWSContactEmail *email = [OWSContactEmail new];
// email.emailType = OWSContactEmailType_Home; email.emailType = OWSContactEmailType_Home;
// email.email = @"a@b.com"; email.email = @"a@b.com";
// contact.emails = @[ contact.emails = @[
// email, email,
// ]; ];
// return contact; return contact;
// }]]; }]];
[actions addObject:[self sendContactShareMessageAction:thread [actions addObject:[self sendContactShareMessageAction:thread
label:@"Complicated" label:@"Complicated"
contactBlock:^(YapDatabaseReadWriteTransaction *transaction){ contactBlock:^(YapDatabaseReadWriteTransaction *transaction){
@ -3223,7 +3216,6 @@ typedef OWSContact * (^OWSContactBlock)(YapDatabaseReadWriteTransaction *transac
address2, address2,
]; ];
// MJK
UIImage *avatarImage = UIImage *avatarImage =
[OWSAvatarBuilder buildRandomAvatarWithDiameter:200]; [OWSAvatarBuilder buildRandomAvatarWithDiameter:200];
NSData *avatarImageData NSData *avatarImageData
@ -3233,7 +3225,6 @@ typedef OWSContact * (^OWSContactBlock)(YapDatabaseReadWriteTransaction *transac
byteCount:avatarImageData.length byteCount:avatarImageData.length
sourceFilename:nil]; sourceFilename:nil];
NSError *error; NSError *error;
BOOL success = BOOL success =
[attachmentStream writeData:avatarImageData error:&error]; [attachmentStream writeData:avatarImageData error:&error];
@ -3243,46 +3234,46 @@ typedef OWSContact * (^OWSContactBlock)(YapDatabaseReadWriteTransaction *transac
return contact; return contact;
}]]; }]];
// [actions addObject:[self sendContactShareMessageAction:thread [actions addObject:[self sendContactShareMessageAction:thread
// label:@"Long values" label:@"Long values"
// contactBlock:^(YapDatabaseReadWriteTransaction *transaction){ contactBlock:^(YapDatabaseReadWriteTransaction *transaction) {
// OWSContact *contact = [OWSContact new]; OWSContact *contact = [OWSContact new];
// contact.givenName = @"Bobasdjasdlkjasldkjas"; contact.givenName = @"Bobasdjasdlkjasldkjas";
// contact.familyName = @"Bobasdjasdlkjasldkjas"; contact.familyName = @"Bobasdjasdlkjasldkjas";
// OWSContactEmail *email = [OWSContactEmail new]; OWSContactEmail *email = [OWSContactEmail new];
// email.emailType = OWSContactEmailType_Mobile; email.emailType = OWSContactEmailType_Mobile;
// email.email = @"asdlakjsaldkjasldkjasdlkjasdlkjasdlkajsa@b.com"; email.email = @"asdlakjsaldkjasldkjasdlkjasdlkjasdlkajsa@b.com";
// contact.emails = @[ contact.emails = @[
// email, email,
// ]; ];
// return contact; return contact;
// }]]; }]];
// [actions addObject:[self sendContactShareMessageAction:thread [actions addObject:[self sendContactShareMessageAction:thread
// label:@"System Contact w/o Signal" label:@"System Contact w/o Signal"
// contactBlock:^(YapDatabaseReadWriteTransaction *transaction){ contactBlock:^(YapDatabaseReadWriteTransaction *transaction) {
// OWSContact *contact = [OWSContact new]; OWSContact *contact = [OWSContact new];
// contact.givenName = @"Add Me To Your Contacts"; contact.givenName = @"Add Me To Your Contacts";
// OWSContactPhoneNumber *phoneNumber = [OWSContactPhoneNumber OWSContactPhoneNumber *phoneNumber = [OWSContactPhoneNumber new];
// new]; phoneNumber.phoneType = OWSContactPhoneType_Work; phoneNumber.phoneType = OWSContactPhoneType_Work;
// phoneNumber.phoneNumber = @"+324602053911"; phoneNumber.phoneNumber = @"+324602053911";
// contact.phoneNumbers = @[ contact.phoneNumbers = @[
// phoneNumber, phoneNumber,
// ]; ];
// return contact; return contact;
// }]]; }]];
// [actions addObject:[self sendContactShareMessageAction:thread [actions addObject:[self sendContactShareMessageAction:thread
// label:@"System Contact w. Signal" label:@"System Contact w. Signal"
// contactBlock:^(YapDatabaseReadWriteTransaction *transaction){ contactBlock:^(YapDatabaseReadWriteTransaction *transaction) {
// OWSContact *contact = [OWSContact new]; OWSContact *contact = [OWSContact new];
// contact.givenName = @"Add Me To Your Contacts"; contact.givenName = @"Add Me To Your Contacts";
// OWSContactPhoneNumber *phoneNumber = [OWSContactPhoneNumber OWSContactPhoneNumber *phoneNumber = [OWSContactPhoneNumber new];
// new]; phoneNumber.phoneType = OWSContactPhoneType_Work; phoneNumber.phoneType = OWSContactPhoneType_Work;
// phoneNumber.phoneNumber = @"+32460205392"; phoneNumber.phoneNumber = @"+32460205392";
// contact.phoneNumbers = @[ contact.phoneNumbers = @[
// phoneNumber, phoneNumber,
// ]; ];
// return contact; return contact;
// }]]; }]];
return actions; return actions;
} }

2
SignalServiceKit/src/Messages/Interactions/OWSContact+Private.h
Unescape Escape View File

@ -61,8 +61,6 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic) NSArray<OWSContactEmail *> *emails; @property (nonatomic) NSArray<OWSContactEmail *> *emails;
@property (nonatomic) NSArray<OWSContactAddress *> *addresses; @property (nonatomic) NSArray<OWSContactAddress *> *addresses;
@property (nonatomic, nullable) OWSAttachmentInfo *avatarAttachmentInfo;
@property (nonatomic) BOOL isProfileAvatar; @property (nonatomic) BOOL isProfileAvatar;
@end @end

Write Preview
Loading…
Cancel
Save