Merge tag '2.21.0.9'

Author: michaelkirk

Scripts/debug_log_upload.py

@@ -28,10 +28,13 @@ def execute_command(command):
         print e.output
         sys.exit(1)
 
-        
+def add_field(curl_command, form_key, form_value):
+    curl_command.append('-F')
+    curl_command.append("%s=%s" % (form_key, form_value))
+
 if __name__ == '__main__':
     parser = argparse.ArgumentParser(description='Precommit cleanup script.')
-    parser.add_argument('--file', help='used for starting a new version.')
+    parser.add_argument('--file', required=True, help='used for starting a new version.')
 
     args = parser.parse_args()
 
@@ -41,24 +44,30 @@ def execute_command(command):
 
     upload_url = params['url']
     upload_fields = params['fields']
-    upload_key = upload_fields['key']
+
+    upload_key = upload_fields.pop('key')
     upload_key = upload_key + os.path.splitext(args.file)[1]
-    upload_fields['key'] = upload_key
 
     download_url = 'https://debuglogs.org/' + upload_key
     print 'download_url:', download_url
 
     curl_command = ['curl', '-v', '-i', '-X', 'POST']
+
+    # key must appear before other fields
+    add_field(curl_command, 'key', upload_key)
     for field_name in upload_fields:
-        field_value = upload_fields[field_name]
-        curl_command.append('-F')
-        curl_command.append("'%s=%s'" % (field_name, field_value, ))
+        add_field(curl_command, field_name, upload_fields[field_name])
+
+    add_field(curl_command, "content-type", "application/octet-stream")
+ 
     curl_command.append('-F')
-    curl_command.append("'file=@%s'" % (args.file,))
+    curl_command.append("file=@%s" % (args.file,))
     curl_command.append(upload_url)
 
-    # execute_command(curl_command)
     print ' '.join(curl_command)
 
+    print 'Running...'
+    execute_command(curl_command)
+
     print 'download_url:', download_url
-    
+    

Signal.xcodeproj/project.pbxproj

@@ -305,6 +305,8 @@
 		458E38371D668EBF0094BD24 /* OWSDeviceProvisioningURLParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 458E38361D668EBF0094BD24 /* OWSDeviceProvisioningURLParser.m */; };
 		458E383A1D6699FA0094BD24 /* OWSDeviceProvisioningURLParserTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 458E38391D6699FA0094BD24 /* OWSDeviceProvisioningURLParserTest.m */; };
 		459311FC1D75C948008DD4F0 /* OWSDeviceTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 459311FB1D75C948008DD4F0 /* OWSDeviceTableViewCell.m */; };
+		4598198E204E2F28009414F2 /* OWS108CallLoggingPreference.h in Headers */ = {isa = PBXBuildFile; fileRef = 4598198C204E2F28009414F2 /* OWS108CallLoggingPreference.h */; };
+		4598198F204E2F28009414F2 /* OWS108CallLoggingPreference.m in Sources */ = {isa = PBXBuildFile; fileRef = 4598198D204E2F28009414F2 /* OWS108CallLoggingPreference.m */; };
 		45A2F005204473A3002E978A /* NewMessage.aifc in Resources */ = {isa = PBXBuildFile; fileRef = 45A2F004204473A3002E978A /* NewMessage.aifc */; };
 		45A663C51F92EC760027B59E /* GroupTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45A663C41F92EC760027B59E /* GroupTableViewCell.swift */; };
 		45A6DAD61EBBF85500893231 /* ReminderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45A6DAD51EBBF85500893231 /* ReminderView.swift */; };
@@ -886,6 +888,8 @@
 		459311FB1D75C948008DD4F0 /* OWSDeviceTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSDeviceTableViewCell.m; sourceTree = "<group>"; };
 		4597E94E1D8313C100040CDE /* sq */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sq; path = translations/sq.lproj/Localizable.strings; sourceTree = "<group>"; };
 		4597E94F1D8313CB00040CDE /* bg */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = bg; path = translations/bg.lproj/Localizable.strings; sourceTree = "<group>"; };
