marinofaggiana пре 4 година
родитељ
комит
52469d9b44

+ 2 - 2
Cartfile.resolved

@@ -3,7 +3,7 @@ github "AssistoLab/DropDown" "v2.3.13"
 github "CocoaLumberjack/CocoaLumberjack" "3.6.1"
 github "FabrizioBrancati/Queuer" "2.1.1"
 github "MortimerGoro/MGSwipeTableCell" "1.6.8"
-github "SVGKit/SVGKit" "d9432035c6e2587358a0b838d00c2658ce16e7a2"
+github "SVGKit/SVGKit" "c533a0d7dac9268503371caf6200ff368b7b9753"
 github "SwiftyJSON/SwiftyJSON" "5.0.0"
 github "WeTransfer/WeScan" "1.2.0"
 github "WenchaoD/FSCalendar" "2.8.0"
@@ -20,7 +20,7 @@ github "marinofaggiana/AFNetworking" "2967678c3e0e98c9b8d7e06222ad12d1f49c26f2"
 github "marinofaggiana/KTVHTTPCache" "2.0.2"
 github "marinofaggiana/TOPasscodeViewController" "0.0.6"
 github "marinofaggiana/XLForm" "eb9381ad8129f60402bf412250fb31b95a628a08"
-github "nextcloud/ios-communication-library" "1cec66e794b24e3a9b5fc9d61d593c4d9bee4b82"
+github "nextcloud/ios-communication-library" "4ae73a504e793ec9856daefef4415488fb35dd0f"
 github "realm/realm-cocoa" "v4.4.1"
 github "rechsteiner/Parchment" "v1.7.0"
 github "scenee/FloatingPanel" "v1.7.5"

+ 4 - 2
Carthage/Checkouts/SVGKit/Source/QuartzCore additions/CALayerWithClipRender.m

@@ -86,8 +86,10 @@
         
         // and mask with that
         CGContextClipToMask(ctx, layer.bounds, maskImage);
-        
-        CFRelease(maskImage);
+
+        if( maskImage != nil ) {
+            CFRelease(maskImage);
+        }
     }
 }
 

+ 1 - 1
iOSClient/AppDelegate.m

@@ -806,7 +806,7 @@
     
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
         
-        NSInteger counterDownload = [[[NCManageDatabase sharedInstance] getMetadatasWithPredicate:[NSPredicate predicateWithFormat:@"status = %d OR status == %d OR status == %d", k_metadataStatusWaitDownload, k_metadataStatusInDownload, k_metadataStatusDownloading] sorted:@"fileName" ascending:true] count];
+        NSInteger counterDownload = [[NCOperationQueue shared] downloadCount];
         NSInteger counterUpload = [[[NCManageDatabase sharedInstance] getMetadatasWithPredicate:[NSPredicate predicateWithFormat:@"status == %d OR status == %d OR status == %d", k_metadataStatusWaitUpload, k_metadataStatusInUpload, k_metadataStatusUploading] sorted:@"fileName" ascending:true] count];
 
         NSInteger total = counterDownload + counterUpload;

+ 3 - 0
iOSClient/Networking/NCOperationQueue.swift

@@ -43,6 +43,9 @@ import NCCommunication
     @objc func downloadCancelAll() {
         downloadQueue.cancelAll()
     }
+    @objc func downloadCount() -> Int {
+        return downloadQueue.operationCount
+    }
     
     //
     @objc func readFolderSync(serverUrl: String, selector: String ,account: String) {