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

+ 2 - 2
iOSClient/FileSystem/CCCoreData.h

@@ -83,9 +83,9 @@
 + (void)setCameraUploadWWanVideo:(BOOL)wWan activeAccount:(NSString *)activeAccount;
 + (void)setCameraUploadWWanVideo:(BOOL)wWan activeAccount:(NSString *)activeAccount;
 + (void)setCameraUploadFolderName:(NSString *)fileName activeAccount:(NSString *)activeAccount;
 + (void)setCameraUploadFolderName:(NSString *)fileName activeAccount:(NSString *)activeAccount;
 + (void)setCameraUploadFolderPath:(NSString *)pathName activeUrl:(NSString *)activeUrl activeAccount:(NSString *)activeAccount;
 + (void)setCameraUploadFolderPath:(NSString *)pathName activeUrl:(NSString *)activeUrl activeAccount:(NSString *)activeAccount;
-+ (void)setCameraUploadSaveAlbum:(BOOL)saveAlbum activeAccount:(NSString *)activeAccount;
+//+ (void)setCameraUploadSaveAlbum:(BOOL)saveAlbum activeAccount:(NSString *)activeAccount;
 
 
-+ (void)setUserProfileActiveAccount:(NSString *)activeAccount userProfile:(OCUserProfile *)userProfile;
+//+ (void)setUserProfileActiveAccount:(NSString *)activeAccount userProfile:(OCUserProfile *)userProfile;
 
 
 // ===== Metadata =====
 // ===== Metadata =====
 
 

+ 3 - 0
iOSClient/FileSystem/CCCoreData.m

@@ -457,6 +457,7 @@
     }];
     }];
 }
 }
 
 
+/*
 + (void)setCameraUploadSaveAlbum:(BOOL)saveAlbum activeAccount:(NSString *)activeAccount
 + (void)setCameraUploadSaveAlbum:(BOOL)saveAlbum activeAccount:(NSString *)activeAccount
 {
 {
     [MagicalRecord saveWithBlockAndWait:^(NSManagedObjectContext *localContext) {
     [MagicalRecord saveWithBlockAndWait:^(NSManagedObjectContext *localContext) {
@@ -469,6 +470,7 @@
     }];
     }];
 }
 }
 
 
+
 + (void)setUserProfileActiveAccount:(NSString *)activeAccount userProfile:(OCUserProfile *)userProfile
 + (void)setUserProfileActiveAccount:(NSString *)activeAccount userProfile:(OCUserProfile *)userProfile
 {
 {
     [MagicalRecord saveWithBlockAndWait:^(NSManagedObjectContext *localContext) {
     [MagicalRecord saveWithBlockAndWait:^(NSManagedObjectContext *localContext) {
@@ -494,6 +496,7 @@
         }
         }
     }];
     }];
 }
 }
+*/
 
 
 #pragma --------------------------------------------------------------------------------------------
 #pragma --------------------------------------------------------------------------------------------
 #pragma mark ===== Metadata =====
 #pragma mark ===== Metadata =====

+ 2 - 1
iOSClient/Main/CCMain.m

@@ -1184,7 +1184,8 @@
 
 
 - (void)getUserProfileSuccess:(CCMetadataNet *)metadataNet userProfile:(OCUserProfile *)userProfile
 - (void)getUserProfileSuccess:(CCMetadataNet *)metadataNet userProfile:(OCUserProfile *)userProfile
 {
 {
-    [CCCoreData setUserProfileActiveAccount:metadataNet.account userProfile:userProfile];
+    //[CCCoreData setUserProfileActiveAccount:metadataNet.account userProfile:userProfile];
+    [[NCManageDatabase sharedInstance] setAccountsUserProfile:metadataNet.account userProfile:userProfile];
 
 
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0), ^{
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0), ^{