Marino Faggiana 8 жил өмнө
parent
commit
4dc3bdede5

+ 0 - 1
iOSClient/CCStandardImages.h

@@ -95,7 +95,6 @@
 #define image_passcode                          @"passcode"
 #define image_pdf                               @"pdf"
 #define image_photo                             @"photo"
-#define image_photosDownload                    @"photosDownload"
 #define image_plist                             @"plist"
 
 #define image_quickActionPhotos                 @"quickActionPhotos"

+ 0 - 23
iOSClient/Images.xcassets/photosDownload.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "photosDownload.png"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "photosDownload@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x",
-      "filename" : "photosDownload@3x.png"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

BIN
iOSClient/Images.xcassets/photosDownload.imageset/photosDownload.png


BIN
iOSClient/Images.xcassets/photosDownload.imageset/photosDownload@2x.png


BIN
iOSClient/Images.xcassets/photosDownload.imageset/photosDownload@3x.png


+ 8 - 0
iOSClient/Networking/CCNetworking.m

@@ -656,6 +656,14 @@
         [app.listProgressMetadata removeObjectForKey:fileID];
 #endif
     
+    if (!fileID) {
+        
+        if ([self.delegate respondsToSelector:@selector(downloadFileFailure:serverUrl:selector:message:errorCode:)])
+            [self.delegate downloadFileFailure:@"" serverUrl:serverUrl selector:selector message:[CCError manageErrorKCF:errorCode withNumberError:YES] errorCode:errorCode];
+        
+        return;
+    }
+    
     // Progress Task
     NSDictionary* userInfo = @{@"fileID": (fileID), @"serverUrl": (serverUrl), @"cryptated": ([NSNumber numberWithBool:NO]), @"progress": ([NSNumber numberWithFloat:0.0])};
     [[NSNotificationCenter defaultCenter] postNotificationName:@"NotificationProgressTask" object:nil userInfo:userInfo];

+ 1 - 1
iOSClient/PhotosCameraUpload/CCPhotosCameraUpload.m

@@ -667,7 +667,7 @@
     } else {
         
         // Thumbnail not present
-        imageView.image = [UIImage imageNamed:image_photosDownload];
+        imageView.image = [UIImage imageNamed:image_photo];
         
         if (metadata.thumbnailExists)
             [[CCActions sharedInstance] downloadTumbnail:metadata delegate:self];

+ 1 - 1
iOSClient/Supporting Files/en.lproj/Localizable.strings

@@ -185,7 +185,7 @@
 "_help_tutorial_"               = "Tutorial";
 "_help_intro_"                  = "Introduction _brand_";
 "_help_activity_section_"       = "Activity";
-"_help_activity_verbose_"       = "Activity verbose high";
+"_help_activity_verbose_"       = "Detailed Activity feed";
 "_help_activity_mail_"          = "Send activity by mail";
 "_help_activity_clear_"         = "Clear activity";