Merge branch 'charlesmchen/pasteLogUpdates'

Signal/src/util/Pastelog.m

@@ -297,7 +297,7 @@ typedef void (^DebugLogUploadFailure)(DebugLogUploader *uploader, NSError *error
         }
     };
 
-    [self uploadLogsWithSuccess:^(NSURL *url) {
+    [[self sharedManager] uploadLogsWithUIWithSuccess:^(NSURL *url) {
         UIAlertController *alert = [UIAlertController
             alertControllerWithTitle:NSLocalizedString(@"DEBUG_LOG_ALERT_TITLE", @"Title of the debug log alert.")
                              message:NSLocalizedString(@"DEBUG_LOG_ALERT_MESSAGE", @"Message of the debug log alert.")
@@ -357,28 +357,52 @@ typedef void (^DebugLogUploadFailure)(DebugLogUploader *uploader, NSError *error
     }];
 }
 
-+ (void)uploadLogsWithSuccess:(nullable UploadDebugLogsSuccess)success
+- (void)uploadLogsWithUIWithSuccess:(UploadDebugLogsSuccess)successParam {
-{
+    OWSAssertIsOnMainThread();
-    OWSAssertDebug(success);
+
+    [ModalActivityIndicatorViewController
+        presentFromViewController:UIApplication.sharedApplication.frontmostViewControllerIgnoringAlerts
+                        canCancel:YES
+                  backgroundBlock:^(ModalActivityIndicatorViewController *modalActivityIndicator) {
+                      [self
+                          uploadLogsWithSuccess:^(NSURL *url) {
+                              OWSAssertIsOnMainThread();
+
+                              if (modalActivityIndicator.wasCancelled) {
+                                  return;
+                              }
+
+                              [modalActivityIndicator dismissWithCompletion:^{
+                                  OWSAssertIsOnMainThread();
 
-    [[self sharedManager] uploadLogsWithSuccess:success
+                                  successParam(url);
+                              }];
+                          }
                           failure:^(NSString *localizedErrorMessage) {
+                              OWSAssertIsOnMainThread();
+
+                              if (modalActivityIndicator.wasCancelled) {
+                                  return;
+                              }
+
+                              [modalActivityIndicator dismissWithCompletion:^{
+                                  OWSAssertIsOnMainThread();
+
                                   [Pastelog showFailureAlertWithMessage:localizedErrorMessage];
                               }];
+                          }];
+                  }];
 }
 
-- (void)uploadLogsWithSuccess:(nullable UploadDebugLogsSuccess)successParam failure:(UploadDebugLogsFailure)failureParam
+- (void)uploadLogsWithSuccess:(UploadDebugLogsSuccess)successParam failure:(UploadDebugLogsFailure)failureParam {
-{
     OWSAssertDebug(successParam);
     OWSAssertDebug(failureParam);
 
     // Ensure that we call the completions on the main thread.
     UploadDebugLogsSuccess success = ^(NSURL *url) {
-        if (successParam) {
         DispatchMainThreadSafe(^{
             successParam(url);
         });
-        }
     };
     UploadDebugLogsFailure failure = ^(NSString *localizedErrorMessage) {
         DispatchMainThreadSafe(^{