diff options
| -rw-r--r-- | Cartfile | 4 | ||||
| -rw-r--r-- | iOSClient/Main/NCPickerViewController.swift | 1 | ||||
| -rw-r--r-- | iOSClient/Networking/NCNetworkingProcessUpload.swift | 9 |
3 files changed, 10 insertions, 4 deletions
@@ -1,4 +1,4 @@ -github "tilltue/TLPhotoPicker" "2.1.3" +github "tilltue/TLPhotoPicker" "2.1.4" github "kishikawakatsumi/UICKeyChainStore" github "WenchaoD/FSCalendar" "2.8.0" github "FabrizioBrancati/Queuer" @@ -7,4 +7,4 @@ github "AssistoLab/DropDown" "v2.3.13" github "https://github.com/marinofaggiana/TOPasscodeViewController" "0.0.10" github "https://github.com/marinofaggiana/OpenSSL" "master" -github "https://github.com/marinofaggiana/ChromaColorPicker" "master"
\ No newline at end of file +github "https://github.com/marinofaggiana/ChromaColorPicker" "master" diff --git a/iOSClient/Main/NCPickerViewController.swift b/iOSClient/Main/NCPickerViewController.swift index 46d1721a5..069e15785 100644 --- a/iOSClient/Main/NCPickerViewController.swift +++ b/iOSClient/Main/NCPickerViewController.swift @@ -71,6 +71,7 @@ class NCPhotosPickerViewController: NSObject { } configure.selectedColor = NCBrandColor.shared.brandElement configure.singleSelectedMode = singleSelectedMode + configure.allowedAlbumCloudShared = true let viewController = customPhotoPickerViewController(withTLPHAssets: { (assets) in diff --git a/iOSClient/Networking/NCNetworkingProcessUpload.swift b/iOSClient/Networking/NCNetworkingProcessUpload.swift index bc033f933..1c7f2db00 100644 --- a/iOSClient/Networking/NCNetworkingProcessUpload.swift +++ b/iOSClient/Networking/NCNetworkingProcessUpload.swift @@ -43,6 +43,7 @@ class NCNetworkingProcessUpload: NSObject { } func startTimer() { + timerProcess?.invalidate() timerProcess = Timer.scheduledTimer(timeInterval: 5, target: self, selector: #selector(process), userInfo: nil, repeats: true) } @@ -108,7 +109,9 @@ class NCNetworkingProcessUpload: NSObject { NCNetworking.shared.upload(metadata: metadata) { // start } completion: { (_, _) in - self.startTimer() + DispatchQueue.main.async { + self.startTimer() + } } } else { self.startTimer() @@ -122,7 +125,9 @@ class NCNetworkingProcessUpload: NSObject { NCNetworking.shared.upload(metadata: metadata) { // start } completion: { (_, _) in - self.startTimer() + DispatchQueue.main.async { + self.startTimer() + } } } else { self.startTimer() |