Marino Faggiana 8 سال پیش
والد
کامیت
b4bbe880c9
3فایلهای تغییر یافته به همراه12 افزوده شده و 9 حذف شده
  1. 2 3
      iOSClient/Main/CCMain.h
  2. 7 5
      iOSClient/Main/CCMain.m
  3. 3 1
      iOSClient/Networking/OCNetworking.m

+ 2 - 3
iOSClient/Main/CCMain.h

@@ -66,14 +66,13 @@
 
 @property BOOL isFolderEncrypted;
 
-@property (nonatomic ,strong) NSString *serverUrl;
+@property (nonatomic, strong) NSString *serverUrl;
 @property (nonatomic, strong) NSString *titleMain;
 @property (nonatomic, strong) NSString *textBackButton;
 
 @property (nonatomic, weak) CCShareOC *shareOC;
 @property (nonatomic, weak) CCDetail *detailViewController;
-@property (nonatomic, weak) CCLoginNCOC *loginVC;
-@property (nonatomic, weak) UISearchController *searchController;
+@property (nonatomic, strong) UISearchController *searchController;
 
 - (void)returnCreate:(NSInteger)type;
 

+ 7 - 5
iOSClient/Main/CCMain.m

@@ -1026,16 +1026,18 @@
 
 - (void)changePasswordAccount
 {
+    CCLoginNCOC *loginVC;
+
     if ([app.typeCloud isEqualToString:typeCloudNextcloud])
-        _loginVC = [[UIStoryboard storyboardWithName:@"CCLogin" bundle:nil] instantiateViewControllerWithIdentifier:@"CCLoginNextcloud"];
+        loginVC = [[UIStoryboard storyboardWithName:@"CCLogin" bundle:nil] instantiateViewControllerWithIdentifier:@"CCLoginNextcloud"];
     
     if ([app.typeCloud isEqualToString:typeCloudOwnCloud])
-        _loginVC = [[UIStoryboard storyboardWithName:@"CCLogin" bundle:nil] instantiateViewControllerWithIdentifier:@"CCLoginOwnCloud"];
+        loginVC = [[UIStoryboard storyboardWithName:@"CCLogin" bundle:nil] instantiateViewControllerWithIdentifier:@"CCLoginOwnCloud"];
     
-    [_loginVC setModifyOnlyPassword:YES];
-    [_loginVC setTypeCloud:app.typeCloud];
+    [loginVC setModifyOnlyPassword:YES];
+    [loginVC setTypeCloud:app.typeCloud];
     
-    [self presentViewController:_loginVC animated:YES completion:nil];
+    [self presentViewController:loginVC animated:YES completion:nil];
 }
 
 #pragma mark -

+ 3 - 1
iOSClient/Networking/OCNetworking.m

@@ -374,11 +374,13 @@
                 }
                 // ------------------------
                 
-                if ([_metadataNet.selector isEqualToString:selectorSearch] && [itemDto.fileName.lowercaseString hasPrefix:_metadataNet.fileName.lowercaseString]) {
+                if ([_metadataNet.selector isEqualToString:selectorSearch] && [itemDto.fileName.lowercaseString hasPrefix:_metadataNet.fileName.lowercaseString] && ![CCUtility isFileCryptated:itemDto.fileName]) {
+                    
                     [metadatas addObject:[CCUtility trasformedOCFileToCCMetadata:itemDto fileNamePrint:itemDto.fileName serverUrl:_metadataNet.serverUrl directoryID:directoryID cameraFolderName:cameraFolderName cameraFolderPath:cameraFolderPath activeAccount:_metadataNet.account directoryUser:directoryUser typeCloud:_typeCloud]];
                 }
                 
                 if ([_metadataNet.selector isEqualToString:selectorReadFolder]) {
+                    
                     [metadatas addObject:[CCUtility trasformedOCFileToCCMetadata:itemDto fileNamePrint:itemDto.fileName serverUrl:_metadataNet.serverUrl directoryID:directoryID cameraFolderName:cameraFolderName cameraFolderPath:cameraFolderPath activeAccount:_metadataNet.account directoryUser:directoryUser typeCloud:_typeCloud]];
                 }
             }