Merge branch 'mkirk/fix-share'

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

Signal/src/Models/TSMessageAdapaters/TSPhotoAdapter.m

@@ -127,6 +127,7 @@ NS_ASSUME_NONNULL_BEGIN
     
     // 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

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);
     }
 }
 

Signal/src/ViewControllers/AttachmentSharing.m

@@ -4,6 +4,7 @@
 
 #import "AttachmentSharing.h"
 #import "TSAttachmentStream.h"
+#import "UIUtil.h"
 
 @implementation AttachmentSharing
 
@@ -27,8 +28,11 @@
 
     [activityViewController setCompletionWithItemsHandler:^(UIActivityType __nullable activityType,
         BOOL completed,
-                                                            NSArray * __nullable returnedItems,
-                                                            NSError * __nullable activityError) {
+        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);
@@ -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