Merge branch 'mkirk/fix-share'

pull/1/head
Michael Kirk 8 years ago
commit 37d408cc74

@ -312,6 +312,7 @@ NS_ASSUME_NONNULL_BEGIN
actionString, actionString,
self.interaction.uniqueId, self.interaction.uniqueId,
[self.mediaItem class]); [self.mediaItem class]);
OWSAssert(NO);
} }
- (TSAttachmentStream *)attachmentStream - (TSAttachmentStream *)attachmentStream

@ -127,6 +127,7 @@ NS_ASSUME_NONNULL_BEGIN
// Shouldn't get here, as only supported actions should be exposed via canPerformEditingAction // Shouldn't get here, as only supported actions should be exposed via canPerformEditingAction
DDLogError(@"'%@' action unsupported for %@: attachmentId=%@", actionString, self.class, self.attachmentId); DDLogError(@"'%@' action unsupported for %@: attachmentId=%@", actionString, self.class, self.attachmentId);
OWSAssert(NO);
} }
@end @end

@ -275,6 +275,7 @@ NS_ASSUME_NONNULL_BEGIN
NSString *actionString = NSStringFromSelector(action); NSString *actionString = NSStringFromSelector(action);
DDLogError( DDLogError(
@"Unexpected action: %@ for VideoAttachmentAdapter with contentType: %@", actionString, self.contentType); @"Unexpected action: %@ for VideoAttachmentAdapter with contentType: %@", actionString, self.contentType);
OWSAssert(NO);
} }
} }

@ -4,6 +4,7 @@
#import "AttachmentSharing.h" #import "AttachmentSharing.h"
#import "TSAttachmentStream.h" #import "TSAttachmentStream.h"
#import "UIUtil.h"
@implementation AttachmentSharing @implementation AttachmentSharing
@ -30,6 +31,9 @@
NSArray *__nullable returnedItems, NSArray *__nullable returnedItems,
NSError *__nullable activityError) { NSError *__nullable activityError) {
DDLogDebug(@"%@ applying signal appearence", self.tag);
[UIUtil applySignalAppearence];
if (activityError) { if (activityError) {
DDLogInfo(@"%@ Failed to share with activityError: %@", self.tag, activityError); DDLogInfo(@"%@ Failed to share with activityError: %@", self.tag, activityError);
} else if (completed) { } else if (completed) {
@ -47,7 +51,10 @@
OWSAssert(fromViewController); OWSAssert(fromViewController);
[fromViewController presentViewController:activityViewController [fromViewController presentViewController:activityViewController
animated:YES animated:YES
completion:nil]; completion:^{
DDLogDebug(@"%@ applying default system appearence", self.tag);
[UIUtil applyDefaultSystemAppearence];
}];
} }
#pragma mark - Logging #pragma mark - Logging

Loading…
Cancel
Save