search API

iOSClient/Main/CCMain.h

@@ -78,7 +78,7 @@
 
 - (void)createFolderCameraUpload;
 - (void)createFolder:(NSString *)fileNameFolder folderCameraUpload:(BOOL)folderCameraUpload;
-- (void)readFolderWithForced:(BOOL)forced;
+- (void)readFolderWithForced:(BOOL)forced serverUrl:(NSString *)serverUrl;
 
 - (void)uploadFileAsset:(NSMutableArray *)assets serverUrl:(NSString *)serverUrl cryptated:(BOOL)cryptated useSubFolder:(BOOL)useSubFolder session:(NSString *)session;
 

iOSClient/Main/CCMain.m

@@ -175,7 +175,7 @@
         [self reloadDatasource:_serverUrl fileID:nil selector:nil];
         
         // Read Folder
-        [self readFolderWithForced:NO];
+        [self readFolderWithForced:NO serverUrl:_serverUrl];
     }
 
     // Title
@@ -250,7 +250,7 @@
             [self reloadDatasource:_serverUrl fileID:nil selector:nil];
             
             // Read Folder
-            [self readFolderWithForced:NO];
+            [self readFolderWithForced:NO serverUrl:_serverUrl];
         }
     }
 
@@ -350,7 +350,7 @@
         [self reloadDatasource:_serverUrl fileID:nil selector:nil];
 
         // Load Folder
-        [self readFolderWithForced:NO];
+        [self readFolderWithForced:NO serverUrl:_serverUrl];
         
         // Load photo datasorce
         if (app.activePhotosCameraUpload)
@@ -456,7 +456,7 @@
 
 - (void)refreshControlTarget
 {
-    [self readFolderWithForced:YES];
+    [self readFolderWithForced:YES serverUrl:_serverUrl];
     
     // Actuate `Peek` feedback (weak boom)
     AudioServicesPlaySystemSound(1519);
@@ -981,7 +981,7 @@
 
 - (void) loginSuccess:(NSInteger)loginType
 {
-    [self readFolderWithForced:YES];
+    [self readFolderWithForced:YES serverUrl:_serverUrl];
 }
 
 - (void)changePasswordAccount
@@ -1494,7 +1494,7 @@
     
     if ([selectorPost isEqualToString:selectorReadFolderForced] ) {
             
-        [self readFolderWithForced:YES];
+        [self readFolderWithForced:YES serverUrl:_serverUrl];
             
     } else {
     
@@ -1812,26 +1812,28 @@
     }
 }
 
-- (void)readFolderWithForced:(BOOL)forced
+- (void)readFolderWithForced:(BOOL)forced serverUrl:(NSString *)serverUrl
 {
     [self setTitleBackgroundTableView:nil];
  
     // init control
-    if (!_serverUrl || !app.activeAccount)
+    if (!serverUrl || !app.activeAccount)
         return;
     
     // Search Mode
     if (_isSearchMode) {
         
-        if (forced)
+        if (forced) {
             _reloadForcedFoderWhenSearchModeOff = YES;
+            _searchFileName = @"";                          // forced reload searchg
+        }
         
         [self updateSearchResultsForSearchController:self.searchController];
         
         return;
     }
     
-    NSString *directoryID = [CCCoreData getDirectoryIDFromServerUrl:_serverUrl activeAccount:app.activeAccount];
+    NSString *directoryID = [CCCoreData getDirectoryIDFromServerUrl:serverUrl activeAccount:app.activeAccount];
     
     if ([CCCoreData isDirectoryOutOfDate:k_dayForceReadFolder directoryID:directoryID activeAccount:app.activeAccount] || forced) {
         
@@ -1894,7 +1896,7 @@
         
         _reloadForcedFoderWhenSearchModeOff = NO;
         
-        [self readFolderWithForced:YES];
+        [self readFolderWithForced:YES serverUrl:_serverUrl];
     }
 }
 
@@ -2006,7 +2008,7 @@
 
 - (void)renameSuccess:(CCMetadataNet *)metadataNet
 {
-    [self readFolderWithForced:YES];
+    [self readFolderWithForced:YES serverUrl:_serverUrl];
 }
 
 - (void)renameFile:(CCMetadata *)metadata fileName:(NSString *)fileName
