replace activity db

Nextcloud.xcodeproj/project.pbxproj

@@ -639,12 +639,6 @@
 		F7F6AC4E1E525AD300E8EB45 /* CCManageCryptoCloud.m in Sources */ = {isa = PBXBuildFile; fileRef = F7F6AC4D1E525AD300E8EB45 /* CCManageCryptoCloud.m */; };
 		F7F801031D98205A007537BC /* CCCertificate.m in Sources */ = {isa = PBXBuildFile; fileRef = F7F801011D98205A007537BC /* CCCertificate.m */; };
 		F7F801051D98205A007537BC /* CCCertificate.m in Sources */ = {isa = PBXBuildFile; fileRef = F7F801011D98205A007537BC /* CCCertificate.m */; };
-		F7FB5F1C1E66EB7200389481 /* TableActivity+CoreDataClass.m in Sources */ = {isa = PBXBuildFile; fileRef = F7FB5F191E66EB7200389481 /* TableActivity+CoreDataClass.m */; };
-		F7FB5F1E1E66EB7200389481 /* TableActivity+CoreDataProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = F7FB5F1B1E66EB7200389481 /* TableActivity+CoreDataProperties.m */; };
-		F7FB5F201E66F0A400389481 /* TableActivity+CoreDataClass.m in Sources */ = {isa = PBXBuildFile; fileRef = F7FB5F191E66EB7200389481 /* TableActivity+CoreDataClass.m */; };
-		F7FB5F211E66F0A400389481 /* TableActivity+CoreDataClass.m in Sources */ = {isa = PBXBuildFile; fileRef = F7FB5F191E66EB7200389481 /* TableActivity+CoreDataClass.m */; };
-		F7FB5F241E66F0AA00389481 /* TableActivity+CoreDataProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = F7FB5F1B1E66EB7200389481 /* TableActivity+CoreDataProperties.m */; };
-		F7FB5F251E66F0AA00389481 /* TableActivity+CoreDataProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = F7FB5F1B1E66EB7200389481 /* TableActivity+CoreDataProperties.m */; };
 		F7FC7D561DC1F93800BB2C6A /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = F7FC7D551DC1F93800BB2C6A /* libz.tbd */; };
 		F7FC88FA1E140558006D0506 /* cryptocloud.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = F78088E51DD3A1DB005C5A7C /* cryptocloud.xcdatamodeld */; };
 		F7FC88FB1E141A34006D0506 /* BKPasscodeView.strings in Resources */ = {isa = PBXBuildFile; fileRef = F72B60911A24F00B004EF66F /* BKPasscodeView.strings */; };
@@ -1664,10 +1658,6 @@
 		F7F6AC4D1E525AD300E8EB45 /* CCManageCryptoCloud.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCManageCryptoCloud.m; sourceTree = "<group>"; };
 		F7F801001D98205A007537BC /* CCCertificate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCCertificate.h; sourceTree = "<group>"; };
 		F7F801011D98205A007537BC /* CCCertificate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCCertificate.m; sourceTree = "<group>"; };
-		F7FB5F181E66EB7200389481 /* TableActivity+CoreDataClass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "TableActivity+CoreDataClass.h"; sourceTree = "<group>"; };
-		F7FB5F191E66EB7200389481 /* TableActivity+CoreDataClass.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "TableActivity+CoreDataClass.m"; sourceTree = "<group>"; };
-		F7FB5F1A1E66EB7200389481 /* TableActivity+CoreDataProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "TableActivity+CoreDataProperties.h"; sourceTree = "<group>"; };
-		F7FB5F1B1E66EB7200389481 /* TableActivity+CoreDataProperties.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "TableActivity+CoreDataProperties.m"; sourceTree = "<group>"; };
 		F7FC7D551DC1F93800BB2C6A /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
 		F7FCFFD61D70798C000E6E29 /* CCPeekPop.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = CCPeekPop.storyboard; sourceTree = "<group>"; };
 		F7FCFFDD1D707B83000E6E29 /* CCPeekPop.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCPeekPop.h; sourceTree = "<group>"; };
@@ -2865,10 +2855,6 @@
 				F73C414D1E82E51F000137C0 /* TableExternalSites+CoreDataClass.m */,
 				F73C414E1E82E51F000137C0 /* TableExternalSites+CoreDataProperties.h */,
 				F73C414F1E82E51F000137C0 /* TableExternalSites+CoreDataProperties.m */,
-				F7FB5F181E66EB7200389481 /* TableActivity+CoreDataClass.h */,
-				F7FB5F191E66EB7200389481 /* TableActivity+CoreDataClass.m */,
-				F7FB5F1A1E66EB7200389481 /* TableActivity+CoreDataProperties.h */,
-				F7FB5F1B1E66EB7200389481 /* TableActivity+CoreDataProperties.m */,
 				F708CF4D1E56E8CB00271D8B /* TableMetadata+CoreDataClass.h */,
 				F708CF4E1E56E8CB00271D8B /* TableMetadata+CoreDataClass.m */,
 				F708CF4F1E56E8CB00271D8B /* TableMetadata+CoreDataProperties.h */,
@@ -3998,7 +3984,6 @@
 				F71459C41D12E3B700CAFEEC /* UIImage+Saving.m in Sources */,
 				F786AC9D1EBDC88B0055AE9D /* NCDatabase.swift in Sources */,
 				F71459C51D12E3B700CAFEEC /* UIImage+Rotating.m in Sources */,
-				F7FB5F201E66F0A400389481 /* TableActivity+CoreDataClass.m in Sources */,
 				F71459C61D12E3B700CAFEEC /* CCMetadata.m in Sources */,
 				F708CF771E56E8CC00271D8B /* TableLocalFile+CoreDataProperties.m in Sources */,
 				F76B3CE21EAE4E5100921AC9 /* TableCapabilities+CoreDataClass.m in Sources */,
