Favorites (offline)

iOSClient/CCStandardImages.h

@@ -130,7 +130,7 @@
 #define image_settingsClearCache                @"settingsClearCache"
 #define image_settingsCredentials               @"settingsCredentials"
 #define image_settingsCryptoCloud               @"settingsCryptoCloud"
-#define image_settingsFavoriteFoldersOffline    @"settingsFavoriteFoldersOffline"
+#define image_settingsFavoriteOffline           @"settingsFavoriteOffline"
 #define image_settingsRemoveCryptoCloud         @"settingsRemoveCryptoCloud"
 #define image_settingsExit                      @"settingsExit"
 #define image_settingsHelp                      @"settingsHelp"

iOSClient/Offline/CCSynchronize.m

@@ -85,7 +85,7 @@
     metadataNet.directoryID = directoryID;
     metadataNet.priority = NSOperationQueuePriorityNormal;
     
-    if ([CCUtility getFavoriteFoldersOffline])
+    if ([CCUtility getFavoriteOffline])
         selector = selectorReadFolder;
     else
         selector = selectorReadFolderRefresh;
@@ -138,7 +138,7 @@
                 NSString *directoryID = [CCCoreData getDirectoryIDFromServerUrl:serverUrl activeAccount:app.activeAccount];
                 NSString *selector;
                 
-                if ([CCUtility getFavoriteFoldersOffline])
+                if ([CCUtility getFavoriteOffline])
                     selector = selectorReadFolder;
                 else
                     selector = selectorReadFolderRefresh;

iOSClient/Settings/CCSettings.m

@@ -186,10 +186,10 @@
     
     section = [XLFormSectionDescriptor formSection];
     [form addFormSection:section];
-    section.footerTitle = NSLocalizedString(@"_favorite_folders_offline_footer_", nil);
+    section.footerTitle = NSLocalizedString(@"_favorite_offline_footer_", nil);
     
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"favoritefoldersoffline" rowType:XLFormRowDescriptorTypeBooleanSwitch title:NSLocalizedString(@"_favorite_folders_offline_", nil)];
-    [row.cellConfig setObject:[UIImage imageNamed:image_settingsFavoriteFoldersOffline] forKey:@"imageView.image"];
+    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"favoriteoffline" rowType:XLFormRowDescriptorTypeBooleanSwitch title:NSLocalizedString(@"_favorite_offline_", nil)];
+    [row.cellConfig setObject:[UIImage imageNamed:image_settingsFavoriteOffline] forKey:@"imageView.image"];
     [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
     [section addFormRow:row];
 
@@ -393,7 +393,7 @@
     XLFormRowDescriptor *rowBloccoPasscode = [self.form formRowWithTag:@"bloccopasscode"];
     XLFormRowDescriptor *rowSimplyPasscode = [self.form formRowWithTag:@"simplypasscode"];
     XLFormRowDescriptor *rowOnlyLockDir = [self.form formRowWithTag:@"onlylockdir"];
-    XLFormRowDescriptor *rowFavoriteFoldersOffline = [self.form formRowWithTag:@"favoritefoldersoffline"];
+    XLFormRowDescriptor *rowFavoriteOffline = [self.form formRowWithTag:@"favoriteoffline"];
 
     XLFormRowDescriptor *rowVersionServer = [self.form formRowWithTag:@"versionserver"];
     XLFormRowDescriptor *rowUrlCloud = [self.form formRowWithTag:@"urlcloud"];
@@ -422,7 +422,7 @@
     
     if ([CCUtility getSimplyBlockCode]) [rowSimplyPasscode setValue:@1]; else [rowSimplyPasscode setValue:@0];
     if ([CCUtility getOnlyLockDir]) [rowOnlyLockDir setValue:@1]; else [rowOnlyLockDir setValue:@0];
-    if ([CCUtility getFavoriteFoldersOffline]) [rowFavoriteFoldersOffline setValue:@1]; else [rowFavoriteFoldersOffline setValue:@0];
+    if ([CCUtility getFavoriteOffline]) [rowFavoriteOffline setValue:@1]; else [rowFavoriteOffline setValue:@0];
     
     // Avatar
     UIImage *avatar = [[UIImage alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/avatar.png", app.directoryUser]];
@@ -518,14 +518,14 @@
             [self changeSimplyPassword];
     }
     
-    if ([rowDescriptor.tag isEqualToString:@"favoritefoldersoffline"]) {
+    if ([rowDescriptor.tag isEqualToString:@"favoriteoffline"]) {
         
         if ([[rowDescriptor.value valueData] boolValue] == YES) {
             
             UIAlertController *alertController = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"_confirm_", nil) message:NSLocalizedString(@"_continue_", nil) preferredStyle:UIAlertControllerStyleActionSheet];
             
             [alertController addAction: [UIAlertAction actionWithTitle:NSLocalizedString(@"_ok_", nil) style:UIAlertActionStyleDestructive handler:^(UIAlertAction *action) {
-                [CCUtility setFavoriteFoldersOffline:true];
+                [CCUtility setFavoriteOffline:true];
                 [self synchronizeFavorites];
             }]];
             
@@ -537,7 +537,7 @@
 
         } else {
             
-            [CCUtility setFavoriteFoldersOffline:false];
+            [CCUtility setFavoriteOffline:false];
         }
     }
 }