@@ -2100,8 +2102,8 @@
         }
     
         // reload Datasource
-        if ([metadataNet.selectorPost isEqualToString:selectorReadFolderForced])
-            [self readFolderWithForced:YES];
+        if ([metadataNet.selectorPost isEqualToString:selectorReadFolderForced] || _isSearchMode)
+            [self readFolderWithForced:YES serverUrl:_serverUrl];
         else
             [self reloadDatasource];
 
@@ -2232,7 +2234,7 @@
     
     // Load Folder or the Datasource
     if ([metadataNet.selectorPost isEqualToString:selectorReadFolderForced]) {
-        [self readFolderWithForced:YES];
+        [self readFolderWithForced:YES serverUrl:_serverUrl];
     } else {
         [self reloadDatasource:metadataNet.serverUrl fileID:metadataNet.fileID selector:metadataNet.selector];
     }
@@ -3954,7 +3956,7 @@
                     // scriviamo il passcode
                     [CCUtility setKeyChainPasscodeForUUID:_metadata.uuid conPasscode:aPasscode];
                     
-                    [self readFolderWithForced:YES];
+                    [self readFolderWithForced:YES serverUrl:_serverUrl];
                     
                 } else {
                     
@@ -4264,7 +4266,7 @@
                                         if (app.activeAccount.length > 0 && app.activePhotosCameraUpload)
                                             [app.activePhotosCameraUpload reloadDatasourceForced];
                                         
-                                        [self readFolderWithForced:YES];
+                                        [self readFolderWithForced:YES serverUrl:_serverUrl];
                                     }];
         }
         
@@ -4637,7 +4639,7 @@
             
         } else {
             
-            [self readFolderWithForced:NO];
+            [self readFolderWithForced:NO serverUrl:serverUrl];
         }
         
         [self tableViewReload];

iOSClient/Offline/CCOfflinePageContent.h

@@ -56,6 +56,5 @@
 @property (nonatomic, strong) UIDocumentInteractionController *docController;
 
 - (void)reloadDatasource;
-- (void)readFolderWithForced:(BOOL)forced;
 
 @end

iOSClient/Offline/CCOfflinePageContent.m

@@ -392,11 +392,6 @@
     return metadata;
 }
 
-- (void)readFolderWithForced:(BOOL)forced
-{
-    [self reloadDatasource];
-}
-
 - (void)reloadDatasource
 {
     if ([_pageType isEqualToString:k_pageOfflineOffline]) {

iOSClient/Templates/CCAccountWeb.h

@@ -28,7 +28,7 @@
 
 @protocol CCAccountWebDelegate <NSObject>
 
-- (void)readFolderWithForced:(BOOL)forced;
+- (void)readFolderWithForced:(BOOL)forced serverUrl:(NSString *)serverUrl;
 
 @end
 

iOSClient/Templates/CCAccountWeb.m

@@ -199,7 +199,7 @@
         // remove the file
         [CCCoreData deleteMetadataWithPredicate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", fileID, app.activeAccount]];
     
-        [self.delegate readFolderWithForced:YES];
+        [self.delegate readFolderWithForced:YES serverUrl:self.serverUrl];
     }
 }
 

iOSClient/Templates/CCBancomat.h

@@ -28,7 +28,7 @@
 
 @protocol CCBancomatDelegate <NSObject>
 
-- (void)readFolderWithForced:(BOOL)forced;
+- (void)readFolderWithForced:(BOOL)forced serverUrl:(NSString *)serverUrl;
 
 @end
 

iOSClient/Templates/CCBancomat.m

@@ -206,7 +206,7 @@
         // remove the file
         [CCCoreData deleteMetadataWithPredicate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", fileID, app.activeAccount]];
         
-        [self.delegate readFolderWithForced:YES];
+        [self.delegate readFolderWithForced:YES serverUrl:self.serverUrl];
     }
 }
 

iOSClient/Templates/CCCartaDiCredito.h

@@ -28,7 +28,7 @@
 
 @protocol CCCartaDiCreditoDelegate <NSObject>
 
