Browse Source

improvements

Marino Faggiana 7 years ago
parent
commit
0b9047962c

+ 1 - 1
iOSClient/Main/CCMain.m

@@ -2411,7 +2411,7 @@
 #pragma --------------------------------------------------------------------------------------------
 
 - (void)createFolderFailure:(CCMetadataNet *)metadataNet message:(NSString *)message errorCode:(NSInteger)errorCode
-{    
+{
     if (message)
         [app messageNotification:@"_create_folder_" description:message visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError errorCode:errorCode];
 }

+ 5 - 0
iOSClient/Networking/OCNetworking.m

@@ -701,6 +701,11 @@
     
     [communication createFolder:nameFolderURL onCommunication:communication withForbiddenCharactersSupported:YES successRequest:^(NSHTTPURLResponse *response, NSString *redirectedServer) {
         
+        NSDictionary *fields = [response allHeaderFields];
+
+        _metadataNet.fileID = [CCUtility removeForbiddenCharactersFileSystem:[fields objectForKey:@"OC-FileId"]];
+        _metadataNet.date = [CCUtility dateEnUsPosixFromCloud:[fields objectForKey:@"Date"]];
+        
         if ([self.delegate respondsToSelector:@selector(createFolderSuccess:)])
             [self.delegate createFolderSuccess:_metadataNet];
        

+ 1 - 0
iOSClient/Utility/CCUtility.h

@@ -136,6 +136,7 @@
 + (NSString *)getUserAgent;
 
 + (NSString *)dateDiff:(NSDate *) convertedDate;
++ (NSDate *)dateEnUsPosixFromCloud:(NSString *)dateString;
 + (NSString *)transformedSize:(double)value;
 
 + (NSString *)removeForbiddenCharactersServer:(NSString *)fileName;

+ 18 - 0
iOSClient/Utility/CCUtility.m

@@ -436,6 +436,24 @@
     }
 }
 
+
++ (NSDate *)dateEnUsPosixFromCloud:(NSString *)dateString
+{
+    NSDate *date = [NSDate date];
+    NSError *error;
+    NSDateFormatter *dateFormatter = [NSDateFormatter new];
+    NSLocale *enUSPOSIXLocale = [NSLocale localeWithLocaleIdentifier:@"en_US_POSIX"];
+    [dateFormatter setLocale:enUSPOSIXLocale];
+    [dateFormatter setDateFormat:@"EEE, dd MMM y HH:mm:ss zzz"];
+
+    if (![dateFormatter getObjectValue:&date forString:dateString range:nil error:&error]) {
+        NSLog(@"Date '%@' could not be parsed: %@", dateString, error);
+        date = [NSDate date];
+    }
+
+    return date;
+}
+
 + (NSString *)transformedSize:(double)value
 {
     int multiplyFactor = 0;