Move middlewarePing() on NCService

iOSClient/AppDelegate.m

@@ -266,9 +266,9 @@
     [self verifyUploadInErrorOrWait];
     
     // middelware ping
-    if ([[NCBrandOptions sharedInstance] use_middlewarePing] && _activeMain) {
+    if ([[NCBrandOptions sharedInstance] use_middlewarePing]) {
         NSLog(@"[LOG] Middleware Ping");
-        [_activeMain middlewarePing];
+        [[NCService sharedInstance] middlewarePing];
     }
 }
 

iOSClient/Main/CCMain.h

@@ -82,7 +82,6 @@
 - (void)reloadDatasource:(NSString *)serverUrl;
 
 - (void)requestServerCapabilities;
-- (void)middlewarePing;
 
 - (void)openWindowShare:(tableMetadata *)metadata;
 - (void)clearDateReadDataSource:(NSNotification *)notification;

iOSClient/Main/CCMain.m

@@ -1259,24 +1259,6 @@
     [appDelegate addNetworkingOperationQueue:appDelegate.netQueue delegate:self metadataNet:metadataNet];
 }
 
-#pragma mark -
-#pragma --------------------------------------------------------------------------------------------
-#pragma mark ==== Middleware Ping  ====
-#pragma --------------------------------------------------------------------------------------------
-
-- (void)middlewarePing
-{
-    // test
-    if (appDelegate.activeAccount.length == 0 || appDelegate.maintenanceMode)
-        return;
-    
-    CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:appDelegate.activeAccount];
-    
-    metadataNet.action = actionMiddlewarePing;
-    metadataNet.serverUrl = [[NCBrandOptions sharedInstance] middlewarePingUrl];
-    [appDelegate addNetworkingOperationQueue:appDelegate.netQueue delegate:self metadataNet:metadataNet];
-}
-
 #pragma mark -
 #pragma --------------------------------------------------------------------------------------------
 #pragma mark ==== Download Thumbnail Delegate ====

iOSClient/Networking/NCService.swift

@@ -25,9 +25,27 @@ import Foundation
 
 class NCService: NSObject {
     
+    let appDelegate = UIApplication.shared.delegate as! AppDelegate
+
     @objc static let sharedInstance: NCService = {
         let instance = NCService()
         return instance
     }()
 
+    
+     @objc func middlewarePing() {
+       
+        if (appDelegate.activeAccount == nil || appDelegate.activeAccount.count == 0 || appDelegate.maintenanceMode == true) {
+            return;
+        }
+        
+        guard let metadataNet = CCMetadataNet.init(account: appDelegate.activeAccount) else {
+            return
+        }
+        
+        metadataNet.action = actionMiddlewarePing
+        metadataNet.serverUrl = NCBrandOptions.sharedInstance.middlewarePingUrl
+        
+        //appDelegate.addNetworkingOperationQueue(appDelegate.netQueue, delegate: self, metadataNet: metadataNet)
+    }
 }