@@ -4023,7 +4008,6 @@
 				F71459E61D12E3B700CAFEEC /* NYXImagesHelper.m in Sources */,
 				F71459E91D12E3B700CAFEEC /* UIImage+Enhancing.m in Sources */,
 				F71459EA1D12E3B700CAFEEC /* CCCellShareExt.m in Sources */,
-				F7FB5F241E66F0AA00389481 /* TableActivity+CoreDataProperties.m in Sources */,
 				F73CCE321DC13798007E38D8 /* UICKeyChainStore.m in Sources */,
 				F708CF831E56E8CC00271D8B /* TableDirectory+CoreDataProperties.m in Sources */,
 				F71459ED1D12E3B700CAFEEC /* UIImage+Masking.m in Sources */,
@@ -4117,10 +4101,8 @@
 				F73CC0801E813DFF006E3047 /* BKTouchIDSwitchView.m in Sources */,
 				F743447C1E127EB2001CC831 /* NSString+TruncateToWidth.m in Sources */,
 				F708CF751E56E8CC00271D8B /* TableLocalFile+CoreDataClass.m in Sources */,
-				F7FB5F211E66F0A400389481 /* TableActivity+CoreDataClass.m in Sources */,
 				F74344831E127F80001CC831 /* RNCryptor.m in Sources */,
 				F708CF961E56E8CC00271D8B /* TableAutomaticUpload+CoreDataProperties.m in Sources */,
-				F7FB5F251E66F0AA00389481 /* TableActivity+CoreDataProperties.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -4330,8 +4312,6 @@
 				F77B0E871D118A16002130FE /* NSData+Base64.m in Sources */,
 				F77B0E8A1D118A16002130FE /* CCCartaDiCredito.m in Sources */,
 				F762CB181EACB66200B38484 /* XLFormValidationStatus.m in Sources */,
-				F7FB5F1C1E66EB7200389481 /* TableActivity+CoreDataClass.m in Sources */,
-				F7FB5F1E1E66EB7200389481 /* TableActivity+CoreDataProperties.m in Sources */,
 				F77B0E8F1D118A16002130FE /* CCSection.m in Sources */,
 				F72AAECB1E5C60C700BB17E1 /* AHKActionSheetViewController.m in Sources */,
 				F77B0E911D118A16002130FE /* CCTemplates.m in Sources */,

iOSClient/Activity/CCActivity.m

@@ -26,9 +26,9 @@
 #import "CCSection.h"
 
 #ifdef CUSTOM_BUILD
-#import "CustomSwift.h"
+    #import "CustomSwift.h"
 #else
-#import "Nextcloud-Swift.h"
+    #import "Nextcloud-Swift.h"
 #endif
 
 #define fontSizeData    [UIFont boldSystemFontOfSize:15]
@@ -162,7 +162,8 @@
     else
         predicate = [NSPredicate predicateWithFormat:@"(account == %@) AND (verbose == %lu) AND (date > %@)", app.activeAccount, k_activityVerboseDefault, sixDaysAgo];
 
-    _sectionDataSource = [CCCoreData getAllTableActivityWithPredicate: predicate];
+    _sectionDataSource = [[NCManageDatabase sharedInstance] getAllTableActivityWithPredicate:predicate];
+    //[CCCoreData getAllTableActivityWithPredicate: predicate];
         
     [self reloadCollection];
 }
@@ -172,7 +173,7 @@
     NSDate *dateActivity;
     
     if ([_sectionDataSource count] > 0)
