From 4ff2c0d6683d92af6cd6c613dd37f49be6697ab0 Mon Sep 17 00:00:00 2001 From: nielsandriesse Date: Wed, 4 Nov 2020 14:18:15 +1100 Subject: [PATCH] Limit voice messages to one minute --- Signal.xcodeproj/project.pbxproj | 8 -------- .../Components/MentionCandidateSelectionView.swift | 7 +++++++ .../MentionCandidateSelectionViewDelegate.swift | 6 ------ Signal/src/Loki/Components/SeedReminderView.swift | 6 ++++++ .../Loki/Components/SeedReminderViewDelegate.swift | 5 ----- .../ConversationView/ConversationViewController.m | 11 +++++++++++ 6 files changed, 24 insertions(+), 19 deletions(-) delete mode 100644 Signal/src/Loki/Components/MentionCandidateSelectionViewDelegate.swift delete mode 100644 Signal/src/Loki/Components/SeedReminderViewDelegate.swift diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 529589fe3..fe8cc044f 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -524,7 +524,6 @@ B846365B22B7418B00AF1514 /* Identicon+ObjC.swift in Sources */ = {isa = PBXBuildFile; fileRef = B846365A22B7418B00AF1514 /* Identicon+ObjC.swift */; }; B84664F5235022F30083A1CD /* MentionUtilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = B84664F4235022F30083A1CD /* MentionUtilities.swift */; }; B85357BF23A1AE0800AAF6CD /* SeedReminderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B85357BE23A1AE0800AAF6CD /* SeedReminderView.swift */; }; - B85357C123A1B81900AAF6CD /* SeedReminderViewDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B85357C023A1B81900AAF6CD /* SeedReminderViewDelegate.swift */; }; B85357C323A1BD1200AAF6CD /* SeedVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = B85357C223A1BD1200AAF6CD /* SeedVC.swift */; }; B85357C523A1F13800AAF6CD /* LinkDeviceVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = B85357C423A1F13800AAF6CD /* LinkDeviceVC.swift */; }; B85357C723A1FB5100AAF6CD /* LinkDeviceVCDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B85357C623A1FB5100AAF6CD /* LinkDeviceVCDelegate.swift */; }; @@ -544,7 +543,6 @@ B894D0712339D6F300B4D94D /* DeviceLinkingModalDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B894D0702339D6F300B4D94D /* DeviceLinkingModalDelegate.swift */; }; B894D0752339EDCF00B4D94D /* NukeDataModal.swift in Sources */ = {isa = PBXBuildFile; fileRef = B894D0742339EDCF00B4D94D /* NukeDataModal.swift */; }; B8B26C8F234D629C004ED98C /* MentionCandidateSelectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8B26C8E234D629C004ED98C /* MentionCandidateSelectionView.swift */; }; - B8B26C91234D8CBD004ED98C /* MentionCandidateSelectionViewDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8B26C90234D8CBD004ED98C /* MentionCandidateSelectionViewDelegate.swift */; }; B8B5BCEC2394D869003823C9 /* Button.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8B5BCEB2394D869003823C9 /* Button.swift */; }; B8BB82A5238F627000BA5194 /* HomeVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8BB82A4238F627000BA5194 /* HomeVC.swift */; }; B8BB82AB238F669C00BA5194 /* ConversationCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8BB82AA238F669C00BA5194 /* ConversationCell.swift */; }; @@ -1323,7 +1321,6 @@ B84664F4235022F30083A1CD /* MentionUtilities.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MentionUtilities.swift; sourceTree = ""; }; B847570023D568EB00759540 /* SignalServiceKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = SignalServiceKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; B85357BE23A1AE0800AAF6CD /* SeedReminderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SeedReminderView.swift; sourceTree = ""; }; - B85357C023A1B81900AAF6CD /* SeedReminderViewDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SeedReminderViewDelegate.swift; sourceTree = ""; }; B85357C223A1BD1200AAF6CD /* SeedVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SeedVC.swift; sourceTree = ""; }; B85357C423A1F13800AAF6CD /* LinkDeviceVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LinkDeviceVC.swift; sourceTree = ""; }; B85357C623A1FB5100AAF6CD /* LinkDeviceVCDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LinkDeviceVCDelegate.swift; sourceTree = ""; }; @@ -1344,7 +1341,6 @@ B894D0702339D6F300B4D94D /* DeviceLinkingModalDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeviceLinkingModalDelegate.swift; sourceTree = ""; }; B894D0742339EDCF00B4D94D /* NukeDataModal.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NukeDataModal.swift; sourceTree = ""; }; B8B26C8E234D629C004ED98C /* MentionCandidateSelectionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MentionCandidateSelectionView.swift; sourceTree = ""; }; - B8B26C90234D8CBD004ED98C /* MentionCandidateSelectionViewDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MentionCandidateSelectionViewDelegate.swift; sourceTree = ""; }; B8B5BCEB2394D869003823C9 /* Button.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Button.swift; sourceTree = ""; }; B8BB829F238F322400BA5194 /* Colors.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Colors.swift; sourceTree = ""; }; B8BB82A1238F356100BA5194 /* Values.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Values.swift; sourceTree = ""; }; @@ -2683,13 +2679,11 @@ B82B4093239DF15900A248E7 /* ConversationTitleView.swift */, B82B40892399EC0600A248E7 /* FakeChatView.swift */, B8B26C8E234D629C004ED98C /* MentionCandidateSelectionView.swift */, - B8B26C90234D8CBD004ED98C /* MentionCandidateSelectionViewDelegate.swift */, B83F2B85240C7B8F000A54AB /* NewConversationButtonSet.swift */, B879D44A247E1D9200DB3608 /* PathStatusView.swift */, C353F8F8244809150011121A /* PNOptionView.swift */, B8BB82B02390C37000BA5194 /* SearchBar.swift */, B85357BE23A1AE0800AAF6CD /* SeedReminderView.swift */, - B85357C023A1B81900AAF6CD /* SeedReminderViewDelegate.swift */, B8BB82B82394911B00BA5194 /* Separator.swift */, 2400888D239F30A600305217 /* SessionRestorationView.swift */, B8CCF638239721E20091D419 /* TabBar.swift */, @@ -3841,7 +3835,6 @@ 340FC8BA204DAC8D007AEB0F /* FingerprintViewScanController.m in Sources */, C396DAF32518408B00FF6DC5 /* Description.swift in Sources */, 4585C4681ED8F8D200896AEA /* SafetyNumberConfirmationAlert.swift in Sources */, - B85357C123A1B81900AAF6CD /* SeedReminderViewDelegate.swift in Sources */, 450D19131F85236600970622 /* RemoteVideoView.m in Sources */, 34129B8621EF877A005457A8 /* LinkPreviewView.swift in Sources */, 34386A54207D271D009F5D9C /* NeverClearView.swift in Sources */, @@ -3960,7 +3953,6 @@ 45FBC5C81DF8575700E9B410 /* CallKitCallManager.swift in Sources */, 4539B5861F79348F007141FF /* PushRegistrationManager.swift in Sources */, 45FBC5D11DF8592E00E9B410 /* SignalCall.swift in Sources */, - B8B26C91234D8CBD004ED98C /* MentionCandidateSelectionViewDelegate.swift in Sources */, C396DAF22518408B00FF6DC5 /* NamedView.swift in Sources */, 340FC8BB204DAC8D007AEB0F /* OWSAddToContactViewController.m in Sources */, 45F32C232057297A00A300D5 /* MediaPageViewController.swift in Sources */, diff --git a/Signal/src/Loki/Components/MentionCandidateSelectionView.swift b/Signal/src/Loki/Components/MentionCandidateSelectionView.swift index 81e2dd95e..bfbd85297 100644 --- a/Signal/src/Loki/Components/MentionCandidateSelectionView.swift +++ b/Signal/src/Loki/Components/MentionCandidateSelectionView.swift @@ -172,3 +172,10 @@ private extension MentionCandidateSelectionView { } } } + +// MARK: Delegate +@objc(LKMentionCandidateSelectionViewDelegate) +protocol MentionCandidateSelectionViewDelegate { + + func handleMentionCandidateSelected(_ mentionCandidate: Mention, from mentionCandidateSelectionView: MentionCandidateSelectionView) +} diff --git a/Signal/src/Loki/Components/MentionCandidateSelectionViewDelegate.swift b/Signal/src/Loki/Components/MentionCandidateSelectionViewDelegate.swift deleted file mode 100644 index f20df4060..000000000 --- a/Signal/src/Loki/Components/MentionCandidateSelectionViewDelegate.swift +++ /dev/null @@ -1,6 +0,0 @@ - -@objc(LKMentionCandidateSelectionViewDelegate) -protocol MentionCandidateSelectionViewDelegate { - - func handleMentionCandidateSelected(_ mentionCandidate: Mention, from mentionCandidateSelectionView: MentionCandidateSelectionView) -} diff --git a/Signal/src/Loki/Components/SeedReminderView.swift b/Signal/src/Loki/Components/SeedReminderView.swift index 05326b5a6..0ff748461 100644 --- a/Signal/src/Loki/Components/SeedReminderView.swift +++ b/Signal/src/Loki/Components/SeedReminderView.swift @@ -94,3 +94,9 @@ final class SeedReminderView : UIView { delegate?.handleContinueButtonTapped(from: self) } } + +// MARK: Delegate +protocol SeedReminderViewDelegate { + + func handleContinueButtonTapped(from seedReminderView: SeedReminderView) +} diff --git a/Signal/src/Loki/Components/SeedReminderViewDelegate.swift b/Signal/src/Loki/Components/SeedReminderViewDelegate.swift deleted file mode 100644 index a67e685a0..000000000 --- a/Signal/src/Loki/Components/SeedReminderViewDelegate.swift +++ /dev/null @@ -1,5 +0,0 @@ - -protocol SeedReminderViewDelegate { - - func handleContinueButtonTapped(from seedReminderView: SeedReminderView) -} diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 69f6d070c..7e8c108cc 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -154,6 +154,7 @@ typedef enum : NSUInteger { @property (nonatomic, readonly) ConversationStyle *conversationStyle; @property (nonatomic, nullable) AVAudioRecorder *audioRecorder; +@property (nonatomic, nullable) NSTimer *audioTimer; @property (nonatomic, nullable) OWSAudioPlayer *audioAttachmentPlayer; @property (nonatomic, nullable) NSUUID *voiceMessageUUID; @@ -3351,6 +3352,13 @@ typedef enum : NSUInteger { AVEncoderBitRateKey : @(128 * 1024), } error:&error]; + + __weak ConversationViewController *weakSelf = self; + self.audioTimer = [NSTimer scheduledTimerWithTimeInterval:60 repeats:NO block:^(NSTimer *timer) { + [[weakSelf inputToolbar] hideVoiceMemoUI:YES]; + [weakSelf endRecordingVoiceMemo]; + }]; + if (error) { OWSFailDebug(@"Couldn't create audioRecorder: %@", error); [self cancelVoiceMemo]; @@ -3378,6 +3386,8 @@ typedef enum : NSUInteger { OWSLogInfo(@"endRecordingVoiceMemo"); + [self.audioTimer invalidate]; + self.voiceMessageUUID = nil; if (!self.audioRecorder) { @@ -3443,6 +3453,7 @@ typedef enum : NSUInteger { OWSAssertIsOnMainThread(); OWSLogDebug(@"cancelRecordingVoiceMemo"); + [self.audioTimer invalidate]; [self stopRecording]; self.audioRecorder = nil; self.voiceMessageUUID = nil;