+		4598198C204E2F28009414F2 /* OWS108CallLoggingPreference.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OWS108CallLoggingPreference.h; sourceTree = "<group>"; };
+		4598198D204E2F28009414F2 /* OWS108CallLoggingPreference.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OWS108CallLoggingPreference.m; sourceTree = "<group>"; };
 		45A2F004204473A3002E978A /* NewMessage.aifc */ = {isa = PBXFileReference; lastKnownFileType = file; name = NewMessage.aifc; path = Signal/AudioFiles/NewMessage.aifc; sourceTree = SOURCE_ROOT; };
 		45A663C41F92EC760027B59E /* GroupTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupTableViewCell.swift; sourceTree = "<group>"; };
 		45A6DAD51EBBF85500893231 /* ReminderView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReminderView.swift; sourceTree = "<group>"; };
@@ -1357,6 +1361,8 @@
 				346129F11FD5F31400532771 /* OWS106EnsureProfileComplete.swift */,
 				4503F1C2204711D200CEE724 /* OWS107LegacySounds.h */,
 				4503F1C1204711D200CEE724 /* OWS107LegacySounds.m */,
+				4598198C204E2F28009414F2 /* OWS108CallLoggingPreference.h */,
+				4598198D204E2F28009414F2 /* OWS108CallLoggingPreference.m */,
 				346129931FD1E30000532771 /* OWSDatabaseMigration.h */,
 				346129941FD1E30000532771 /* OWSDatabaseMigration.m */,
 				346129E51FD5C0C600532771 /* OWSDatabaseMigrationRunner.h */,
@@ -2214,6 +2220,7 @@
 				34480B611FD0A98800BC14EF /* UIColor+OWS.h in Headers */,
 				453518961FC63DBF00210559 /* SignalMessaging.h in Headers */,
 				3461295A1FD1D74C00532771 /* Environment.h in Headers */,
+				4598198E204E2F28009414F2 /* OWS108CallLoggingPreference.h in Headers */,
 				34480B631FD0A98800BC14EF /* UIView+OWS.h in Headers */,
 				451F8A4B1FD715E1005CB9DA /* OWSGroupAvatarBuilder.h in Headers */,
 				347850721FDAEB17007B8332 /* OWSUserProfile.h in Headers */,
@@ -2997,6 +3004,7 @@
 				451F8A481FD715BA005CB9DA /* OWSContactAvatarBuilder.m in Sources */,
 				4503F1C3204711D300CEE724 /* OWS107LegacySounds.m in Sources */,
 				346129A61FD1F09100532771 /* OWSContactsManager.m in Sources */,
+				4598198F204E2F28009414F2 /* OWS108CallLoggingPreference.m in Sources */,
 				346129D21FD2085A00532771 /* CommonStrings.swift in Sources */,
 				45F59A082028E4FB00E8D2B0 /* OWSAudioSession.swift in Sources */,
 				34612A071FD7238600532771 /* OWSContactsSyncing.m in Sources */,

Signal/Signal-Info.plist

@@ -38,7 +38,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2.21.0.5</string>
+	<string>2.21.0.9</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LOGS_EMAIL</key>

Signal/src/ViewControllers/ConversationView/ConversationViewController.m

@@ -3203,7 +3203,7 @@ - (void)startRecordingVoiceMemo
     NSURL *fileURL = [NSURL fileURLWithPath:filepath];
 
     // Setup audio session