-        dateActivity = ((TableActivity *)[_sectionDataSource objectAtIndex:0]).date;
+        dateActivity = ((DBActivity *)[_sectionDataSource objectAtIndex:0]).date;
 
     if ([dateActivity compare:_storeDateFirstActivity] == NSOrderedDescending || _storeDateFirstActivity == nil || dateActivity == nil) {
         _storeDateFirstActivity = dateActivity;
@@ -191,7 +192,7 @@
 
 - (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
 {
-    TableActivity *activity = [_sectionDataSource objectAtIndex:section];
+    DBActivity *activity = [_sectionDataSource objectAtIndex:section];
         
     if ([activity.action isEqual: k_activityDebugActionDownload] || [activity.action isEqual: k_activityDebugActionUpload]) {
         
@@ -206,7 +207,7 @@
 
 -(CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout referenceSizeForHeaderInSection:(NSInteger)section
 {
-    TableActivity *activity = [_sectionDataSource objectAtIndex:section];
+    DBActivity *activity = [_sectionDataSource objectAtIndex:section];
     
     UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, collectionView.frame.size.width - 40, CGFLOAT_MAX)];
     label.numberOfLines = 0;
@@ -241,7 +242,7 @@
     
         reusableview = [collectionView dequeueReusableSupplementaryViewOfKind:kind withReuseIdentifier:@"header" forIndexPath:indexPath];
         
-        TableActivity *activity = [_sectionDataSource objectAtIndex:indexPath.section];
+        DBActivity *activity = [_sectionDataSource objectAtIndex:indexPath.section];
     
         UILabel *dateLabel = (UILabel *)[reusableview viewWithTag:100];
         UILabel *actionLabel = (UILabel *)[reusableview viewWithTag:101];
@@ -313,7 +314,7 @@
     //cell.backgroundColor = [UIColor clearColor];
     UIImageView *imageView = (UIImageView *)[cell viewWithTag:104];
 
-    TableActivity *activity = [_sectionDataSource objectAtIndex:indexPath.section];
+    DBActivity *activity = [_sectionDataSource objectAtIndex:indexPath.section];
     
     imageView.image = [UIImage imageWithContentsOfFile:[NSString stringWithFormat:@"%@/%@.ico", app.directoryUser, activity.fileID]];
     
@@ -322,7 +323,7 @@
 
 - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath
 {
-    TableActivity *activity = [_sectionDataSource objectAtIndex:indexPath.section];
+    DBActivity *activity = [_sectionDataSource objectAtIndex:indexPath.section];
     
     CCMetadata *metadata = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(account == %@) AND (fileID == %@)", activity.account, activity.fileID] context:nil];
     

iOSClient/AppDelegate.m

@@ -1327,7 +1327,7 @@
             
         } else {
             
-            [CCCoreData addActivityClient:metadataNet.fileName fileID:metadataNet.assetLocalIdentifier action:k_activityDebugActionUpload selector:selectorUploadAutomatic note:@"Internal error image/video not found [0]" type:k_activityTypeFailure verbose:k_activityVerboseHigh account:_activeAccount activeUrl:_activeUrl];
+            [[NCManageDatabase sharedInstance] addActivityClient:metadataNet.fileName fileID:metadataNet.assetLocalIdentifier action:k_activityDebugActionUpload selector:selectorUploadAutomatic note:@"Internal error image/video not found [0]" type:k_activityTypeFailure verbose:k_activityVerboseHigh account:_activeAccount activeUrl:_activeUrl];
             
             [CCCoreData deleteTableAutomaticUploadForAccount:_activeAccount assetLocalIdentifier:metadataNet.assetLocalIdentifier];
         }
@@ -1371,7 +1371,7 @@
             
         } else {
             
-            [CCCoreData addActivityClient:metadataNet.fileName fileID:metadataNet.assetLocalIdentifier action:k_activityDebugActionUpload selector:selectorUploadAutomatic note:@"Internal error image/video not found [0]" type:k_activityTypeFailure verbose:k_activityVerboseHigh account:_activeAccount activeUrl:_activeUrl];
+            [[NCManageDatabase sharedInstance] addActivityClient:metadataNet.fileName fileID:metadataNet.assetLocalIdentifier action:k_activityDebugActionUpload selector:selectorUploadAutomatic note:@"Internal error image/video not found [0]" type:k_activityTypeFailure verbose:k_activityVerboseHigh account:_activeAccount activeUrl:_activeUrl];
             
             [CCCoreData deleteTableAutomaticUploadForAccount:_activeAccount assetLocalIdentifier:metadataNet.assetLocalIdentifier];            
         }
@@ -1524,7 +1524,7 @@
     if(![ocNetworking automaticCreateFolderSync:folderPhotos]) {
         
         // Activity
-        [CCCoreData addActivityClient:folderPhotos fileID:@"" action:k_activityDebugActionAutomaticUpload selector:selector note:NSLocalizedStringFromTable(@"_not_possible_create_folder_", @"Error", nil) type:k_activityTypeFailure verbose:k_activityVerboseDefault account:_activeAccount activeUrl:_activeUrl];
+        [[NCManageDatabase sharedInstance] addActivityClient:folderPhotos fileID:@"" action:k_activityDebugActionAutomaticUpload selector:selector note:NSLocalizedStringFromTable(@"_not_possible_create_folder_", @"Error", nil) type:k_activityTypeFailure verbose:k_activityVerboseDefault account:_activeAccount activeUrl:_activeUrl];
         
         return false;
     }
@@ -1537,7 +1537,7 @@
             if(![ocNetworking automaticCreateFolderSync:[NSString stringWithFormat:@"%@/%@", folderPhotos, dateSubFolder]]) {
                 
                 // Activity
-                [CCCoreData addActivityClient:[NSString stringWithFormat:@"%@/%@", folderPhotos, dateSubFolder] fileID:@"" action:k_activityDebugActionAutomaticUpload selector:selector note:NSLocalizedString(@"_error_createsubfolders_upload_",nil) type:k_activityTypeFailure verbose:k_activityVerboseDefault account:_activeAccount activeUrl:_activeUrl];
+                [[NCManageDatabase sharedInstance] addActivityClient:[NSString stringWithFormat:@"%@/%@", folderPhotos, dateSubFolder] fileID:@"" action:k_activityDebugActionAutomaticUpload selector:selector note:NSLocalizedString(@"_error_createsubfolders_upload_",nil) type:k_activityTypeFailure verbose:k_activityVerboseDefault account:_activeAccount activeUrl:_activeUrl];
                 
                 return false;
             }

iOSClient/FileSystem/CCCoreData.h

@@ -37,7 +37,6 @@
 #import "OCExternalSites.h"
 #import "OCCapabilities.h"
 #import "TableAccount+CoreDataClass.h"
-#import "TableActivity+CoreDataClass.h"
 #import "TableCertificates+CoreDataClass.h"
 #import "TableMetadata+CoreDataClass.h"
 #import "TableDirectory+CoreDataClass.h"
@@ -212,12 +211,6 @@
 
 + (NSArray *)getHomeOfflineActiveAccount:(NSString *)activeAccount directoryUser:(NSString *)directoryUser fieldOrder:(NSString *)fieldOrder ascending:(BOOL)ascending;
 
-// ===== Activity =====
-
-+ (void)addActivityServer:(OCActivity *)activity account:(NSString *)account;
-+ (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;
-+ (NSArray *)getAllTableActivityWithPredicate:(NSPredicate *)predicate;
-
 // ===== External Sites =====
 
 + (void)addExternalSites:(OCExternalSites *)externalSites account:(NSString *)account;

iOSClient/FileSystem/CCCoreData.m

@@ -1876,76 +1876,6 @@
     return [tableMetadatas sortedArrayUsingDescriptors:[NSArray arrayWithObjects:descriptor, nil]];//[NSArray arrayWithArray:tableMetadatas];
 }
 
-#pragma --------------------------------------------------------------------------------------------
-#pragma mark ===== Activity =====
-#pragma --------------------------------------------------------------------------------------------
-
-+ (void)addActivityServer:(OCActivity *)activity account:(NSString *)account
-{
-    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: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];
-    
-    [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
-{
-    // fix #9 CCCoreData.m line 1909 Version 2.17.2 (00005)
-    if (activeUrl)
-        note = [note stringByReplacingOccurrencesOfString:[activeUrl stringByAppendingString:webDAV] withString:@""];
-    
-    note = [note stringByReplacingOccurrencesOfString:[k_domain_session_queue stringByAppendingString:@"."] withString:@""];
-
-    NSManagedObjectContext *context = [NSManagedObjectContext MR_defaultContext];
-    
-    TableActivity *record = [TableActivity MR_createEntityInContext:context];
-        
-    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
-{
-    NSManagedObjectContext *context = [NSManagedObjectContext MR_defaultContext];
-    
-    NSArray *records = [TableActivity MR_findAllWithPredicate:predicate inContext:context];
-    
-    if ([records count] == 0) return nil;
-    
-    NSSortDescriptor *descriptor = [[NSSortDescriptor alloc] initWithKey:@"date" ascending:NO selector:nil];
-
-    return [records sortedArrayUsingDescriptors:[NSArray arrayWithObjects:descriptor, nil]];
-}
-
 #pragma --------------------------------------------------------------------------------------------
 #pragma mark ===== External Sites =====
 #pragma --------------------------------------------------------------------------------------------
@@ -2295,6 +2225,7 @@
     [context MR_saveToPersistentStoreAndWait];
 }
 
+/*
 + (void)flushTableActivityAccount:(NSString *)account
 {
     NSManagedObjectContext *context = [NSManagedObjectContext MR_defaultContext];
@@ -2310,6 +2241,7 @@
     
     [context MR_saveToPersistentStoreAndWait];
 }
+*/
 
 + (void)flushTableAutomaticUploadAccount:(NSString *)account selector:(NSString *)selector
 {
@@ -2445,7 +2377,7 @@
     NSManagedObjectContext *context = [NSManagedObjectContext MR_defaultContext];
     
     [TableAccount MR_truncateAllInContext:context];
-    [TableActivity MR_truncateAllInContext:context];
+    //[TableActivity MR_truncateAllInContext:context];
     [TableAutomaticUpload MR_truncateAllInContext:context];
     [TableCapabilities MR_truncateAllInContext:context];
     [TableCertificates MR_truncateAllInContext:context];

iOSClient/FileSystem/NCManageDatabase.swift

@@ -87,12 +87,12 @@ class NCManageDatabase: NSObject {
         }
     }
     
-    func getAllTableActivityWithPredicate(_ predicate : NSPredicate) -> Results<DBActivity> {
+    func getAllTableActivityWithPredicate(_ predicate : NSPredicate) -> [DBActivity] {
         
         let realm = try! Realm()
 
-        let records = realm.objects(DBActivity.self).filter(predicate).sorted(byKeyPath: "date")
+        let results = realm.objects(DBActivity.self).filter(predicate).sorted(byKeyPath: "date")
         
-        return records;
+        return Array(results)
     }
 }

iOSClient/FileSystem/TableActivity+CoreDataClass.h

@@ -1,20 +0,0 @@
-//
-//  TableActivity+CoreDataClass.h
-//  Nextcloud
-//
-//  Created by Marino Faggiana on 01/03/17.
-//  Copyright © 2017 TWS. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <CoreData/CoreData.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface TableActivity : NSManagedObject
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#import "TableActivity+CoreDataProperties.h"

iOSClient/FileSystem/TableActivity+CoreDataClass.m

@@ -1,13 +0,0 @@
-//
-//  TableActivity+CoreDataClass.m
-//  Nextcloud
-//
-//  Created by Marino Faggiana on 01/03/17.
-//  Copyright © 2017 TWS. All rights reserved.
-//
-
-#import "TableActivity+CoreDataClass.h"
-
-@implementation TableActivity
-
-@end

iOSClient/FileSystem/TableActivity+CoreDataProperties.h

@@ -1,32 +0,0 @@
-//
-//  TableActivity+CoreDataProperties.h
-//  Nextcloud
-//
-//  Created by Marino Faggiana on 01/03/17.
-//  Copyright © 2017 TWS. All rights reserved.
-//
-
-#import "TableActivity+CoreDataClass.h"
-
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface TableActivity (CoreDataProperties)
-
-+ (NSFetchRequest<TableActivity *> *)fetchRequest;
-
-@property (nullable, nonatomic, copy) NSString *account;
-@property (nullable, nonatomic, copy) NSString *action;
-@property (nullable, nonatomic, copy) NSDate *date;
-@property (nullable, nonatomic, copy) NSString *file;
-@property (nullable, nonatomic, copy) NSString *fileID;
-@property (nullable, nonatomic, copy) NSNumber *idActivity;
-@property (nullable, nonatomic, copy) NSString *link;
-@property (nullable, nonatomic, copy) NSString *note;
-@property (nullable, nonatomic, copy) NSString *selector;
-@property (nullable, nonatomic, copy) NSString *type;
-@property (nullable, nonatomic, copy) NSNumber *verbose;
-
-@end
-
-NS_ASSUME_NONNULL_END

iOSClient/FileSystem/TableActivity+CoreDataProperties.m

@@ -1,29 +0,0 @@
-//
-//  TableActivity+CoreDataProperties.m
-//  Nextcloud
-//
-//  Created by Marino Faggiana on 01/03/17.
-//  Copyright © 2017 TWS. All rights reserved.
-//
-
-#import "TableActivity+CoreDataProperties.h"
-
-@implementation TableActivity (CoreDataProperties)
-
-+ (NSFetchRequest<TableActivity *> *)fetchRequest {
-	return [[NSFetchRequest alloc] initWithEntityName:@"TableActivity"];
-}
-
-@dynamic account;
-@dynamic action;
-@dynamic date;
-@dynamic file;
-@dynamic fileID;
-@dynamic idActivity;
-@dynamic link;
-@dynamic note;
-@dynamic selector;
-@dynamic type;
-@dynamic verbose;
-
-@end

iOSClient/Main/CCMain.m

@@ -34,9 +34,9 @@
 #import "CTAssetCheckmark.h"
 
 #ifdef CUSTOM_BUILD
-#import "CustomSwift.h"
+    #import "CustomSwift.h"
 #else
-#import "Nextcloud-Swift.h"
+    #import "Nextcloud-Swift.h"
 #endif
 
 #define alertCreateFolder 1
@@ -1101,10 +1101,6 @@
 
 - (void)getActivityServerSuccess:(NSArray *)listOfActivity
 {
-    for (OCActivity *activity in listOfActivity) {
-        [CCCoreData addActivityServer:activity account:app.activeAccount];
-    }
-    
     [[NCManageDatabase sharedInstance] addActivityServer:listOfActivity account:app.activeAccount];
     
     // Reload Activity Data Source

iOSClient/Main/CCSection.m

@@ -26,6 +26,32 @@
 #import "CCCoreData.h"
 #import "CCExifGeo.h"
 
+#ifndef EXTENSION
+    #ifdef CUSTOM_BUILD
+        #import "CustomSwift.h"
+    #else
+        #import "Nextcloud-Swift.h"
+    #endif
+#else
+
+#ifdef EXTENSION_SHARE
+#ifdef CUSTOM_BUILD
+#import "CustomSwiftShare.h"
+#else
+#import "Share-Swift.h"
+#endif
+#endif
+
+#ifdef EXTENSION_PICKER
+#ifdef CUSTOM_BUILD
+#import "CustomSwiftPick.h"
+#else
+#import "Picker-Swift.h"
+#endif
+#endif
+
+#endif
+
 @implementation CCSectionDataSourceMetadata
 
 - (id)init {
@@ -267,7 +293,7 @@
     CCSectionDataSourceActivity *sectionDataSource = [CCSectionDataSourceActivity new];
     NSDate *oldDate = [NSDate date];
     
-    for (TableActivity *record in records) {
+    for (DBActivity *record in records) {
         
         NSDateComponents* comps = [[NSCalendar currentCalendar] components:NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitDay fromDate:record.date];
         NSDate *date = [[NSCalendar currentCalendar] dateFromComponents:comps];

iOSClient/Move/CCMove.m

@@ -28,19 +28,16 @@
     #import "AppDelegate.h"
 
     #ifdef CUSTOM_BUILD
-    #import "CustomSwift.h"
+        #import "CustomSwift.h"
     #else
-    #import "Nextcloud-Swift.h"
+        #import "Nextcloud-Swift.h"
     #endif
-
 #else
-
     #ifdef CUSTOM_BUILD
-    #import "CustomSwiftShare.h"
+        #import "CustomSwiftShare.h"
     #else
-    #import "Share-Swift.h"
+        #import "Share-Swift.h"
     #endif
-
 #endif
 
 @interface CCMove ()

iOSClient/Networking/CCNetworking.m

@@ -29,6 +29,30 @@
 #import "NSDate+ISO8601.h"
 #import "NSString+Encode.h"
 
+#ifndef EXTENSION
+    #ifdef CUSTOM_BUILD
+        #import "CustomSwift.h"
+    #else
+        #import "Nextcloud-Swift.h"
+    #endif
+#else
+    #ifdef EXTENSION_SHARE
+        #ifdef CUSTOM_BUILD
+            #import "CustomSwiftShare.h"
+        #else
+            #import "Share-Swift.h"
+        #endif
+    #endif
+
+    #ifdef EXTENSION_PICKER
+        #ifdef CUSTOM_BUILD
+            #import "CustomSwiftPick.h"
+        #else
+            #import "Picker-Swift.h"
+        #endif
+    #endif
+#endif
+
 @interface CCNetworking ()
 {
     NSManagedObjectContext *_context;
@@ -420,12 +444,12 @@
                 date = [dateFormatter dateFromString:[fields objectForKey:@"Date"]];
 
                 // Activity
-                [CCCoreData addActivityClient:fileName fileID:metadata.fileID action:k_activityDebugActionDownload selector:metadata.sessionSelector note:serverUrl type:k_activityTypeSuccess verbose:k_activityVerboseDefault account:metadata.account activeUrl:_activeUrl];
-            
+                [[NCManageDatabase sharedInstance] addActivityClient:fileName fileID:metadata.fileID action:k_activityDebugActionDownload selector:metadata.sessionSelector note:serverUrl type:k_activityTypeSuccess verbose:k_activityVerboseDefault account:metadata.account activeUrl:_activeUrl];
+                
             } else {
             
                 // Activity
-                [CCCoreData addActivityClient:fileName fileID:metadata.fileID action:k_activityDebugActionDownload selector:metadata.sessionSelector note:[NSString stringWithFormat:@"Server: %@ Error: %@", serverUrl, [CCError manageErrorKCF:errorCode withNumberError:YES]] type:k_activityTypeFailure verbose:k_activityVerboseDefault account:metadata.account activeUrl:_activeUrl];
+                [[NCManageDatabase sharedInstance] addActivityClient:fileName fileID:metadata.fileID action:k_activityDebugActionDownload selector:metadata.sessionSelector note:[NSString stringWithFormat:@"Server: %@ Error: %@", serverUrl, [CCError manageErrorKCF:errorCode withNumberError:YES]] type:k_activityTypeFailure verbose:k_activityVerboseDefault account:metadata.account activeUrl:_activeUrl];
             }
         
             // Notification change session
@@ -458,12 +482,12 @@
                 date = [dateFormatter dateFromString:[fields objectForKey:@"Date"]];
             
                 // Activity
-                [CCCoreData addActivityClient:fileName fileID:fileID action:k_activityDebugActionUpload selector:metadata.sessionSelector note:serverUrl type:k_activityTypeSuccess verbose:k_activityVerboseDefault account:metadata.account activeUrl:_activeUrl];
+                [[NCManageDatabase sharedInstance] addActivityClient:fileName fileID:fileID action:k_activityDebugActionUpload selector:metadata.sessionSelector note:serverUrl type:k_activityTypeSuccess verbose:k_activityVerboseDefault account:metadata.account  activeUrl:_activeUrl];
 
             } else {
             
                 // Activity
-                [CCCoreData addActivityClient:fileName fileID:metadata.fileID action:k_activityDebugActionUpload selector:metadata.sessionSelector note:[NSString stringWithFormat:@"Server: %@ Error: %@", serverUrl, [CCError manageErrorKCF:errorCode withNumberError:YES]] type:k_activityTypeFailure verbose:k_activityVerboseDefault account:metadata.account activeUrl:_activeUrl];
+                [[NCManageDatabase sharedInstance] addActivityClient:fileName fileID:metadata.fileID action:k_activityDebugActionUpload selector:metadata.sessionSelector note:[NSString stringWithFormat:@"Server: %@ Error: %@", serverUrl, [CCError manageErrorKCF:errorCode withNumberError:YES]] type:k_activityTypeFailure verbose:k_activityVerboseDefault account:metadata.account  activeUrl:_activeUrl];
             }
         
             // Notification change session
@@ -742,7 +766,7 @@
     
     if (!result.count) {
         
-        [CCCoreData addActivityClient:fileName fileID:assetLocalIdentifier action:k_activityDebugActionUpload selector:selector note:@"Internal error image/video not found [1]" type:k_activityVerboseDefault verbose:k_activityVerboseHigh account:_activeAccount activeUrl:_activeUrl];
+        [[NCManageDatabase sharedInstance] addActivityClient:fileName fileID:assetLocalIdentifier action:k_activityDebugActionUpload selector:selector note:@"Internal error image/video not found [1]" type:k_activityTypeFailure verbose:k_activityVerboseHigh account:_activeAccount  activeUrl:_activeUrl];
 
         if ([delegate respondsToSelector:@selector(uploadFileFailure:fileID:serverUrl:selector:message:errorCode:)])
             [delegate uploadFileFailure:nil fileID:nil serverUrl:serverUrl selector:selector message:@"Internal error image/video not found" errorCode: k_CCErrorInternalError];
@@ -800,7 +824,7 @@
                     if (error) {
                     
                         // Activity
-                        [CCCoreData addActivityClient:fileName fileID:assetLocalIdentifier action:k_activityDebugActionUpload selector:selector note:NSLocalizedString(@"_read_file_error_", nil) type:k_activityTypeFailure verbose:k_activityVerboseDefault account:_activeAccount activeUrl:_activeUrl];
+                        [[NCManageDatabase sharedInstance] addActivityClient:fileName fileID:assetLocalIdentifier action:k_activityDebugActionUpload selector:selector note:NSLocalizedString(@"_read_file_error_", nil) type:k_activityTypeFailure verbose:k_activityVerboseDefault account:_activeAccount  activeUrl:_activeUrl];
                         
                         // Error for uploadFileFailure
                         if ([delegate respondsToSelector:@selector(uploadFileFailure:fileID:serverUrl:selector:message:errorCode:)])
@@ -837,7 +861,7 @@
                     if (error) {
                     
                         // Activity
-                        [CCCoreData addActivityClient:fileName fileID:assetLocalIdentifier action:k_activityDebugActionUpload selector:selector note:NSLocalizedString(@"_read_file_error_", nil) type:k_activityTypeFailure verbose:k_activityVerboseDefault account:_activeAccount activeUrl:_activeUrl];
+                        [[NCManageDatabase sharedInstance] addActivityClient:fileName fileID:assetLocalIdentifier action:k_activityDebugActionUpload selector:selector note:NSLocalizedString(@"_read_file_error_", nil) type:k_activityTypeFailure verbose:k_activityVerboseDefault account:_activeAccount  activeUrl:_activeUrl];
 
                         // Error for uploadFileFailure
                         if ([delegate respondsToSelector:@selector(uploadFileFailure:fileID:serverUrl:selector:message:errorCode:)])
@@ -998,7 +1022,7 @@
                     dispatch_async(dispatch_get_main_queue(), ^{
                         
                         // Activity
-                        [CCCoreData addActivityClient:fileName fileID:uploadID action:k_activityDebugActionUpload selector:selector note:NSLocalizedString(@"_file_already_exists_", nil) type:k_activityTypeFailure verbose:k_activityVerboseDefault account:_activeAccount activeUrl:_activeUrl];
+                        [[NCManageDatabase sharedInstance] addActivityClient:fileName fileID:uploadID action:k_activityDebugActionUpload selector:selector note:NSLocalizedString(@"_file_already_exists_", nil) type:k_activityTypeFailure verbose:k_activityVerboseDefault account:_activeAccount  activeUrl:_activeUrl];
                         
                         // Error for uploadFileFailure
                         if ([[self getDelegate:uploadID] respondsToSelector:@selector(uploadFileFailure:fileID:serverUrl:selector:message:errorCode:)])
@@ -1087,7 +1111,7 @@
                 dispatch_async(dispatch_get_main_queue(), ^{
                     
                     // Activity
-                    [CCCoreData addActivityClient:fileName fileID:uploadID action:k_activityDebugActionUpload selector:selector note:NSLocalizedString(@"_file_already_exists_", nil) type:k_activityTypeFailure verbose:k_activityVerboseDefault account:_activeAccount activeUrl:_activeUrl];
+                    [[NCManageDatabase sharedInstance] addActivityClient:fileName fileID:uploadID action:k_activityDebugActionUpload selector:selector note:NSLocalizedString(@"_file_already_exists_", nil) type:k_activityTypeFailure verbose:k_activityVerboseDefault account:_activeAccount  activeUrl:_activeUrl];
                     
                     // Error for uploadFileFailure
                     if ([[self getDelegate:uploadID] respondsToSelector:@selector(uploadFileFailure:fileID:serverUrl:selector:message:errorCode:)])
@@ -1220,7 +1244,7 @@
         dispatch_async(dispatch_get_main_queue(), ^{
             
             // Activity
-            [CCCoreData addActivityClient:fileName fileID:sessionID action:k_activityDebugActionUpload selector:selector note:NSLocalizedString(@"_file_not_present_", nil) type:k_activityTypeFailure verbose:k_activityVerboseDefault account:_activeAccount activeUrl:_activeUrl];
+            [[NCManageDatabase sharedInstance] addActivityClient:fileName fileID:sessionID action:k_activityDebugActionUpload selector:selector note:NSLocalizedString(@"_file_not_present_", nil) type:k_activityTypeFailure verbose:k_activityVerboseDefault account:_activeAccount  activeUrl:_activeUrl];
             
             // Error for uploadFileFailure
             if ([[self getDelegate:sessionID] respondsToSelector:@selector(uploadFileFailure:fileID:serverUrl:selector:message:errorCode:)])

iOSClient/Networking/OCNetworking.m

@@ -30,6 +30,30 @@
 
 #pragma clang diagnostic ignored "-Warc-performSelector-leaks"
 
+#ifndef EXTENSION
+    #ifdef CUSTOM_BUILD
+        #import "CustomSwift.h"
+    #else
+        #import "Nextcloud-Swift.h"
+    #endif
+#else
+    #ifdef EXTENSION_SHARE
+        #ifdef CUSTOM_BUILD
+            #import "CustomSwiftShare.h"
+        #else
+            #import "Share-Swift.h"
+        #endif
+    #endif
+
+    #ifdef EXTENSION_PICKER
+        #ifdef CUSTOM_BUILD
+            #import "CustomSwiftPick.h"
+        #else
+            #import "Picker-Swift.h"
+        #endif
+    #endif
+#endif
+
 @interface OCnetworking ()
 {
     NSString *_activeUser;
@@ -412,7 +436,7 @@
             [[CCCertificate sharedManager] presentViewControllerCertificateWithTitle:[error localizedDescription] viewController:(UIViewController *)self.delegate delegate:self];
         
         // Activity
-        [CCCoreData addActivityClient:_metadataNet.serverUrl fileID:@"" action:k_activityDebugActionReadFolder selector:@"" note:[error.userInfo valueForKey:@"NSLocalizedDescription"] type:k_activityTypeFailure verbose:k_activityVerboseHigh account:_metadataNet.account activeUrl:_activeUrl];
+        [[NCManageDatabase sharedInstance] addActivityClient:_metadataNet.serverUrl fileID:@"" action:k_activityDebugActionReadFolder selector:@"" note:[error.userInfo valueForKey:@"NSLocalizedDescription"] type:k_activityTypeFailure verbose:k_activityVerboseHigh account:_metadataNet.account activeUrl:_activeUrl];
         
         [self complete];
     }];
@@ -1354,7 +1378,7 @@
             [[CCCertificate sharedManager] presentViewControllerCertificateWithTitle:[error localizedDescription] viewController:(UIViewController *)self.delegate delegate:self];
         
         // Activity
-        [CCCoreData addActivityClient:_activeUrl fileID:@"" action:k_activityDebugActionGetNotification selector:@"" note:[error.userInfo valueForKey:@"NSLocalizedDescription"] type:k_activityTypeFailure verbose:k_activityVerboseHigh account:_metadataNet.account activeUrl:_activeUrl];
+        [[NCManageDatabase sharedInstance] addActivityClient:_activeUrl fileID:@"" action:k_activityDebugActionGetNotification selector:@"" note:[error.userInfo valueForKey:@"NSLocalizedDescription"] type:k_activityTypeFailure verbose:k_activityVerboseHigh account:_metadataNet.account activeUrl:_activeUrl];
         
         [self complete];
     }];
@@ -1424,7 +1448,7 @@
         [communication subscribingPushProxy:k_pushNotificationServer pushToken:pushToken deviceIdentifier:deviceIdentifier deviceIdentifierSignature:signature userPublicKey:[CCUtility URLEncodeStringFromString:publicKey] onCommunication:communication successRequest:^(NSHTTPURLResponse *response, NSString *redirectedServer) {
             
             // Activity
-            [CCCoreData addActivityClient:k_pushNotificationServer fileID:@"" action:k_activityDebugActionPushProxy selector:@"" note:@"Service registered." type:k_activityTypeSuccess verbose:k_activityVerboseHigh account:_metadataNet.account activeUrl:_activeUrl];
+            [[NCManageDatabase sharedInstance] addActivityClient:k_pushNotificationServer fileID:@"" action:k_activityDebugActionPushProxy selector:@"" note:@"Service registered." type:k_activityTypeSuccess verbose:k_activityVerboseHigh account:_metadataNet.account activeUrl:_activeUrl];
             
             [self complete];
             
@@ -1448,8 +1472,8 @@
                 [[CCCertificate sharedManager] presentViewControllerCertificateWithTitle:[error localizedDescription] viewController:(UIViewController *)self.delegate delegate:self];
 
             // Activity
-            [CCCoreData addActivityClient:k_pushNotificationServer fileID:@"" action:k_activityDebugActionPushProxy selector:@"" note:[error.userInfo valueForKey:@"NSLocalizedDescription"] type:k_activityTypeFailure verbose:k_activityVerboseHigh account:_metadataNet.account activeUrl:_activeUrl];
-
+            [[NCManageDatabase sharedInstance] addActivityClient:k_pushNotificationServer fileID:@"" action:k_activityDebugActionPushProxy selector:@"" note:[error.userInfo valueForKey:@"NSLocalizedDescription"] type:k_activityTypeFailure verbose:k_activityVerboseHigh account:_metadataNet.account activeUrl:_activeUrl];
+            
             [self complete];
         }];
         
@@ -1473,8 +1497,8 @@
             [[CCCertificate sharedManager] presentViewControllerCertificateWithTitle:[error localizedDescription] viewController:(UIViewController *)self.delegate delegate:self];
         
         // Activity
-        [CCCoreData addActivityClient:_activeUrl fileID:@"" action:k_activityDebugActionServerPush selector:@"" note:[error.userInfo valueForKey:@"NSLocalizedDescription"] type:k_activityTypeFailure verbose:k_activityVerboseHigh account:_metadataNet.account activeUrl:_activeUrl];
-
+        [[NCManageDatabase sharedInstance] addActivityClient:_activeUrl fileID:@"" action:k_activityDebugActionServerPush selector:@"" note:[error.userInfo valueForKey:@"NSLocalizedDescription"] type:k_activityTypeFailure verbose:k_activityVerboseHigh account:_metadataNet.account activeUrl:_activeUrl];
+        
         [self complete];
     }];
 }
@@ -1596,7 +1620,7 @@
             [[CCCertificate sharedManager] presentViewControllerCertificateWithTitle:[error localizedDescription] viewController:(UIViewController *)self.delegate delegate:self];
 
         // Activity
-        [CCCoreData addActivityClient:_activeUrl fileID:@"" action:k_activityDebugActionCapabilities selector:@"" note:[error.userInfo valueForKey:@"NSLocalizedDescription"] type:k_activityTypeFailure verbose:k_activityVerboseHigh account:_metadataNet.account activeUrl:_activeUrl];
+        [[NCManageDatabase sharedInstance] addActivityClient:_activeUrl fileID:@"" action:k_activityDebugActionCapabilities selector:@"" note:[error.userInfo valueForKey:@"NSLocalizedDescription"] type:k_activityTypeFailure verbose:k_activityVerboseHigh account:_metadataNet.account activeUrl:_activeUrl];
         
         [self complete];
     }];

iOSClient/PhotosCameraUpload/CCPhotosCameraUpload.m

@@ -22,13 +22,12 @@
 //
 
 #import "CCPhotosCameraUpload.h"
-
 #import "AppDelegate.h"
 
 #ifdef CUSTOM_BUILD
-#import "CustomSwift.h"
+    #import "CustomSwift.h"
 #else
-#import "Nextcloud-Swift.h"
+    #import "Nextcloud-Swift.h"
 #endif
 
 @interface CCPhotosCameraUpload () <CCActionsDeleteDelegate, CCActionsDownloadThumbnailDelegate>
@@ -1179,7 +1178,7 @@
         
         if (![CCCoreData addTableAutomaticUpload:metadataNet account:app.activeAccount]) {
             
-            [CCCoreData addActivityClient:fileName fileID:metadataNet.assetLocalIdentifier action:k_activityDebugActionAutomaticUpload selector:metadataNet.selector note:@"File already present in Table automatic Upload" type:k_activityTypeInfo verbose:k_activityVerboseHigh account:app.activeAccount activeUrl:app.activeUrl];
+            [[NCManageDatabase sharedInstance] addActivityClient:fileName fileID:metadataNet.assetLocalIdentifier action:k_activityDebugActionAutomaticUpload selector:metadataNet.selector note:@"File already present in Table automatic Upload" type:k_activityTypeInfo verbose:k_activityVerboseHigh account:app.activeAccount activeUrl:app.activeUrl];
             
             [self endLoadingAssets];
 
@@ -1190,7 +1189,8 @@
         NSString *media = @"";
         if (assetMediaType == PHAssetMediaTypeImage) media = @"Image";
         if (assetMediaType == PHAssetMediaTypeVideo) media = @"Video";
-        [CCCoreData addActivityClient:fileName fileID:metadataNet.assetLocalIdentifier action:k_activityDebugActionAutomaticUpload selector:metadataNet.selector note:[NSString stringWithFormat:@"Add Automatic Upload on Session: %@, Media Type: %@, Asset Data: %@", session, media, [NSDateFormatter localizedStringFromDate:assetDate dateStyle:NSDateFormatterMediumStyle timeStyle:NSDateFormatterMediumStyle]] type:k_activityTypeInfo verbose:k_activityVerboseHigh account:app.activeAccount activeUrl:app.activeUrl];
+        
+        [[NCManageDatabase sharedInstance] addActivityClient:fileName fileID:metadataNet.assetLocalIdentifier action:k_activityDebugActionAutomaticUpload selector:metadataNet.selector note:[NSString stringWithFormat:@"Add Automatic Upload on Session: %@, Media Type: %@, Asset Data: %@", session, media, [NSDateFormatter localizedStringFromDate:assetDate dateStyle:NSDateFormatterMediumStyle timeStyle:NSDateFormatterMediumStyle]] type:k_activityTypeInfo verbose:k_activityVerboseHigh account:app.activeAccount activeUrl:app.activeUrl];
         
         // Upldate Camera Upload data  
         if ([metadataNet.selector isEqualToString:selectorUploadAutomatic])

iOSClient/Settings/CCAdvanced.m

@@ -26,9 +26,9 @@
 #import "AppDelegate.h"
 
 #ifdef CUSTOM_BUILD
-#import "CustomSwift.h"
+    #import "CustomSwift.h"
 #else
-#import "Nextcloud-Swift.h"
+    #import "Nextcloud-Swift.h"
 #endif
 
 @interface CCAdvanced ()
@@ -226,7 +226,7 @@
     // Email Recipents
     NSArray *toRecipents;
     
-    NSArray *activities = [CCCoreData getAllTableActivityWithPredicate:[NSPredicate predicateWithFormat:@"((account == %@) || (account == ''))", app.activeAccount]];
+    NSArray *activities = [[NCManageDatabase sharedInstance] getAllTableActivityWithPredicate:[NSPredicate predicateWithFormat:@"((account == %@) || (account == ''))", app.activeAccount]];
     
     if ([activities count] == 0) {
         
@@ -234,7 +234,7 @@
         return;
     }
     
-    for (TableActivity *activity in activities) {
+    for (DBActivity *activity in activities) {
         
         NSString *date, *type, *actionFile, *note;