From 811a4ac4b5a6d4fb7c7c470527bc1f38c914f300 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 11 Apr 2017 12:14:26 -0400 Subject: [PATCH 1/2] add some missing asserts // FREEBIE --- Signal/src/Models/TSMessageAdapaters/TSMessageAdapter.m | 1 + Signal/src/Models/TSMessageAdapaters/TSPhotoAdapter.m | 3 ++- .../src/Models/TSMessageAdapaters/TSVideoAttachmentAdapter.m | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Signal/src/Models/TSMessageAdapaters/TSMessageAdapter.m b/Signal/src/Models/TSMessageAdapaters/TSMessageAdapter.m index 9ca47dd0f..1afcff056 100644 --- a/Signal/src/Models/TSMessageAdapaters/TSMessageAdapter.m +++ b/Signal/src/Models/TSMessageAdapaters/TSMessageAdapter.m @@ -312,6 +312,7 @@ NS_ASSUME_NONNULL_BEGIN actionString, self.interaction.uniqueId, [self.mediaItem class]); + OWSAssert(NO); } - (TSAttachmentStream *)attachmentStream diff --git a/Signal/src/Models/TSMessageAdapaters/TSPhotoAdapter.m b/Signal/src/Models/TSMessageAdapaters/TSPhotoAdapter.m index 0788b35d9..32e2ea221 100644 --- a/Signal/src/Models/TSMessageAdapaters/TSPhotoAdapter.m +++ b/Signal/src/Models/TSMessageAdapaters/TSPhotoAdapter.m @@ -124,9 +124,10 @@ NS_ASSUME_NONNULL_BEGIN UIImageWriteToSavedPhotosAlbum(self.image, nil, nil, nil); return; } - + // Shouldn't get here, as only supported actions should be exposed via canPerformEditingAction DDLogError(@"'%@' action unsupported for %@: attachmentId=%@", actionString, self.class, self.attachmentId); + OWSAssert(NO); } @end diff --git a/Signal/src/Models/TSMessageAdapaters/TSVideoAttachmentAdapter.m b/Signal/src/Models/TSMessageAdapaters/TSVideoAttachmentAdapter.m index c5db763e3..e92c304f2 100644 --- a/Signal/src/Models/TSMessageAdapaters/TSVideoAttachmentAdapter.m +++ b/Signal/src/Models/TSMessageAdapaters/TSVideoAttachmentAdapter.m @@ -275,6 +275,7 @@ NS_ASSUME_NONNULL_BEGIN NSString *actionString = NSStringFromSelector(action); DDLogError( @"Unexpected action: %@ for VideoAttachmentAdapter with contentType: %@", actionString, self.contentType); + OWSAssert(NO); } } From 032cf0d953ffbf95c0ebf4c42028f2503da00908 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 11 Apr 2017 12:14:59 -0400 Subject: [PATCH 2/2] sharing via message view is legible // FREEBIE --- .../src/ViewControllers/AttachmentSharing.m | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/Signal/src/ViewControllers/AttachmentSharing.m b/Signal/src/ViewControllers/AttachmentSharing.m index 82e8cc0bf..53209ef62 100644 --- a/Signal/src/ViewControllers/AttachmentSharing.m +++ b/Signal/src/ViewControllers/AttachmentSharing.m @@ -4,6 +4,7 @@ #import "AttachmentSharing.h" #import "TSAttachmentStream.h" +#import "UIUtil.h" @implementation AttachmentSharing @@ -24,19 +25,22 @@ ] applicationActivities:@[ ]]; - + [activityViewController setCompletionWithItemsHandler:^(UIActivityType __nullable activityType, - BOOL completed, - NSArray * __nullable returnedItems, - NSError * __nullable activityError) { - + BOOL completed, + NSArray *__nullable returnedItems, + NSError *__nullable activityError) { + + DDLogDebug(@"%@ applying signal appearence", self.tag); + [UIUtil applySignalAppearence]; + if (activityError) { DDLogInfo(@"%@ Failed to share with activityError: %@", self.tag, activityError); } else if (completed) { DDLogInfo(@"%@ Did share with activityType: %@", self.tag, activityType); } }]; - + // Find the frontmost presented UIViewController from which to present the // share view. UIWindow *window = [UIApplication sharedApplication].keyWindow; @@ -47,7 +51,10 @@ OWSAssert(fromViewController); [fromViewController presentViewController:activityViewController animated:YES - completion:nil]; + completion:^{ + DDLogDebug(@"%@ applying default system appearence", self.tag); + [UIUtil applyDefaultSystemAppearence]; + }]; } #pragma mark - Logging