Add capabilities isExternalSitesServerEnabled

Libraries external/OCCommunicationLib/OCCommunicationLib/OCCapabilities.h

@@ -49,6 +49,8 @@
 @property (nonatomic) BOOL isFilesSharingAllowUserSendSharesToOtherServersEnabled;
 @property (nonatomic) BOOL isFilesSharingAllowUserReceiveSharesToOtherServersEnabled;
 
+// External sites
+@property (nonatomic) BOOL isExternalSitesServerEnabled;
 
 /*FILES*/
 @property (nonatomic) BOOL isFileBigFileChunkingEnabled;

Libraries external/OCCommunicationLib/OCCommunicationLib/OCCommunication.m

@@ -1252,7 +1252,6 @@
     OCWebDAVClient *request = [OCWebDAVClient new];
     request = [self getRequestWithCredentials:request];
     
-    
     [request getCapabilitiesOfServer:serverPath onCommunication:sharedOCComunication success:^(NSHTTPURLResponse *response, id responseObject) {
         
         NSData *responseData = (NSData*) responseObject;
@@ -1345,6 +1344,15 @@
             capabilities.isFilesSharingAllowUserSendSharesToOtherServersEnabled = filesSharingAllowUserSendSharesToOtherServersEnabledNumber.boolValue;
             capabilities.isFilesSharingAllowUserReceiveSharesToOtherServersEnabled = filesSharingAllowUserReceiveSharesToOtherServersEnabledNumber.boolValue;
             
+            // EXTERNAL SITES
+            
+            NSDictionary *externalSitesDic = [capabilitiesDict valueForKey:@"external"];
+            if (externalSitesDic) {
+                NSArray *externalSitesArray = [externalSitesDic valueForKey:@"v1"];
+                if (externalSitesArray)
+                    if ([[externalSitesArray objectAtIndex:0] isEqualToString:@"sites"])
+                        capabilities.isExternalSitesServerEnabled = YES;
+            }
             //FILES
             
             NSDictionary *files = [capabilitiesDict valueForKey:@"files"];
@@ -1649,7 +1657,7 @@
         //Parse
         NSError *error;
         NSDictionary *jsongParsed = [NSJSONSerialization JSONObjectWithData:responseData options:NSJSONReadingMutableContainers error:&error];
-        NSLog(@"[LOG] Activity : %@",jsongParsed);
+        NSLog(@"[LOG] External Sites : %@",jsongParsed);
         
         NSMutableArray *listOfExternalSites = [NSMutableArray new];
         
@@ -1665,20 +1673,16 @@
                 
                 for (NSDictionary *data in datas) {
                     
-                    OCActivity *activity = [OCActivity new];
-                    
-                    activity.idActivity = [[data valueForKey:@"id"] integerValue];
-                    
-                    NSString *dateString = [data valueForKey:@"date"];
-                    NSISO8601DateFormatter *formatter = [[NSISO8601DateFormatter alloc] init];
-                    activity.date = [formatter dateFromString:dateString];
+                    OCExternalSites *externalSite = [OCExternalSites new];
                     
-                    if ([data valueForKey:@"file"]    && ![[data valueForKey:@"file"]    isEqual:[NSNull null]]) activity.file    = [data valueForKey:@"file"];
-                    if ([data valueForKey:@"link"]    && ![[data valueForKey:@"link"]    isEqual:[NSNull null]]) activity.link    = [data valueForKey:@"link"];
-                    if ([data valueForKey:@"message"] && ![[data valueForKey:@"message"] isEqual:[NSNull null]]) activity.message = [data valueForKey:@"message"];
-                    if ([data valueForKey:@"subject"] && ![[data valueForKey:@"subject"] isEqual:[NSNull null]]) activity.subject = [data valueForKey:@"subject"];
+                    externalSite.idExternalSite = [[data valueForKey:@"id"] integerValue];
+    
+                    if ([data valueForKey:@"icon"] && ![[data valueForKey:@"icon"] isEqual:[NSNull null]]) externalSite.icon = [data valueForKey:@"icon"];
+                    if ([data valueForKey:@"lang"] && ![[data valueForKey:@"lang"] isEqual:[NSNull null]]) externalSite.lang = [data valueForKey:@"lang"];
+                    if ([data valueForKey:@"name"] && ![[data valueForKey:@"name"] isEqual:[NSNull null]]) externalSite.name = [data valueForKey:@"name"];
+                    if ([data valueForKey:@"url"]  && ![[data valueForKey:@"url"]  isEqual:[NSNull null]]) externalSite.url  = [data valueForKey:@"url"];
                     
-                    [listOfExternalSites addObject:activity];
+                    [listOfExternalSites addObject:externalSite];
                 }
                 
             } else {

Libraries external/OCCommunicationLib/OCCommunicationLib/OCExternalSites.h

@@ -25,7 +25,7 @@
 
 @interface OCExternalSites : NSObject
 
-@property NSInteger idExternalSites;
+@property NSInteger idExternalSite;
 @property (nonatomic, strong) NSString *name;
 @property (nonatomic, strong) NSString *url;
 @property (nonatomic, strong) NSString *lang;

Libraries external/OCCommunicationLib/OCCommunicationLib/OCExternalSites.m

@@ -31,7 +31,7 @@
     
     if (self) {
         
-        self.idExternalSites = 0;
+        self.idExternalSite = 0;
         self.name = @"";
         self.url = @"";
         self.lang = @"";

iOSClient/PhotosCameraUpload/CCPhotosCameraUpload.m

@@ -1101,7 +1101,7 @@
         return;
     
     // Activity
-    [CCCoreData addActivityClient:@"" fileID:@"" action:k_activityDebugActionAutomaticUpload selector:@"" note:[NSString stringWithFormat:@"Number: %lu", [newItemsToUpload count]] type:k_activityTypeInfo verbose:k_activityVerboseHigh account:app.activeAccount];
+    [CCCoreData addActivityClient:@"" fileID:@"" action:k_activityDebugActionAutomaticUpload selector:@"" note:[NSString stringWithFormat:@"Number: %lu", (unsigned long)[newItemsToUpload count]] type:k_activityTypeInfo verbose:k_activityVerboseHigh account:app.activeAccount];
     
     // STOP new request : initStateCameraUpload
     //_AutomaticCameraUploadInProgress = YES;