@@ -696,19 +696,23 @@
 {
     NSArray *recordsTableMetadata = [CCCoreData  getTableMetadataWithPredicate:[NSPredicate predicateWithFormat:@"(account == %@) AND (favorite == 1)", app.activeAccount] context:nil];
     
-    for (TableMetadata *record in recordsTableMetadata) {
+    for (TableMetadata *tableMetadata in recordsTableMetadata) {
         
-        if (!record.directoryID)
-            continue;
+        if (tableMetadata.directory) {
         
-        NSString *serverUrl = [CCCoreData getServerUrlFromDirectoryID:record.directoryID activeAccount:app.activeAccount];
-        serverUrl = [CCUtility stringAppendServerUrl:serverUrl addFileName:record.fileNamePrint];
+            NSString *serverUrl = [CCCoreData getServerUrlFromDirectoryID:tableMetadata.directoryID activeAccount:app.activeAccount];
+            serverUrl = [CCUtility stringAppendServerUrl:serverUrl addFileName:tableMetadata.fileNamePrint];
         
-        NSArray *TableDirectories = [CCCoreData getDirectoryIDsFromBeginsWithServerUrl:serverUrl activeAccount:app.activeAccount];
+            NSArray *TableDirectories = [CCCoreData getDirectoryIDsFromBeginsWithServerUrl:serverUrl activeAccount:app.activeAccount];
         
-        for (TableDirectory *tableDirecory in TableDirectories) {
-            NSLog(@"%@", tableDirecory.serverUrl);
-            [CCCoreData clearDateReadAccount:app.activeAccount serverUrl:nil directoryID:tableDirecory.directoryID];
+            for (TableDirectory *tableDirecory in TableDirectories) {
+                NSLog(@"%@", tableDirecory.serverUrl);
+                [CCCoreData clearDateReadAccount:app.activeAccount serverUrl:nil directoryID:tableDirecory.directoryID];
+            }
+            
+        } else {
+            
+            [CCCoreData clearDateReadAccount:app.activeAccount serverUrl:nil directoryID:tableMetadata.directoryID];
         }
     }
     

iOSClient/Utility/CCUtility.h

@@ -82,7 +82,7 @@
 
 + (void)setCreateMenuEncrypted:(BOOL)encrypted;
 
-+ (void)setFavoriteFoldersOffline:(BOOL)encrypted;
++ (void)setFavoriteOffline:(BOOL)encrypted;
 
 // GET
 
@@ -121,7 +121,7 @@
 
 + (BOOL)getCreateMenuEncrypted;
 
-+ (BOOL)getFavoriteFoldersOffline;
++ (BOOL)getFavoriteOffline;
 
 // ===== Varius =====
 

iOSClient/Utility/CCUtility.m

@@ -189,10 +189,10 @@
     [UICKeyChainStore setString:sEncrypted forKey:@"createMenuEncrypted" service:k_serviceShareKeyChain];
 }
 
-+ (void)setFavoriteFoldersOffline:(BOOL)encrypted
++ (void)setFavoriteOffline:(BOOL)encrypted
 {
-    NSString *sFavoriteFoldersOffline = (encrypted) ? @"true" : @"false";
-    [UICKeyChainStore setString:sFavoriteFoldersOffline forKey:@"favoriteFolderOffline" service:k_serviceShareKeyChain];
+    NSString *sFavoriteOffline = (encrypted) ? @"true" : @"false";
+    [UICKeyChainStore setString:sFavoriteOffline forKey:@"favoriteOffline" service:k_serviceShareKeyChain];
 }
 
 
@@ -370,9 +370,9 @@
     return [[UICKeyChainStore stringForKey:@"createMenuEncrypted" service:k_serviceShareKeyChain] boolValue];
 }
 
-+ (BOOL)getFavoriteFoldersOffline
++ (BOOL)getFavoriteOffline
 {
-    return [[UICKeyChainStore stringForKey:@"favoriteFolderOffline" service:k_serviceShareKeyChain] boolValue];
+    return [[UICKeyChainStore stringForKey:@"favoriteOffline" service:k_serviceShareKeyChain] boolValue];
 }
 
 #pragma --------------------------------------------------------------------------------------------

iOSClient/en.lproj/Localizable.strings

@@ -139,8 +139,8 @@
 "_user_web_"                = "Website";
 "_user_twitter_"            = "Twitter";
 "_quota_using_"             = "You are using %@ of %@";
-"_favorite_folders_offline_"           = "Favorite folders available offline";
-"_favorite_folders_offline_footer_"    = "Making all favorite folders available offline may take a long time with a high memory occupation.";
+"_favorite_offline_"        = "Favorites available offline";
+"_favorite_offline_footer_" = "Making all favorites available offline may take a long time with a high memory occupation.";
 
 // Manage Camera Upload