فهرست منبع

Add capabilities isExternalSitesServerEnabled

Marino Faggiana 8 سال پیش
والد
کامیت
ca6199c392
2فایلهای تغییر یافته به همراه9 افزوده شده و 5 حذف شده
  1. 0 1
      iOSClient/Brand/CCNextcloudConstant.h
  2. 9 4
      iOSClient/Main/CCMain.m

+ 0 - 1
iOSClient/Brand/CCNextcloudConstant.h

@@ -59,7 +59,6 @@
  #define OPTION_AUTOMATIC_UPLOAD_ENABLE
  #define OPTION_DISABLE_INTRO
  
- #define MENU_BRAND_ENABLE
  #define NO_REQUEST_LOGIN_URL
  */
 

+ 9 - 4
iOSClient/Main/CCMain.m

@@ -1184,6 +1184,14 @@
         });
     }
     
+    if (app.capabilities.isExternalSitesServerEnabled) {
+        
+        CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:app.activeAccount];
+
+        metadataNet.action = actionGetExternalSitesServer;
+        [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
+    }
+    
     [CCCoreData setServerVersionActiveAccount:app.activeAccount versionMajor:capabilities.versionMajor versionMinor:capabilities.versionMinor versionMicro:capabilities.versionMicro];
     app.serverVersion = capabilities.versionMajor;
 }
@@ -1223,9 +1231,6 @@
         
     metadataNet.action = actionGetCapabilities;
     [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
-    
-    metadataNet.action = actionGetExternalSitesServer;
-    [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
 
     metadataNet.action = actionGetNotificationServer;
     [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
@@ -3302,7 +3307,7 @@
     
 #endif
     
-#if defined(MENU_BRAND_ENABLE) && defined(OPTION_MULTIUSER_DISABLE)
+#if defined(MENU_BRAND_ENABLE)
     
     CCMenuItem *item;