revert introduction of onSelectionCancelled delegate method

deltachat-ios/Controller/WelcomeViewController.swift

@@ -306,14 +306,12 @@ class WelcomeViewController: UIViewController, ProgressAlertHandler {
                         self.navigationItem.title = String.localized(self.canCancel ? "add_account" : "welcome_desktop")
                     }
                     self.updateProgressAlert(error: ui["errorMessage"] as? String)
-                    self.securityScopedResource?.stopAccessingSecurityScopedResource()
-                    self.securityScopedResource = nil
+                    self.stopAccessingSecurityScopedResource()
                     self.removeBackupProgressObserver()
                 } else if let done = ui["done"] as? Bool, done {
                     self.dcAccounts.startIo()
                     self.updateProgressAlertSuccess(completion: self.handleBackupRestoreSuccess)
-                    self.securityScopedResource?.stopAccessingSecurityScopedResource()
-                    self.securityScopedResource = nil
+                    self.stopAccessingSecurityScopedResource()
                 } else {
                     self.updateProgressAlertValue(value: ui["progress"] as? Int)
                 }
@@ -396,6 +394,11 @@ extension WelcomeViewController: QrCodeReaderDelegate {
         self.navigationController?.popViewController(animated: true)
         self.qrCodeReader = nil
     }
+
+    private func stopAccessingSecurityScopedResource() {
+        self.securityScopedResource?.stopAccessingSecurityScopedResource()
+        self.securityScopedResource = nil
+    }
 }
 
 // MARK: - WelcomeContentView
@@ -583,11 +586,7 @@ extension WelcomeViewController: MediaPickerDelegate {
             addProgressHudBackupListener()
             importBackup(at: selectedBackupFilePath)
         } else {
-            onSelectionCancelled()
+            stopAccessingSecurityScopedResource()
         }
     }
-
-    func onSelectionCancelled() {
-        securityScopedResource = nil
-    }
 }

deltachat-ios/Helper/MediaPicker.swift

@@ -9,7 +9,6 @@ protocol MediaPickerDelegate: class {
     func onVoiceMessageRecorded(url: NSURL)
     func onVoiceMessageRecorderClosed()
     func onDocumentSelected(url: NSURL)
-    func onSelectionCancelled()
 }
 
 extension MediaPickerDelegate {
@@ -31,9 +30,6 @@ extension MediaPickerDelegate {
     func onDocumentSelected(url: NSURL) {
         logger.debug("document selected: \(url)")
     }
-    func onSelectionCancelled() {
-        logger.debug("media selection cancelled")
-    }
 }
 
 class MediaPicker: NSObject, UINavigationControllerDelegate {
@@ -225,8 +221,4 @@ extension MediaPicker: UIDocumentPickerDelegate {
         let url = urls[0] as NSURL
         self.delegate?.onDocumentSelected(url: url)
     }
-
-    func documentPickerWasCancelled(_ controller: UIDocumentPickerViewController) {
-        self.delegate?.onSelectionCancelled()
-    }
 }