Browse Source

V 4.0.4 fix

marinofaggiana 3 years ago
parent
commit
802dcd870e

+ 2 - 2
Cartfile

@@ -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"
+github "https://github.com/marinofaggiana/ChromaColorPicker" "master"

+ 1 - 0
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
             

+ 7 - 2
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()