From a8c7f517ebe6e7968c69c4788e27b257482567b5 Mon Sep 17 00:00:00 2001 From: Ryan Zhao Date: Thu, 24 Feb 2022 15:39:07 +1100 Subject: [PATCH] clean --- Session.xcodeproj/project.pbxproj | 8 -- .../Backups/OWSBackupSettingsViewController.m | 1 - .../MediaDetailViewController.m | 1 - Session/Meta/Signal-Bridging-Header.h | 1 - .../AttachmentSharing.h | 33 ----- .../AttachmentSharing.m | 120 ------------------ SignalUtilitiesKit/Meta/SignalUtilitiesKit.h | 1 - 7 files changed, 165 deletions(-) delete mode 100644 SignalUtilitiesKit/Media Viewing & Editing/AttachmentSharing.h delete mode 100644 SignalUtilitiesKit/Media Viewing & Editing/AttachmentSharing.m diff --git a/Session.xcodeproj/project.pbxproj b/Session.xcodeproj/project.pbxproj index 582c31a62..bb4c643ff 100644 --- a/Session.xcodeproj/project.pbxproj +++ b/Session.xcodeproj/project.pbxproj @@ -530,8 +530,6 @@ C38EF00C255B61CC007E1867 /* SignalUtilitiesKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C33FD9AB255A548A00E217F9 /* SignalUtilitiesKit.framework */; }; C38EF216255B6D3B007E1867 /* Theme.h in Headers */ = {isa = PBXBuildFile; fileRef = C38EF212255B6D3A007E1867 /* Theme.h */; settings = {ATTRIBUTES = (Public, ); }; }; C38EF218255B6D3B007E1867 /* Theme.m in Sources */ = {isa = PBXBuildFile; fileRef = C38EF214255B6D3A007E1867 /* Theme.m */; }; - C38EF228255B6D5D007E1867 /* AttachmentSharing.m in Sources */ = {isa = PBXBuildFile; fileRef = C38EF223255B6D5D007E1867 /* AttachmentSharing.m */; }; - C38EF22A255B6D5D007E1867 /* AttachmentSharing.h in Headers */ = {isa = PBXBuildFile; fileRef = C38EF225255B6D5D007E1867 /* AttachmentSharing.h */; settings = {ATTRIBUTES = (Public, ); }; }; C38EF22B255B6D5D007E1867 /* ShareViewDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C38EF226255B6D5D007E1867 /* ShareViewDelegate.swift */; }; C38EF22C255B6D5D007E1867 /* OWSVideoPlayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = C38EF227255B6D5D007E1867 /* OWSVideoPlayer.swift */; }; C38EF243255B6D67007E1867 /* UIViewController+OWS.h in Headers */ = {isa = PBXBuildFile; fileRef = C38EF236255B6D65007E1867 /* UIViewController+OWS.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -1541,9 +1539,7 @@ C38EEF09255B49A8007E1867 /* SNProtoEnvelope+Conversion.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SNProtoEnvelope+Conversion.swift"; sourceTree = ""; }; C38EF212255B6D3A007E1867 /* Theme.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Theme.h; path = SignalUtilitiesKit/Utilities/Theme.h; sourceTree = SOURCE_ROOT; }; C38EF214255B6D3A007E1867 /* Theme.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Theme.m; path = SignalUtilitiesKit/Utilities/Theme.m; sourceTree = SOURCE_ROOT; }; - C38EF223255B6D5D007E1867 /* AttachmentSharing.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AttachmentSharing.m; path = "SignalUtilitiesKit/Media Viewing & Editing/AttachmentSharing.m"; sourceTree = SOURCE_ROOT; }; C38EF224255B6D5D007E1867 /* SignalAttachment.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SignalAttachment.swift; path = "SessionMessagingKit/Sending & Receiving/Attachments/SignalAttachment.swift"; sourceTree = SOURCE_ROOT; }; - C38EF225255B6D5D007E1867 /* AttachmentSharing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AttachmentSharing.h; path = "SignalUtilitiesKit/Media Viewing & Editing/AttachmentSharing.h"; sourceTree = SOURCE_ROOT; }; C38EF226255B6D5D007E1867 /* ShareViewDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ShareViewDelegate.swift; path = SignalUtilitiesKit/Utilities/ShareViewDelegate.swift; sourceTree = SOURCE_ROOT; }; C38EF227255B6D5D007E1867 /* OWSVideoPlayer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = OWSVideoPlayer.swift; path = "SignalUtilitiesKit/Media Viewing & Editing/OWSVideoPlayer.swift"; sourceTree = SOURCE_ROOT; }; C38EF236255B6D65007E1867 /* UIViewController+OWS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIViewController+OWS.h"; path = "SignalUtilitiesKit/Utilities/UIViewController+OWS.h"; sourceTree = SOURCE_ROOT; }; @@ -2966,8 +2962,6 @@ children = ( C379DCEA2567334F0002D4EB /* Attachment Approval */, C379DCE9256733390002D4EB /* Image Editing */, - C38EF225255B6D5D007E1867 /* AttachmentSharing.h */, - C38EF223255B6D5D007E1867 /* AttachmentSharing.m */, C38EF358255B6DCC007E1867 /* MediaMessageView.swift */, C38EF357255B6DCC007E1867 /* MessageApprovalViewController.swift */, C38EF227255B6D5D007E1867 /* OWSVideoPlayer.swift */, @@ -3633,7 +3627,6 @@ C38EF24C255B6D67007E1867 /* NSAttributedString+OWS.h in Headers */, C38EF32B255B6DBF007E1867 /* OWSFormat.h in Headers */, C33FDC2C255A581F00E217F9 /* OWSFailedAttachmentDownloadsJob.h in Headers */, - C38EF22A255B6D5D007E1867 /* AttachmentSharing.h in Headers */, C33FDDB8255A582000E217F9 /* NSSet+Functional.h in Headers */, C33FDDCC255A582000E217F9 /* TSConstants.h in Headers */, C33FDDBD255A582000E217F9 /* ByteParser.h in Headers */, @@ -4528,7 +4521,6 @@ C38EF3BF255B6DE7007E1867 /* ImageEditorView.swift in Sources */, C38EF365255B6DCC007E1867 /* OWSTableViewController.m in Sources */, C38EF36B255B6DCC007E1867 /* ScreenLockViewController.m in Sources */, - C38EF228255B6D5D007E1867 /* AttachmentSharing.m in Sources */, C38EF40C255B6DF7007E1867 /* GradientView.swift in Sources */, C38EF35C255B6DCC007E1867 /* SelectThreadViewController.m in Sources */, C38EF30E255B6DBF007E1867 /* FullTextSearcher.swift in Sources */, diff --git a/Session/Backups/OWSBackupSettingsViewController.m b/Session/Backups/OWSBackupSettingsViewController.m index 575d4a281..b65b2c47a 100644 --- a/Session/Backups/OWSBackupSettingsViewController.m +++ b/Session/Backups/OWSBackupSettingsViewController.m @@ -7,7 +7,6 @@ #import "Session-Swift.h" #import -#import #import #import #import diff --git a/Session/Media Viewing & Editing/MediaDetailViewController.m b/Session/Media Viewing & Editing/MediaDetailViewController.m index 446000b80..a0ea5793d 100644 --- a/Session/Media Viewing & Editing/MediaDetailViewController.m +++ b/Session/Media Viewing & Editing/MediaDetailViewController.m @@ -3,7 +3,6 @@ // #import "MediaDetailViewController.h" -#import "AttachmentSharing.h" #import "ConversationViewItem.h" #import "Session-Swift.h" #import "TSAttachmentStream.h" diff --git a/Session/Meta/Signal-Bridging-Header.h b/Session/Meta/Signal-Bridging-Header.h index 956c13505..9c6c9160d 100644 --- a/Session/Meta/Signal-Bridging-Header.h +++ b/Session/Meta/Signal-Bridging-Header.h @@ -40,7 +40,6 @@ #import #import #import -#import #import #import #import diff --git a/SignalUtilitiesKit/Media Viewing & Editing/AttachmentSharing.h b/SignalUtilitiesKit/Media Viewing & Editing/AttachmentSharing.h deleted file mode 100644 index e3454b5e1..000000000 --- a/SignalUtilitiesKit/Media Viewing & Editing/AttachmentSharing.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. -// - -NS_ASSUME_NONNULL_BEGIN - -@class TSAttachmentStream; - -typedef void (^AttachmentSharingCompletion)(UIActivityType __nullable activityType); - -@interface AttachmentSharing : NSObject - -+ (void)showShareUIForAttachments:(NSArray *)attachmentStreams - completion:(nullable AttachmentSharingCompletion)completion; - -+ (void)showShareUIForAttachment:(TSAttachmentStream *)stream; -+ (void)showShareUIForAttachment:(TSAttachmentStream *)stream completion:(nullable AttachmentSharingCompletion)completion; - -+ (void)showShareUIForURL:(NSURL *)url; -+ (void)showShareUIForURL:(NSURL *)url completion:(nullable AttachmentSharingCompletion)completion; - -+ (void)showShareUIForURLs:(NSArray *)urls completion:(nullable AttachmentSharingCompletion)completion; - -+ (void)showShareUIForText:(NSString *)text; -+ (void)showShareUIForText:(NSString *)text completion:(nullable AttachmentSharingCompletion)completion; - -#ifdef DEBUG -+ (void)showShareUIForUIImage:(UIImage *)image; -#endif - -@end - -NS_ASSUME_NONNULL_END diff --git a/SignalUtilitiesKit/Media Viewing & Editing/AttachmentSharing.m b/SignalUtilitiesKit/Media Viewing & Editing/AttachmentSharing.m deleted file mode 100644 index 770342426..000000000 --- a/SignalUtilitiesKit/Media Viewing & Editing/AttachmentSharing.m +++ /dev/null @@ -1,120 +0,0 @@ -// -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. -// - -#import "AttachmentSharing.h" -#import "UIUtil.h" -#import -#import - -NS_ASSUME_NONNULL_BEGIN - -@implementation AttachmentSharing - -+ (void)showShareUIForAttachments:(NSArray *)attachmentStreams - completion:(nullable AttachmentSharingCompletion)completion -{ - OWSAssertDebug(attachmentStreams.count > 0); - - NSMutableArray *urls = [NSMutableArray new]; - for (TSAttachmentStream *attachmentStream in attachmentStreams) { - [urls addObject:attachmentStream.originalMediaURL]; - } - - [AttachmentSharing showShareUIForActivityItems:urls completion:completion]; -} - -+ (void)showShareUIForAttachment:(TSAttachmentStream *)stream -{ - OWSAssertDebug(stream); - - [self showShareUIForAttachment:stream completion:nil]; -} - -+ (void)showShareUIForAttachment:(TSAttachmentStream *)stream completion:(nullable AttachmentSharingCompletion)completion -{ - OWSAssertDebug(stream); - - [self showShareUIForURL:stream.originalMediaURL completion:completion]; -} - -+ (void)showShareUIForURL:(NSURL *)url -{ - [self showShareUIForURL:url completion:nil]; -} - -+ (void)showShareUIForURL:(NSURL *)url completion:(nullable AttachmentSharingCompletion)completion -{ - OWSAssertDebug(url); - - [AttachmentSharing showShareUIForActivityItems:@[ url ] - completion:completion]; -} - -+ (void)showShareUIForURLs:(NSArray *)urls completion:(nullable AttachmentSharingCompletion)completion -{ - OWSAssertDebug(urls.count > 0); - - [AttachmentSharing showShareUIForActivityItems:urls - completion:completion]; -} - -+ (void)showShareUIForText:(NSString *)text -{ - [self showShareUIForText:text completion:nil]; -} - -+ (void)showShareUIForText:(NSString *)text completion:(nullable AttachmentSharingCompletion)completion -{ - OWSAssertDebug(text); - - [AttachmentSharing showShareUIForActivityItems:@[ text, ] - completion:completion]; -} - -#ifdef DEBUG -+ (void)showShareUIForUIImage:(UIImage *)image -{ - OWSAssertDebug(image); - - [AttachmentSharing showShareUIForActivityItems:@[ image, ] - completion:nil]; -} -#endif - -+ (void)showShareUIForActivityItems:(NSArray *)activityItems completion:(nullable AttachmentSharingCompletion)completion -{ - OWSAssertDebug(activityItems); - - DispatchMainThreadSafe(^{ - UIActivityViewController *activityViewController = - [[UIActivityViewController alloc] initWithActivityItems:activityItems applicationActivities:@[]]; - - [activityViewController setCompletionWithItemsHandler:^(UIActivityType __nullable activityType, - BOOL completed, - NSArray *__nullable returnedItems, - NSError *__nullable activityError) { - - if (activityError) { - OWSLogInfo(@"Failed to share with activityError: %@", activityError); - } else if (completed) { - OWSLogInfo(@"Did share with activityType: %@", activityType); - } - - if (completion) { - DispatchMainThreadSafe(^{ completion(activityType); }); - } - }]; - - UIViewController *fromViewController = CurrentAppContext().frontmostViewController; - while (fromViewController.presentedViewController) { - fromViewController = fromViewController.presentedViewController; - } - OWSAssertDebug(fromViewController); - [fromViewController presentViewController:activityViewController animated:YES completion:nil]; - }); -} - -@end - -NS_ASSUME_NONNULL_END diff --git a/SignalUtilitiesKit/Meta/SignalUtilitiesKit.h b/SignalUtilitiesKit/Meta/SignalUtilitiesKit.h index 1d2cedbc2..cb360a0bc 100644 --- a/SignalUtilitiesKit/Meta/SignalUtilitiesKit.h +++ b/SignalUtilitiesKit/Meta/SignalUtilitiesKit.h @@ -9,7 +9,6 @@ FOUNDATION_EXPORT const unsigned char SignalUtilitiesKitVersionString[]; #import #import -#import #import #import #import