-- (void)readFolderWithForced:(BOOL)forced;
+- (void)readFolderWithForced:(BOOL)forced serverUrl:(NSString *)serverUrl;
 
 @end
 

iOSClient/Templates/CCCartaDiCredito.m

@@ -224,7 +224,7 @@
         // remove the file
         [CCCoreData deleteMetadataWithPredicate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", fileID, app.activeAccount]];
         
-        [self.delegate readFolderWithForced:YES];
+        [self.delegate readFolderWithForced:YES serverUrl:self.serverUrl];
     }
 }
 

iOSClient/Templates/CCCartaIdentita.h

@@ -28,7 +28,7 @@
 
 @protocol CCCartaIdentitaDelegate <NSObject>
 
-- (void)readFolderWithForced:(BOOL)forced;
+- (void)readFolderWithForced:(BOOL)forced serverUrl:(NSString *)serverUrl;
 
 @end
 

iOSClient/Templates/CCCartaIdentita.m

@@ -223,7 +223,7 @@
         // remove the file
         [CCCoreData deleteMetadataWithPredicate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", fileID, app.activeAccount]];
         
-        [self.delegate readFolderWithForced:YES];
+        [self.delegate readFolderWithForced:YES serverUrl:self.serverUrl];
     }
 }
 

iOSClient/Templates/CCContoCorrente.h

@@ -28,7 +28,7 @@
 
 @protocol CCContoCorrenteDelegate <NSObject>
 
-- (void)readFolderWithForced:(BOOL)forced;
+- (void)readFolderWithForced:(BOOL)forced serverUrl:(NSString *)serverUrl;
 
 @end
 

iOSClient/Templates/CCContoCorrente.m

@@ -223,7 +223,7 @@
         // remove the file
         [CCCoreData deleteMetadataWithPredicate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", fileID, app.activeAccount]];
         
-        [self.delegate readFolderWithForced:YES];
+        [self.delegate readFolderWithForced:YES serverUrl:self.serverUrl];
     }
 }
 

iOSClient/Templates/CCNote.h

@@ -28,7 +28,7 @@
 
 @protocol CCNoteDelegate <NSObject>
 
-- (void)readFolderWithForced:(BOOL)forced;
+- (void)readFolderWithForced:(BOOL)forced serverUrl:(NSString *)serverUrl;
 
 @end
 

iOSClient/Templates/CCNote.m

@@ -169,7 +169,7 @@
         // remove the file
         [CCCoreData deleteMetadataWithPredicate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", fileID, app.activeAccount]];
         
-        [self.delegate readFolderWithForced:YES];
+        [self.delegate readFolderWithForced:YES serverUrl:self.serverUrl];
     }
 }
 

iOSClient/Templates/CCPassaporto.h

@@ -28,7 +28,7 @@
 
 @protocol CCPassaportoDelegate <NSObject>
 
-- (void)readFolderWithForced:(BOOL)forced;
+- (void)readFolderWithForced:(BOOL)forced serverUrl:(NSString *)serverUrl;
 
 @end
 

iOSClient/Templates/CCPassaporto.m

@@ -223,7 +223,7 @@
         // remove the file
         [CCCoreData deleteMetadataWithPredicate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", fileID, app.activeAccount]];
         
-        [self.delegate readFolderWithForced:YES];
+        [self.delegate readFolderWithForced:YES serverUrl:self.serverUrl];
     }
 }
 

iOSClient/Templates/CCPatenteGuida.h

@@ -28,7 +28,7 @@
 
 @protocol CCPatenteGuidaDelegate <NSObject>
 
-- (void)readFolderWithForced:(BOOL)forced;
+- (void)readFolderWithForced:(BOOL)forced serverUrl:(NSString *)serverUrl;
 
 @end
 

iOSClient/Templates/CCPatenteGuida.m

@@ -217,7 +217,7 @@
         // remove the file
         [CCCoreData deleteMetadataWithPredicate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", fileID, app.activeAccount]];
         
-        [self.delegate readFolderWithForced:YES];
+        [self.delegate readFolderWithForced:YES serverUrl:self.serverUrl];
     }
 }