clear code

iOSClient/AppDelegate.m

@@ -1274,8 +1274,6 @@
         
         [self messageNotification:@"_error_" description:@"_too_errors_automatic_all_" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError errorCode:k_CCErrorInternalError];
         
-        [[NCManageDatabase sharedInstance] addActivityClient:@"" fileID:@"" action:k_activityDebugActionAutoUpload selector:selectorUploadAutoUploadAll note:@"_too_errors_automatic_all_" type:k_activityTypeFailure verbose:k_activityVerboseDefault activeUrl:_activeUrl];
-        
     } else {
         
         while (counterUpload < maxConcurrentOperationDownloadUpload) {

iOSClient/AutoUpload/NCAutoUpload.m

@@ -450,20 +450,11 @@
 {
     @synchronized(self) {
         
-        if ([[NCManageDatabase sharedInstance] addMetadata:metadata] != nil) {
+        (void)[[NCManageDatabase sharedInstance] addMetadata:metadata];
         
-            [[NCManageDatabase sharedInstance] addActivityClient:metadata.fileNameView fileID:metadata.assetLocalIdentifier action:k_activityDebugActionAutoUpload selector:metadata.sessionSelector note:@"Add Auto Upload, add new asset" type:k_activityTypeInfo verbose:k_activityVerboseHigh activeUrl:appDelegate.activeUrl];
-        
-        } else {
-    
-            [[NCManageDatabase sharedInstance] addActivityClient:metadata.fileNameView fileID:metadata.assetLocalIdentifier action:k_activityDebugActionAutoUpload selector:metadata.sessionSelector note:@"Add Auto Upload, asset already present or db in write transaction" type:k_activityTypeInfo verbose:k_activityVerboseHigh activeUrl:appDelegate.activeUrl];
-        }
-    
         // Add asset in table Photo Library
         if ([metadata.sessionSelector isEqualToString:selectorUploadAutoUpload]) {
-            if (![[NCManageDatabase sharedInstance] addPhotoLibrary:@[asset] account:appDelegate.activeAccount]) {
-                [[NCManageDatabase sharedInstance] addActivityClient:metadata.fileNameView fileID:metadata.assetLocalIdentifier action:k_activityDebugActionAutoUpload selector:metadata.sessionSelector note:@"Add Photo Library, db in write transaction" type:k_activityTypeInfo verbose:k_activityVerboseHigh activeUrl:appDelegate.activeUrl];
-            }
+            (void)[[NCManageDatabase sharedInstance] addPhotoLibrary:@[asset] account:appDelegate.activeAccount];
         }
         
         dispatch_async(dispatch_get_main_queue(), ^{
@@ -493,10 +484,7 @@
             (void)[[NCManageDatabase sharedInstance] addDirectoryWithEncrypted:encrypted favorite:false fileID:fileID permissions:nil serverUrl:autoUploadPath account:appDelegate.activeAccount];
         
     } else {
-        
-        // Activity
-        [[NCManageDatabase sharedInstance] addActivityClient:autoUploadPath fileID:@"" action:k_activityDebugActionAutoUpload selector:selector note:NSLocalizedString(@"_not_possible_create_folder_", nil) type:k_activityTypeFailure verbose:k_activityVerboseDefault activeUrl:appDelegate.activeUrl];
-        
+       
         if ([selector isEqualToString:selectorUploadAutoUploadAll])
             [appDelegate messageNotification:@"_error_" description:@"_error_createsubfolders_upload_" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError errorCode:k_CCErrorInternalError];
 
@@ -518,9 +506,6 @@
                 
             } else {
                 
-                // Activity
-                [[NCManageDatabase sharedInstance] addActivityClient:folderPathName fileID:@"" action:k_activityDebugActionAutoUpload selector:selector note:NSLocalizedString(@"_error_createsubfolders_upload_",nil) type:k_activityTypeFailure verbose:k_activityVerboseDefault activeUrl:appDelegate.activeUrl];
-                
                 if ([selector isEqualToString:selectorUploadAutoUploadAll])
                     [appDelegate messageNotification:@"_error_" description:@"_error_createsubfolders_upload_" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError errorCode:k_CCErrorInternalError];
 

iOSClient/Database/NCManageDatabase.swift

@@ -720,55 +720,6 @@ class NCManageDatabase: NSObject {
         return 0
     }
     
-    @objc func addActivityClient(_ file: String, fileID: String, action: String, selector: String, note: String, type: String, verbose: Bool, activeUrl: String?) {
-
-        /*
-        guard let tableAccount = self.getAccountActive() else {
-            return
-        }
-        
-        var noteReplacing : String = ""
-        
-        if let activeUrl = activeUrl {
-            noteReplacing = note.replacingOccurrences(of: "\(activeUrl)\(k_webDAV)", with: "")
-        }
-        
-        noteReplacing = note.replacingOccurrences(of: "\(k_domain_session_queue).", with: "")
-
-        let realm = try! Realm()
-
-        if realm.isInWriteTransaction {
-        
-            print("[LOG] Could not write to database, addActivityClient is already in write transaction")
-            
-        } else {
-            
-            do {
-                try realm.write {
-                
-                    // Add new Activity
-                    let addObject = tableActivity()
-                
-                    addObject.account = tableAccount.account
-                    addObject.action = action
-                    addObject.file = file
-                    addObject.fileID = fileID
-                    addObject.note = noteReplacing
-                    addObject.selector = selector
-                    addObject.type = type
-                    addObject.verbose = verbose
-                
-                    realm.add(addObject)
-                }
-            } catch let error {
-                print("[LOG] Could not write to database: ", error)
-            }
-        }
-        
-        print("[LOG] " + note)
-        */
-    }
-    
     //MARK: -
     //MARK: Table Capabilities
     

iOSClient/Main/NCMainCommon.swift

@@ -1214,8 +1214,6 @@ class NCNetworkingMain: NSObject, CCNetworkingDelegate {
         if errorCode == 0 {
             self.appDelegate.performSelector(onMainThread: #selector(self.appDelegate.loadAutoDownloadUpload), with: nil, waitUntilDone: true)
         } else {
-            NCManageDatabase.sharedInstance.addActivityClient(fileName, fileID: assetLocalIdentifier, action: k_activityDebugActionUpload, selector: selector, note: errorMessage, type: k_activityTypeFailure, verbose: false, activeUrl: appDelegate.activeUrl)
-            
             if errorCode != -999 && errorCode != kOCErrorServerUnauthorized && errorMessage != "" {
                 appDelegate.messageNotification("_upload_file_", description: errorMessage, visible: true, delay: TimeInterval(k_dismissAfterSecond), type: TWMessageBarMessageType.error, errorCode: errorCode)
             }

iOSClient/Networking/CCNetworking.m

@@ -436,7 +436,6 @@
     
     if (downloadTask == nil) {
         
-        [[NCManageDatabase sharedInstance] addActivityClient:metadata.fileName fileID:metadata.fileID action:k_activityDebugActionUpload selector:metadata.sessionSelector note:@"Serious internal error downloadTask not available" type:k_activityTypeFailure verbose:k_activityVerboseHigh activeUrl:tableAccount.url];
         [[NCManageDatabase sharedInstance] setMetadataSession:nil sessionError:@"Serious internal error downloadTask not available" sessionSelector:nil sessionTaskIdentifier:k_taskIdentifierDone status:k_metadataStatusDownloadError predicate:[NSPredicate predicateWithFormat:@"fileID == %@", metadata.fileID]];
         
         if ([self.delegate respondsToSelector:@selector(downloadFileSuccessFailure:fileID:serverUrl:selector:errorMessage:errorCode:)]) {
@@ -498,8 +497,6 @@
     tableMetadata *metadata = [[NCManageDatabase sharedInstance] getMetadataInSessionFromFileName:fileName serverUrl:serverUrl taskIdentifier:downloadTask.taskIdentifier];
     if (!metadata) {
         
-        [[NCManageDatabase sharedInstance] addActivityClient:fileName fileID:@"" action:k_activityDebugActionUpload selector:@"" note:[NSString stringWithFormat:@"Serious error internal download : metadata not found %@", url] type:k_activityTypeFailure verbose:k_activityVerboseDefault activeUrl:@""];
-        
         NSLog(@"[LOG] Serious error internal download : metadata not found %@ ", url);
 
         dispatch_async(dispatch_get_main_queue(), ^{
@@ -550,8 +547,6 @@
         tableMetadata *metadata = [[NCManageDatabase sharedInstance] getMetadataWithPredicate:[NSPredicate predicateWithFormat:@"fileID == %@", fileID]];
         if (!metadata) {
             
-            [[NCManageDatabase sharedInstance] addActivityClient:fileName fileID:fileID action:k_activityDebugActionUpload selector:@"" note:[NSString stringWithFormat:@"Serious error internal download : metadata not found %@", fileName] type:k_activityTypeFailure verbose:k_activityVerboseDefault activeUrl:@""];
-            
             NSLog(@"[LOG] Serious error internal download : metadata not found %@ ", fileName);
             
             if ([self.delegate respondsToSelector:@selector(downloadFileSuccessFailure:fileID:serverUrl:selector:errorMessage:errorCode:)]) {
@@ -576,8 +571,6 @@
             BOOL result = [[NCEndToEndEncryption sharedManager] decryptFileName:metadata.fileName fileNameView:metadata.fileNameView fileID:metadata.fileID key:object.key initializationVector:object.initializationVector authenticationTag:object.authenticationTag];
             if (!result) {
                 
-                [[NCManageDatabase sharedInstance] addActivityClient:metadata.fileNameView fileID:fileID action:k_activityDebugActionUpload selector:@"" note:[NSString stringWithFormat:@"Serious error internal download : decrypt error %@", fileName] type:k_activityTypeFailure verbose:k_activityVerboseDefault activeUrl:@""];
-                
                 if ([self.delegate respondsToSelector:@selector(downloadFileSuccessFailure:fileID:serverUrl:selector:errorMessage:errorCode:)]) {
                     [self.delegate downloadFileSuccessFailure:fileName fileID:fileID serverUrl:serverUrl selector:selector errorMessage:[NSString stringWithFormat:@"Serious error internal download : decrypt error %@", fileName] errorCode:k_CCErrorInternalError];
                 }
@@ -595,9 +588,6 @@
             [CCGraphics createNewImageFrom:metadata.fileNameView fileID:metadata.fileID extension:[metadata.fileNameView pathExtension] filterGrayScale:NO typeFile:metadata.typeFile writeImage:YES];
         }
         
-        // Activity
-        [[NCManageDatabase sharedInstance] addActivityClient:metadata.fileNameView fileID:metadata.fileID action:k_activityDebugActionDownload selector:metadata.sessionSelector note:serverUrl type:k_activityTypeSuccess verbose:k_activityVerboseDefault activeUrl:@""];
-        
         if ([self.delegate respondsToSelector:@selector(downloadFileSuccessFailure:fileID:serverUrl:selector:errorMessage:errorCode:)]) {
             [self.delegate downloadFileSuccessFailure:fileName fileID:fileID serverUrl:serverUrl selector:selector errorMessage:@"" errorCode:0];
         }
@@ -1150,9 +1140,6 @@
             }
         }
 #endif
-        
-        // Actvity
-        [[NCManageDatabase sharedInstance] addActivityClient:metadata.fileNameView fileID:fileID action:k_activityDebugActionUpload selector:metadata.sessionSelector note:serverUrl type:k_activityTypeSuccess verbose:k_activityVerboseDefault activeUrl:tableAccount.url];
     }
     
     // Detect E2EE

iOSClient/Networking/NCService.swift

@@ -158,20 +158,6 @@ class NCService: NSObject {
                             
                         } else {
                             
-                            if errorCode != 0 {
-                                
-                                var error = ""
-                                if let message = message {
-                                    error = "Get Notification Server failure error \(errorCode) \(message)"
-                                } else {
-                                    error = "Get Notification Server failure error \(errorCode)"
-                                }
-                                
-                                NCManageDatabase.sharedInstance.addActivityClient("", fileID: "", action: k_activityDebugActionCapabilities, selector: "Get Notification Server", note: error, type: k_activityTypeFailure, verbose: true, activeUrl: self.appDelegate.activeUrl)
-                            } else {
-                                print("[LOG] It has been changed user during networking process, error.")
-                            }
-                            
                             // Update Main NavigationBar
                             if (self.appDelegate.activeMain.isSelectedMode == false && self.appDelegate.activeMain != nil) {
                                 self.appDelegate.activeMain.setUINavigationBarDefault()
@@ -202,19 +188,7 @@ class NCService: NSObject {
                                 NCManageDatabase.sharedInstance.addExternalSites(externalSites as! OCExternalSites, account: account!)
                             }
                             
-                        } else if errorCode != 0 {
-                            
-                            var error = ""
-                            if let message = message {
-                                error = "Get external site failure error \(errorCode) \(message)"
-                            } else {
-                                error = "Get external site failure error \(errorCode)"
-                            }
-                                
-                            NCManageDatabase.sharedInstance.addActivityClient("", fileID: "", action: k_activityDebugActionCapabilities, selector: "Get external site Server", note: error, type: k_activityTypeFailure, verbose: true, activeUrl: "")
-                        } else {
-                            print("[LOG] It has been changed user during networking process, error.")
-                        }
+                        } 
                     })
                    
                 } else {
@@ -236,18 +210,7 @@ class NCService: NSObject {
                             //if (self.appDelegate.activeActivity != nil) {
                             //    self.appDelegate.activeActivity.reloadDatasource()
                             //}
-                        } else if errorCode != 0 {
-                            var error = ""
-                            if let message = message {
-                                error = "Get Activity Server failure error \(errorCode) \(message)"
-                            } else {
-                                error = "Get Activity Server failure error \(errorCode)"
-                            }
-                            
-                            NCManageDatabase.sharedInstance.addActivityClient("", fileID: "", action: k_activityDebugActionCapabilities, selector: "Get Activity Server", note: error, type: k_activityTypeFailure, verbose: true, activeUrl: "")
-                        } else {
-                            print("[LOG] It has been changed user during networking process, error.")
-                        }
+                        } 
                     })
                 }
                 
@@ -255,13 +218,6 @@ class NCService: NSObject {
                 
                 self.appDelegate.settingThemingColorBrand()
                 
-                var error = ""
-                if let message = message {
-                    error = "Get Capabilities failure error \(errorCode) \(message)"
-                } else {
-                    error = "Get Capabilities failure error \(errorCode)"
-                }
-                NCManageDatabase.sharedInstance.addActivityClient("", fileID: "", action: k_activityDebugActionCapabilities, selector: "Get Capabilities of Server", note: error, type: k_activityTypeFailure, verbose: true, activeUrl: "")
             } else {
                 print("[LOG] It has been changed user during networking process, error.")
                 // Change Theming color
@@ -326,15 +282,10 @@ class NCService: NSObject {
                 
             } else if errorCode != 0 {
                 
-                var error = ""
-                if let message = message {
-                    error = "Get user profile failure error \(errorCode) \(message)"
-                } else {
-                    error = "Get user profile failure error \(errorCode)"
-                }
-                
-                NCManageDatabase.sharedInstance.addActivityClient("", fileID: "", action: k_activityDebugActionCapabilities, selector: "Get user profile Server", note: error, type: k_activityTypeFailure, verbose: true, activeUrl: "")
+                print("Get user profile failure error")
+               
             } else {
+                
                 print("[LOG] It has been changed user during networking process, error.")
             }
         })

iOSClient/Networking/OCNetworking.m

@@ -520,9 +520,6 @@
         else
             message = [error.userInfo valueForKey:@"NSLocalizedDescription"];
         
-        // Activity
-        [[NCManageDatabase sharedInstance] addActivityClient:serverUrl fileID:@"" action:k_activityDebugActionReadFolder selector:@"" note:[error.userInfo valueForKey:@"NSLocalizedDescription"] type:k_activityTypeFailure verbose:k_activityVerboseHigh activeUrl:tableAccount.url];
-
         completion(account, nil, nil, message, errorCode);
     }];
 }
@@ -1622,9 +1619,6 @@
         
         [communication subscribingPushProxy:[NCBrandOptions sharedInstance].pushNotificationServerProxy pushToken:pushToken deviceIdentifier:deviceIdentifier deviceIdentifierSignature:signature publicKey:publicKey onCommunication:communication successRequest:^(NSHTTPURLResponse *response, NSString *redirectedServer) {
             
-            // Activity
-            [[NCManageDatabase sharedInstance] addActivityClient:[NCBrandOptions sharedInstance].pushNotificationServerProxy fileID:@"" action:k_activityDebugActionSubscribingPushProxy selector:@"" note:@"Service registered." type:k_activityTypeSuccess verbose:k_activityVerboseHigh activeUrl:@""];
-            
             completion(account, deviceIdentifier, signature, publicKey, nil, 0);
             
         } failureRequest:^(NSHTTPURLResponse *response, NSError *error, NSString *redirectedServer) {
@@ -1639,10 +1633,7 @@
                 message = NSLocalizedString(@"_server_error_retry_", nil);
             else
                 message = [error.userInfo valueForKey:@"NSLocalizedDescription"];
-            
-            // Activity
-            [[NCManageDatabase sharedInstance] addActivityClient:[NCBrandOptions sharedInstance].pushNotificationServerProxy fileID:@"" action:k_activityDebugActionSubscribingPushProxy selector:@"" note:[error.userInfo valueForKey:@"NSLocalizedDescription"] type:k_activityTypeFailure verbose:k_activityVerboseHigh activeUrl:@""];
-            
+                        
             completion(account, nil, nil, nil, message, errorCode);
         }];