-    BOOL configuredAudio = [OWSAudioSession.shared setRecordCategoryWithAudioActivity:self.voiceNoteAudioActivity];
+    BOOL configuredAudio = [OWSAudioSession.shared startRecordingAudioActivity:self.voiceNoteAudioActivity];
     if (!configuredAudio) {
         OWSFail(@"%@ Couldn't configure audio session", self.logTag);
         [self cancelVoiceMemo];

Signal/src/ViewControllers/ExperienceUpgradesPageViewController.swift

@@ -9,13 +9,6 @@ private class IntroducingCustomNotificationAudioExperienceUpgradeViewController:
 
     var buttonAction: ((UIButton) -> Void)?
 
-    override func viewDidAppear(_ animated: Bool) {
-        super.viewDidAppear(animated)
-
-        // Opt users in to the new default sound ("note") after they've seen the splash screen.
-        OWSSounds.setGlobalNotificationSound(.note)
-    }
-
     override func loadView() {
         self.view = UIView.container()
 
@@ -51,8 +44,8 @@ private class IntroducingCustomNotificationAudioExperienceUpgradeViewController:
         let button = addButton(title: buttonTitle) { _ in
             // dismiss the modally presented view controller, then proceed.
             self.experienceUpgradesPageViewController.dismiss(animated: true) {
-                guard let fromViewController = UIApplication.shared.frontmostViewController as? HomeViewController else {
-                    owsFail("unexpected frontmostViewController: \(String(describing: UIApplication.shared.frontmostViewController))")
+                guard let fromViewController = UIApplication.shared.frontmostViewController else {
+                    owsFail("frontmostViewController was unexectedly nil")
                     return
                 }
 
@@ -497,12 +490,15 @@ class ExperienceUpgradesPageViewController: OWSViewController, UIPageViewControl
 
     let pageViewController: UIPageViewController
 
+    let editingDBConnection: YapDatabaseConnection
+
     // MARK: - Initializers
 
     required init(experienceUpgrades: [ExperienceUpgrade]) {
         self.experienceUpgrades = experienceUpgrades
 
         setPageControlAppearance()
+        self.editingDBConnection = OWSPrimaryStorage.shared().newDatabaseConnection()
         self.pageViewController = UIPageViewController(transitionStyle: .scroll, navigationOrientation: .horizontal, options: nil)
         super.init(nibName: nil, bundle: nil)
         self.pageViewController.dataSource = self
@@ -512,12 +508,7 @@ class ExperienceUpgradesPageViewController: OWSViewController, UIPageViewControl
 
     @available(*, unavailable, message:"unavailable, use initWithExperienceUpgrade instead")
     required init?(coder aDecoder: NSCoder) {
-        assert(false)
-        // This should never happen, but so as not to explode we give some bogus data
-        self.experienceUpgrades = [ExperienceUpgrade()]
-        self.pageViewController = UIPageViewController(transitionStyle: .scroll, navigationOrientation: .horizontal, options: nil)
-        super.init(coder: aDecoder)
-        self.pageViewController.dataSource = self
+        fatalError("unimplemented")
     }
 
     // MARK: - View lifecycle
@@ -686,6 +677,16 @@ class ExperienceUpgradesPageViewController: OWSViewController, UIPageViewControl
         allViewControllers.append(viewController)
     }
 
+    override func dismiss(animated flag: Bool, completion: (() -> Void)? = nil) {
+        // Blocking write before dismiss, to be sure they're marked as complete
+        // before HomeView.didAppear is re-fired.
+        self.editingDBConnection.readWrite { transaction in
+            Logger.info("\(self.logTag) marking all upgrades as seen.")
+            ExperienceUpgradeFinder.shared.markAllAsSeen(transaction: transaction)
+        }
+        super.dismiss(animated: flag, completion: completion)
+    }
+
     func didTapDismissButton(sender: UIButton) {
         Logger.debug("\(TAG) in \(#function)")
         self.dismiss(animated: true)

Signal/src/ViewControllers/HomeViewController.m

@@ -47,7 +47,6 @@ @interface HomeViewController () <UITableViewDelegate, UITableViewDataSource, UI
 @property (nonatomic) UISegmentedControl *segmentedControl;
 @property (nonatomic) id previewingContext;
 @property (nonatomic) NSSet<NSString *> *blockedPhoneNumberSet;
-@property (nonatomic) BOOL hasShownAnyUnseenUpgradeExperiences;
 
 @property (nonatomic) BOOL isViewVisible;
 @property (nonatomic) BOOL isAppInBackground;
@@ -287,6 +286,13 @@ - (void)viewDidLoad
     [self updateBarButtonItems];
 }
 
+- (void)viewDidAppear:(BOOL)animated
+{
+    [super viewDidAppear:animated];
+
+    [self displayAnyUnseenUpgradeExperience];
+}
+
 - (void)updateBarButtonItems
 {
     const CGFloat kBarButtonSize = 44;
@@ -510,19 +516,6 @@ - (void)applicationDidBecomeActive:(NSNotification *)notification
             });
         }];
     }
-    
-    // We want to show the user the upgrade experience as soon as the app is visible to them.
-    // It cannot go in viewDidAppear, which is called while the app is in the background if
-    // we were launched from a voip notification.
-    if (!self.hasShownAnyUnseenUpgradeExperiences) {
-        dispatch_async(dispatch_get_main_queue(), ^{
-            if ([[UIApplication sharedApplication] applicationState] != UIApplicationStateActive) {
-                return;
-            }
-            [self displayAnyUnseenUpgradeExperience];
-            self.hasShownAnyUnseenUpgradeExperiences = YES;
-        });
-    }
 }
 
 #pragma mark - startup
