From 5817bba9418b807acc862007370d599e42eca3e3 Mon Sep 17 00:00:00 2001 From: marinofaggiana Date: Thu, 4 Aug 2022 16:06:56 +0200 Subject: fix Signed-off-by: marinofaggiana --- iOSClient/NCGlobal.swift | 1 - iOSClient/Utility/CCUtility.m | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/iOSClient/NCGlobal.swift b/iOSClient/NCGlobal.swift index 180a3edb1..2b07f2e3c 100644 --- a/iOSClient/NCGlobal.swift +++ b/iOSClient/NCGlobal.swift @@ -88,7 +88,6 @@ class NCGlobal: NSObject { @objc let appUserData = "Library/Application Support/UserData" @objc let appCertificates = "Library/Application Support/Certificates" @objc let appScan = "Library/Application Support/Scan" - @objc let appBackground = "Library/Application Support/Background" @objc let directoryProviderStorage = "File Provider Storage" // Service diff --git a/iOSClient/Utility/CCUtility.m b/iOSClient/Utility/CCUtility.m index 11c754db3..901381d97 100644 --- a/iOSClient/Utility/CCUtility.m +++ b/iOSClient/Utility/CCUtility.m @@ -755,7 +755,9 @@ NSError *error = nil; BOOL success = [URL setResourceValue:[NSNumber numberWithBool: YES] forKey: NSURLIsExcludedFromBackupKey error: &error]; - if(!success){ + if(success) { + NSLog(@"Excluding %@ from backup", [URL lastPathComponent]); + } else { NSLog(@"Error excluding %@ from backup %@", [URL lastPathComponent], error); } @@ -1034,17 +1036,15 @@ path = NSTemporaryDirectory(); if (![[NSFileManager defaultManager] fileExistsAtPath:path]) [[NSFileManager defaultManager] createDirectoryAtPath:path withIntermediateDirectories:YES attributes:nil error:nil]; - - // create Directory Background - path = [[dirGroup URLByAppendingPathComponent:NCGlobal.shared.appBackground] path]; - if (![[NSFileManager defaultManager] fileExistsAtPath:path]) - [[NSFileManager defaultManager] createDirectoryAtPath:path withIntermediateDirectories:YES attributes:nil error:nil]; - + // Directory Excluded From Backup [CCUtility addSkipBackupAttributeToItemAtURL:[[[NSFileManager defaultManager] URLsForDirectory:NSDocumentDirectory inDomains:NSUserDomainMask] lastObject]]; [CCUtility addSkipBackupAttributeToItemAtURL:[[CCUtility getDirectoryGroup] URLByAppendingPathComponent:NCGlobal.shared.directoryProviderStorage]]; + [CCUtility addSkipBackupAttributeToItemAtURL:[[CCUtility getDirectoryGroup] URLByAppendingPathComponent:NCGlobal.shared.appCertificates]]; + [CCUtility addSkipBackupAttributeToItemAtURL:[[CCUtility getDirectoryGroup] URLByAppendingPathComponent:NCGlobal.shared.appDatabaseNextcloud]]; + [CCUtility addSkipBackupAttributeToItemAtURL:[[CCUtility getDirectoryGroup] URLByAppendingPathComponent:NCGlobal.shared.appScan]]; [CCUtility addSkipBackupAttributeToItemAtURL:[[CCUtility getDirectoryGroup] URLByAppendingPathComponent:NCGlobal.shared.appUserData]]; - + #ifdef DEBUG NSLog(@"[LOG] Copy DB on Documents directory"); NSString *atPathDB = [NSString stringWithFormat:@"%@/nextcloud.realm", [[dirGroup URLByAppendingPathComponent:[[NCGlobal shared] appDatabaseNextcloud]] path]]; -- cgit v1.2.3 From 3333f1dd66d7a60aab29462a10f9c7762db38c97 Mon Sep 17 00:00:00 2001 From: marinofaggiana Date: Fri, 5 Aug 2022 11:14:32 +0200 Subject: fix Signed-off-by: marinofaggiana --- iOSClient/NCGlobal.swift | 6 +++--- iOSClient/Utility/CCUtility.m | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/iOSClient/NCGlobal.swift b/iOSClient/NCGlobal.swift index 2b07f2e3c..168f7cb6e 100644 --- a/iOSClient/NCGlobal.swift +++ b/iOSClient/NCGlobal.swift @@ -83,12 +83,12 @@ class NCGlobal: NSObject { // Directory on Group // - @objc let appDatabaseNextcloud = "Library/Application Support/Nextcloud" + @objc let directoryProviderStorage = "File Provider Storage" @objc let appApplicationSupport = "Library/Application Support" - @objc let appUserData = "Library/Application Support/UserData" @objc let appCertificates = "Library/Application Support/Certificates" + @objc let appDatabaseNextcloud = "Library/Application Support/Nextcloud" @objc let appScan = "Library/Application Support/Scan" - @objc let directoryProviderStorage = "File Provider Storage" + @objc let appUserData = "Library/Application Support/UserData" // Service // diff --git a/iOSClient/Utility/CCUtility.m b/iOSClient/Utility/CCUtility.m index 901381d97..2cfc02c84 100644 --- a/iOSClient/Utility/CCUtility.m +++ b/iOSClient/Utility/CCUtility.m @@ -1040,6 +1040,8 @@ // Directory Excluded From Backup [CCUtility addSkipBackupAttributeToItemAtURL:[[[NSFileManager defaultManager] URLsForDirectory:NSDocumentDirectory inDomains:NSUserDomainMask] lastObject]]; [CCUtility addSkipBackupAttributeToItemAtURL:[[CCUtility getDirectoryGroup] URLByAppendingPathComponent:NCGlobal.shared.directoryProviderStorage]]; + [CCUtility addSkipBackupAttributeToItemAtURL:[[CCUtility getDirectoryGroup] URLByAppendingPathComponent:NCGlobal.shared.appApplicationSupport]]; + [CCUtility addSkipBackupAttributeToItemAtURL:[[CCUtility getDirectoryGroup] URLByAppendingPathComponent:NCGlobal.shared.appCertificates]]; [CCUtility addSkipBackupAttributeToItemAtURL:[[CCUtility getDirectoryGroup] URLByAppendingPathComponent:NCGlobal.shared.appDatabaseNextcloud]]; [CCUtility addSkipBackupAttributeToItemAtURL:[[CCUtility getDirectoryGroup] URLByAppendingPathComponent:NCGlobal.shared.appScan]]; -- cgit v1.2.3 From 58aef87135f00c64cda432a2bd2aefde80424a0a Mon Sep 17 00:00:00 2001 From: marinofaggiana Date: Fri, 5 Aug 2022 11:44:10 +0200 Subject: fix code Signed-off-by: marinofaggiana --- iOSClient/Main/Collection Common/NCCollectionViewCommon.swift | 6 ++---- iOSClient/NCGlobal.swift | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/iOSClient/Main/Collection Common/NCCollectionViewCommon.swift b/iOSClient/Main/Collection Common/NCCollectionViewCommon.swift index c76d90dcc..ff6fce011 100644 --- a/iOSClient/Main/Collection Common/NCCollectionViewCommon.swift +++ b/iOSClient/Main/Collection Common/NCCollectionViewCommon.swift @@ -263,10 +263,8 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) { super.viewWillTransition(to: size, with: coordinator) - //coordinator.animate(alongsideTransition: nil) { _ in - self.collectionView?.collectionViewLayout.invalidateLayout() - self.collectionView?.reloadData() - //} + self.collectionView?.collectionViewLayout.invalidateLayout() + self.collectionView?.reloadData() } override var canBecomeFirstResponder: Bool { diff --git a/iOSClient/NCGlobal.swift b/iOSClient/NCGlobal.swift index 168f7cb6e..d7a3272ec 100644 --- a/iOSClient/NCGlobal.swift +++ b/iOSClient/NCGlobal.swift @@ -98,6 +98,7 @@ class NCGlobal: NSObject { let processingTask = "com.nextcloud.processingTask" // Name + // @objc let appName = "files" // Nextcloud version -- cgit v1.2.3 From 7bb634aac330bacc83bd6f3bb50b3df6eb601669 Mon Sep 17 00:00:00 2001 From: marinofaggiana Date: Fri, 5 Aug 2022 11:45:15 +0200 Subject: fix code Signed-off-by: marinofaggiana --- iOSClient/NCGlobal.swift | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/iOSClient/NCGlobal.swift b/iOSClient/NCGlobal.swift index d7a3272ec..f39ccc96c 100644 --- a/iOSClient/NCGlobal.swift +++ b/iOSClient/NCGlobal.swift @@ -209,6 +209,7 @@ class NCGlobal: NSObject { let fileNameRichWorkspace = "Readme.md" // Extension + // @objc let extensionPreview = "ico" // ContentPresenter @@ -368,8 +369,6 @@ class NCGlobal: NSObject { let notificationCenterPlayMedia = "playMedia" let notificationCenterPauseMedia = "pauseMedia" - // Tip - // let tipNCViewerPDFThumbnail = "tipncviewerpdfthumbnail" let tipNCCollectionViewCommonAccountRequest = "tipnccollectionviewcommonaccountrequest" let tipNCScanAddImage = "tipncscanaddimage" -- cgit v1.2.3 From 56769e22068c14595483e77248ac7506e5c483f6 Mon Sep 17 00:00:00 2001 From: marinofaggiana Date: Fri, 5 Aug 2022 13:28:22 +0200 Subject: fix code Signed-off-by: marinofaggiana --- iOSClient/Utility/CCUtility.m | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/iOSClient/Utility/CCUtility.m b/iOSClient/Utility/CCUtility.m index 2cfc02c84..a7def701a 100644 --- a/iOSClient/Utility/CCUtility.m +++ b/iOSClient/Utility/CCUtility.m @@ -755,9 +755,7 @@ NSError *error = nil; BOOL success = [URL setResourceValue:[NSNumber numberWithBool: YES] forKey: NSURLIsExcludedFromBackupKey error: &error]; - if(success) { - NSLog(@"Excluding %@ from backup", [URL lastPathComponent]); - } else { + if(!success){ NSLog(@"Error excluding %@ from backup %@", [URL lastPathComponent], error); } -- cgit v1.2.3 From c32ffbb3c6a315933302125f3afc2caf20a00ede Mon Sep 17 00:00:00 2001 From: marinofaggiana Date: Fri, 5 Aug 2022 13:58:14 +0200 Subject: fix code Signed-off-by: marinofaggiana --- iOSClient/Utility/CCUtility.m | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/iOSClient/Utility/CCUtility.m b/iOSClient/Utility/CCUtility.m index a7def701a..089365bf0 100644 --- a/iOSClient/Utility/CCUtility.m +++ b/iOSClient/Utility/CCUtility.m @@ -750,12 +750,12 @@ #pragma -------------------------------------------------------------------------------------------- + (BOOL)addSkipBackupAttributeToItemAtURL:(NSURL *)URL -{ - assert([[NSFileManager defaultManager] fileExistsAtPath: [URL path]]); - +{ NSError *error = nil; BOOL success = [URL setResourceValue:[NSNumber numberWithBool: YES] forKey: NSURLIsExcludedFromBackupKey error: &error]; - if(!success){ + if(success) { + NSLog(@"Excluding %@ from backup", [URL lastPathComponent]); + } else { NSLog(@"Error excluding %@ from backup %@", [URL lastPathComponent], error); } -- cgit v1.2.3