Marino Faggiana 7 éve
szülő
commit
6e0ec69a41
2 módosított fájl, 3 hozzáadás és 12 törlés
  1. 2 11
      iOSClient/Main/CCMain.m
  2. 1 1
      iOSClient/Security/CCCrypto.m

+ 2 - 11
iOSClient/Main/CCMain.m

@@ -2411,17 +2411,13 @@
 #pragma --------------------------------------------------------------------------------------------
 
 - (void)createFolderFailure:(CCMetadataNet *)metadataNet message:(NSString *)message errorCode:(NSInteger)errorCode
-{
-    [_hud hideHud];
-    
+{    
     if (message)
         [app messageNotification:@"_create_folder_" description:message visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError errorCode:errorCode];
 }
 
 - (void)createFolderSuccess:(CCMetadataNet *)metadataNet
 {
-    [_hud hideHud];
-    
     NSString *newDirectory = [NSString stringWithFormat:@"%@/%@", metadataNet.serverUrl, metadataNet.fileName];    
     (void)[[NCManageDatabase sharedInstance] addDirectoryWithServerUrl:newDirectory permissions:@""];
     
@@ -2451,9 +2447,6 @@
     metadataNet.selectorPost = selectorReadFolderForced;
     
     [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
-    
-    if (!autoUploadDirectory)
-        [_hud visibleHudTitle:NSLocalizedString(@"_create_folder_", nil) mode:MBProgressHUDModeIndeterminate color:nil];
 }
 
 - (void)createFolderEncrypted:(NSString *)fileNameFolder
@@ -2489,8 +2482,6 @@
     metadataNet.taskStatus = k_taskStatusResume;
     
     [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
-    
-    [_hud visibleHudTitle:NSLocalizedString(@"_create_folder_", nil) mode:MBProgressHUDModeIndeterminate color:nil];
 }
 
 - (void)createFolderAutoUpload
@@ -4141,7 +4132,7 @@
     
     if (direction == MGSwipeDirectionLeftToRight) {
         if (_metadata.favorite)
-            [self  removeFavorite:_metadata];
+            [self removeFavorite:_metadata];
         else
             [self addFavorite:_metadata];
     }

+ 1 - 1
iOSClient/Security/CCCrypto.m

@@ -274,8 +274,8 @@
 - (NSString *)createFilenameEncryptor:(NSString *)fileName uuid:(NSString *)uuid
 {
     NSMutableString *cryptoString = [NSMutableString stringWithCapacity: 64];
-    NSString *letters = @"0J7pfXHaCPTasxQDFsUDcSDiHJmVjgzsqDUUQU75IPYrT13YKNJpvvEq0hH2uDD06mhNxvb8";
     
+    NSString *letters = [NSString stringWithFormat:@"%@-%@", [[NSUUID UUID] UUIDString], [[NSUUID UUID] UUIDString]];
     NSString *temp = [NSString stringWithFormat:@"%@|%@|%@", fileName, uuid, uuid];
     
     temp = [temp substringToIndex:64];