@@ -532,21 +525,12 @@ - (void)applicationDidBecomeActive:(NSNotification *)notification
     OWSAssertIsOnMainThread();
 
     __block NSArray<ExperienceUpgrade *> *unseenUpgrades;
-    [self.editingDbConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
+    [self.uiDatabaseConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
         unseenUpgrades = [ExperienceUpgradeFinder.sharedManager allUnseenWithTransaction:transaction];
     }];
     return unseenUpgrades;
 }
 
-- (void)markAllUpgradeExperiencesAsSeen
-{
-    OWSAssertIsOnMainThread();
-
-    [self.editingDbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *_Nonnull transaction) {
-        [ExperienceUpgradeFinder.sharedManager markAllAsSeenWithTransaction:transaction];
-    }];
-}
-
 - (void)displayAnyUnseenUpgradeExperience
 {
     OWSAssertIsOnMainThread();
@@ -556,11 +540,7 @@ - (void)displayAnyUnseenUpgradeExperience
     if (unseenUpgrades.count > 0) {
         ExperienceUpgradesPageViewController *experienceUpgradeViewController =
             [[ExperienceUpgradesPageViewController alloc] initWithExperienceUpgrades:unseenUpgrades];
-        [self presentViewController:experienceUpgradeViewController
-                           animated:YES
-                         completion:^{
-                             [self markAllUpgradeExperiencesAsSeen];
-                         }];
+        [self presentViewController:experienceUpgradeViewController animated:YES completion:nil];
     } else if (!self.hasBeenPresented && [ProfileViewController shouldDisplayProfileViewOnLaunch]) {
         [ProfileViewController presentForUpgradeOrNag:self];
     } else {

Signal/src/environment/NotificationsManager.m

@@ -25,6 +25,7 @@ @interface NotificationsManager ()
 @property (nonatomic, readonly) NotificationType notificationPreviewType;
 
 @property (nonatomic, readonly) NSMutableArray<NSDate *> *notificationHistory;
+@property (nonatomic, nullable) OWSAudioPlayer *audioPlayer;
 
 @end
 
@@ -238,7 +239,8 @@ - (void)notifyUserForErrorMessage:(TSErrorMessage *)message inThread:(TSThread *
         } else {
             if (shouldPlaySound && [Environment.preferences soundInForeground]) {
                 OWSSound sound = [OWSSounds notificationSoundForThread:thread];
-                [OWSSounds playSound:sound quiet:YES shouldRespectSilentSwitch:YES];
+                self.audioPlayer = [OWSSounds audioPlayerForSound:sound];
+                [self.audioPlayer playAsForegroundAlert];
             }
         }
     });
@@ -343,8 +345,8 @@ - (void)notifyUserForIncomingMessage:(TSIncomingMessage *)message
         } else {
             if (shouldPlaySound && [Environment.preferences soundInForeground]) {
                 OWSSound sound = [OWSSounds notificationSoundForThread:thread];
-                // We play the "quiet" variation of sounds if possible for notifications in the foreground.
-                [OWSSounds playSound:sound quiet:YES shouldRespectSilentSwitch:YES];
+                self.audioPlayer = [OWSSounds audioPlayerForSound:sound];
+                [self.audioPlayer playAsForegroundAlert];
             }
         }
     });

Signal/src/util/Pastelog.m

@@ -12,6 +12,7 @@
 #import <SignalMessaging/DebugLogger.h>
 #import <SignalMessaging/Environment.h>
 #import <SignalServiceKit/AppContext.h>
+#import <SignalServiceKit/MimeTypeUtil.h>
 #import <SignalServiceKit/OWSPrimaryStorage.h>
 #import <SignalServiceKit/TSAccountManager.h>
 #import <SignalServiceKit/TSContactThread.h>
@@ -150,6 +151,9 @@ - (void)uploadFileWithUploadUrl:(NSString *)uploadUrl fields:(NSDictionary *)fie
                 NSString *fieldValue = fields[fieldName];
                 [formData appendPartWithFormData:[fieldValue dataUsingEncoding:NSUTF8StringEncoding] name:fieldName];
             }
