#297

iOSClient/Networking/CCNetworking.m

@@ -829,26 +829,6 @@
     if (delegate == nil)
         delegate = self.delegate;
     
-    /* +++ OLD
-     
-    // *** Auto Upload ***
-     
-    if ([selector isEqualToString:selectorUploadAutoUpload]) {
-     
-    [self upload:fileName serverUrl:serverUrl cryptated:NO template:NO onlyPlist:NO fileNameTemplate:nil assetLocalIdentifier:assetLocalIdentifier session:session taskStatus:taskStatus selector:selector selectorPost:selectorPost errorCode:errorCode delegate:delegate];
-     
-    } else {
-     
-    // *** Auto Upload Full + Manual Upload ***
-     
-    NCRequestAsset *requestAsset = [NCRequestAsset new];
-    requestAsset.delegate = self;
-    
-    [requestAsset writeAssetToSandboxFileName:fileName assetLocalIdentifier:assetLocalIdentifier selector:selector selectorPost:selectorPost errorCode:errorCode metadataNet:nil serverUrl:serverUrl activeUrl:_activeUrl directoryUser:_directoryUser cryptated:cryptated session:session taskStatus:taskStatus delegate:delegate];
-    }
-    */
-    // +++ OLD
-    
     PHFetchResult *result = [PHAsset fetchAssetsWithLocalIdentifiers:@[assetLocalIdentifier] options:nil];
     
     if (!result.count) {

iOSClient/Supporting Files/en.lproj/Localizable.strings

@@ -63,6 +63,8 @@
 "_auto_upload_folder_"      = "Auto upload";
 "_gallery_"                 = "Gallery";
 "_photo_"                   = "Photo";
+"_audio_"                   = "Audio";
+"_unknown_"                 = "Unknown";
 
 // App
 

iOSClient/Utility/CCUtility.m

@@ -527,9 +527,20 @@
     else numberFileName = [CCUtility getIncrementalNumber];
     
     NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
-    [formatter setDateFormat:@"yyyy-MM-dd HH-mm-ss"];
+    [formatter setDateFormat:@"yy-MM-dd HH-mm-ss"];
     NSString *fileNameDate = [formatter stringFromDate:assetDate];
     
+    PHAssetMediaType assetMediaType = asset.mediaType;
+    NSString *fileNameType = @"";
+    if (assetMediaType == PHAssetMediaTypeImage)
+        fileNameType = NSLocalizedString(@"_photo_", nil);
+    if (assetMediaType == PHAssetMediaTypeVideo)
+        fileNameType = NSLocalizedString(@"_video_", nil);
+    if (assetMediaType == PHAssetMediaTypeAudio)
+        fileNameType = NSLocalizedString(@"_audio_", nil);
+    if (assetMediaType == PHAssetMediaTypeUnknown)
+        fileNameType = NSLocalizedString(@"_unknown_", nil);
+
     NSString *fileNameExt = [[assetFileName pathExtension] lowercaseString];
     
     if (key) {
@@ -542,7 +553,7 @@
             NSString *day = [formatter stringFromDate:assetDate];
             [formatter setDateFormat:@"MMM"];
             NSString *month = [formatter stringFromDate:assetDate];
-            [formatter setDateFormat:@"yyyy"];
+            [formatter setDateFormat:@"yy"];
             NSString *year = [formatter stringFromDate:assetDate];
             
             // Replace string with date
@@ -555,12 +566,12 @@
             
         } else {
             
-            fileName = [NSString stringWithFormat:@"%@ %@.%@", fileNameDate, numberFileName, fileNameExt];
+            fileName = [NSString stringWithFormat:@"%@ %@ %@.%@", fileNameType, fileNameDate, numberFileName, fileNameExt];
         }
         
     } else {
         
-        fileName = [NSString stringWithFormat:@"%@ %@.%@", fileNameDate, numberFileName, fileNameExt];
+        fileName = [NSString stringWithFormat:@"%@ %@ %@.%@", fileNameType, fileNameDate, numberFileName, fileNameExt];
     }
     
     return fileName;