Browse Source

remove NSURL based media selection callback as it is unused for now

cyberta 5 years ago
parent
commit
f7c41da49e

+ 0 - 5
deltachat-ios/Controller/EditSettingsController.swift

@@ -159,10 +159,6 @@ class EditSettingsController: UITableViewController, MediaPickerDelegate {
         self.present(alert, animated: true, completion: nil)
     }
 
-    func onMediaSelected(url: NSURL) {
-        logger.info("onMediaSelected: \(url)")
-    }
-
     func onImageSelected(image: UIImage) {
         AvatarHelper.saveSelfAvatarImage(image: image)
 
@@ -170,7 +166,6 @@ class EditSettingsController: UITableViewController, MediaPickerDelegate {
         let indexPath = IndexPath(row: section1PictureAndName, section: section1)
         self.tableView.reloadRows(at: [indexPath], with: UITableView.RowAnimation.none)
         self.tableView.endUpdates()
-
     }
 
     func onDismiss() { }

+ 1 - 39
deltachat-ios/Helper/AvatarHelper.swift

@@ -18,7 +18,7 @@ class AvatarHelper {
                 try filemanager.createDirectory(atPath: avatarDir.path,
                                                 withIntermediateDirectories: false)
             } catch let error as NSError {
-                logger.info("\(error.localizedDescription)")
+                logger.info("directory not created: \(error.localizedDescription)")
             }
 
             if !filemanager.changeCurrentDirectoryPath(avatarDir.path) {
@@ -44,42 +44,4 @@ class AvatarHelper {
             DcConfig.selfavatar = avatarFile.path
         }
     }
-
-    // blocking method (reads/writes to storage)
-    static func setSelfAvatarFile(fileUrl: URL) {
-        let filemanager = FileManager.default
-        let docDir = filemanager.urls(for: .documentDirectory, in: .userDomainMask)[0]
-        let avatarDir = docDir.appendingPathComponent(avatarPath)
-        let avatarFile = avatarDir.appendingPathComponent(selfAvatarFile)
-        do {
-            try filemanager.createDirectory(atPath: avatarDir.path,
-                                            withIntermediateDirectories: false)
-        } catch let error as NSError {
-            logger.warning("Could not create avatar directory: \(error.localizedDescription)")
-        }
-
-        if !filemanager.changeCurrentDirectoryPath(avatarDir.path) {
-            logger.warning("Could not change into avatar directory")
-            return
-        }
-
-        if filemanager.fileExists(atPath: avatarFile.path) {
-            do {
-                try filemanager.removeItem(atPath: avatarFile.path)
-            } catch let error {
-                logger.warning("Error: \(error.localizedDescription)")
-            }
-        }
-
-        do {
-            try filemanager.copyItem(at: fileUrl, to: avatarFile)
-        } catch let error {
-            logger.warning("Error: \(error.localizedDescription)")
-            return
-        }
-
-        DcConfig.selfavatar = avatarFile.path
-
-    }
-
 }

+ 1 - 1
deltachat-ios/Helper/MediaPicker.swift

@@ -4,7 +4,7 @@ import MobileCoreServices
 import ALCameraViewController
 
 protocol MediaPickerDelegate: class {
-    func onMediaSelected(url: NSURL)
+    //func onMediaSelected(url: NSURL)
     func onImageSelected(image: UIImage)
     func onDismiss()
 }