fix

iOSClient/FileSystem/CCCoreData.m

@@ -1880,25 +1880,26 @@
 
 + (void)addActivityServer:(OCActivity *)activity account:(NSString *)account
 {
-    [MagicalRecord saveWithBlockAndWait:^(NSManagedObjectContext *localContext) {
-        
-        if (activity.idActivity != 0)
-            [TableActivity MR_deleteAllMatchingPredicate:[NSPredicate predicateWithFormat:@"(account == %@) AND (idActivity == %d)", account, activity.idActivity] inContext:localContext];
+    NSManagedObjectContext *context = [NSManagedObjectContext MR_defaultContext];
+    
+    if (activity.idActivity != 0)
+        [TableActivity MR_deleteAllMatchingPredicate:[NSPredicate predicateWithFormat:@"(account == %@) AND (idActivity == %d)", account, activity.idActivity] inContext:context];
         
-        TableActivity *record = [TableActivity MR_createEntityInContext:localContext];
+    TableActivity *record = [TableActivity MR_createEntityInContext:context];
 
-        record.account = account;
-        record.action = @"Activity";
-        record.date = activity.date;
-        record.file = activity.file;
-        record.fileID = @"";
-        record.idActivity = [NSNumber numberWithInteger:activity.idActivity];
-        record.link = activity.link;
-        record.note = activity.subject;
-        record.selector = @"";
-        record.type = k_activityTypeInfo;
-        record.verbose = [NSNumber numberWithInteger:k_activityVerboseDefault];
-    }];
+    record.account = account;
+    record.action = @"Activity";
+    record.date = activity.date;
+    record.file = activity.file;
+    record.fileID = @"";
+    record.idActivity = [NSNumber numberWithInteger:activity.idActivity];
+    record.link = activity.link;
+    record.note = activity.subject;
+    record.selector = @"";
+    record.type = k_activityTypeInfo;
+    record.verbose = [NSNumber numberWithInteger:k_activityVerboseDefault];
+    
+    [context MR_saveToPersistentStoreAndWait];
 }
 
 + (void)addActivityClient:(NSString *)file fileID:(NSString *)fileID action:(NSString *)action selector:(NSString *)selector note:(NSString *)note type:(NSString *)type verbose:(NSInteger)verbose account:(NSString *)account activeUrl:(NSString *)activeUrl
@@ -1906,24 +1907,25 @@
     note = [note stringByReplacingOccurrencesOfString:[activeUrl stringByAppendingString:webDAV] withString:@""];
     note = [note stringByReplacingOccurrencesOfString:[k_domain_session_queue stringByAppendingString:@"."] withString:@""];
 
-    [MagicalRecord saveWithBlockAndWait:^(NSManagedObjectContext *localContext) {
+    NSManagedObjectContext *context = [NSManagedObjectContext MR_defaultContext];
+    
+    TableActivity *record = [TableActivity MR_createEntityInContext:context];
         
-        TableActivity *record = [TableActivity MR_createEntityInContext:localContext];
-        
-        if (!account) record.account = @"";
-        else record.account = account;
-        
-        record.action = action;
-        record.date = [NSDate date];
-        record.file = file;
-        record.fileID = fileID;
-        record.idActivity = 0;
-        record.link = @"";
-        record.note = note;
-        record.selector = selector;
-        record.type = type;
-        record.verbose = [NSNumber numberWithInteger:verbose];
-   }];
+    if (!account) record.account = @"";
+    else record.account = account;
+        
+    record.action = action;
+    record.date = [NSDate date];
+    record.file = file;
+    record.fileID = fileID;
+    record.idActivity = 0;
+    record.link = @"";
+    record.note = note;
+    record.selector = selector;
+    record.type = type;
+    record.verbose = [NSNumber numberWithInteger:verbose];
+   
+    [context MR_saveToPersistentStoreAndWait];
 }
 
 + (NSArray *)getAllTableActivityWithPredicate:(NSPredicate *)predicate

iOSClient/Main/CCDetail.m

@@ -783,6 +783,9 @@
 
 - (void)insertGeocoderLocation:(NSNotification *)notification
 {
+    if (notification.userInfo.count == 0)
+        return;
+    
     NSString *fileID = [[notification.userInfo allKeys] objectAtIndex:0];
     //NSDate *date = [[notification.userInfo allValues] objectAtIndex:0];
  
@@ -790,21 +793,18 @@
     if (self.indexNowVisible >= [self.photos count])
         return;
     
-    dispatch_async(dispatch_get_main_queue(), ^{
-        
-        if ([fileID isEqualToString:self.fileIDNowVisible]) {
+    if ([fileID isEqualToString:self.fileIDNowVisible]) {
             
-            MWPhoto *photo = [self.photos objectAtIndex:self.indexNowVisible];
+        MWPhoto *photo = [self.photos objectAtIndex:self.indexNowVisible];
             
-            [self setLocationCaptionPhoto:photo fileID:fileID];
+        [self setLocationCaptionPhoto:photo fileID:fileID];
             
-            if (![self.photoBrowser isGridController]) {
+        if (![self.photoBrowser isGridController]) {
             
-                [self.photoBrowser hideControls];
-                [self.photoBrowser showControls];
-            }
+            //[self.photoBrowser hideControls];
+            [self.photoBrowser showControls];
         }
-    });
+    }
 }
 
 - (void)setLocationCaptionPhoto:(MWPhoto *)photo fileID:(NSString *)fileID