+            [formData appendPartWithFormData:[weakSelf.mimeType dataUsingEncoding:NSUTF8StringEncoding]
+                                        name:@"content-type"];
+
             NSError *error;
             BOOL success = [formData appendPartWithFileURL:weakSelf.fileUrl
                                                       name:@"file"
@@ -168,7 +172,7 @@ - (void)uploadFileWithUploadUrl:(NSString *)uploadUrl fields:(NSDictionary *)fie
             [self succeedWithUrl:[NSURL URLWithString:urlString]];
         }
         failure:^(NSURLSessionDataTask *_Nullable task, NSError *error) {
-            DDLogError(@"%@ failed: %@", weakSelf.logTag, uploadUrl);
+            DDLogError(@"%@ upload: %@ failed with error: %@", weakSelf.logTag, uploadUrl, error);
             [weakSelf failWithError:error];
         }];
 }
@@ -427,7 +431,7 @@ - (void)uploadLogsWithSuccess:(nullable UploadDebugLogsSuccess)successParam fail
     __weak Pastelog *weakSelf = self;
     self.currentUploader = [DebugLogUploader new];
     [self.currentUploader uploadFileWithURL:[NSURL fileURLWithPath:zipFilePath]
-        mimeType:@"application/zip"
+        mimeType:OWSMimeTypeApplicationZip
         success:^(DebugLogUploader *uploader, NSURL *url) {
             if (uploader != weakSelf.currentUploader) {
                 // Ignore events from obsolete uploaders.

SignalMessaging/attachments/OWSVideoPlayer.swift

@@ -38,7 +38,7 @@ public class OWSVideoPlayer: NSObject {
     }
 
     public func play() {
-        OWSAudioSession.shared.setPlaybackCategory(audioActivity: self.audioActivity)
+        OWSAudioSession.shared.startPlaybackAudioActivity(self.audioActivity)
 
         guard let item = avPlayer.currentItem else {
             owsFail("\(logTag) video player item was unexpectedly nil")

SignalMessaging/environment/OWSAudioSession.swift

@@ -33,13 +33,29 @@ public class OWSAudioSession: NSObject {
 
     private var currentActivities: [Weak<AudioActivity>] = []
 
-    // Ignores hardware mute switch, plays through external speaker
-    public func setPlaybackCategory(audioActivity: AudioActivity) {
+    // Respects hardware mute switch, plays through external speaker, mixes with backround audio
+    // appropriate for foreground sound effects.
+    public func startAmbientAudioActivity(_ audioActivity: AudioActivity) {
         Logger.debug("\(logTag) in \(#function)")
 
-        // In general, we should have put the audio session back to it's default
-        // category when we were done with whatever activity required it to be modified
-        assert(avAudioSession.category == AVAudioSessionCategorySoloAmbient)
+        startAudioActivity(audioActivity)
+
+        guard currentActivities.count == 1 else {
+            // We don't want to clobber the audio capabilities configured by (e.g.) media playback or an in-progress call
+            Logger.info("\(logTag) in \(#function) not touching audio session since another currentActivity exists.")
+            return
+        }
+
+        do {
+            try avAudioSession.setCategory(AVAudioSessionCategoryAmbient)
+        } catch {
+            owsFail("\(logTag) in \(#function) failed with error: \(error)")
+        }
+    }
+
+    // Ignores hardware mute switch, plays through external speaker
+    public func startPlaybackAudioActivity(_ audioActivity: AudioActivity) {
+        Logger.debug("\(logTag) in \(#function)")
 
         startAudioActivity(audioActivity)
 
@@ -50,13 +66,9 @@ public class OWSAudioSession: NSObject {
         }
     }
 
-    public func setRecordCategory(audioActivity: AudioActivity) -> Bool {
+    public func startRecordingAudioActivity(_ audioActivity: AudioActivity) -> Bool {
         Logger.debug("\(logTag) in \(#function)")
 
-        // In general, we should have put the audio session back to it's default
-        // category when we were done with whatever activity required it to be modified
-        assert(avAudioSession.category == AVAudioSessionCategorySoloAmbient)
-
         assert(avAudioSession.recordPermission() == .granted)
 
         startAudioActivity(audioActivity)
@@ -104,8 +116,6 @@ public class OWSAudioSession: NSObject {
         }
 
         do {
-            try avAudioSession.setCategory(AVAudioSessionCategorySoloAmbient)
-
             // When playing audio in Signal, other apps audio (e.g. Music) is paused.
             // By notifying when we deactivate, the other app can resume playback.
             try avAudioSession.setActive(false, with: [.notifyOthersOnDeactivation])