Browse Source

Change group share data to group.com.nextcloud.apps

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>
Marino Faggiana 2 years ago
parent
commit
384d76cf45

+ 1 - 1
iOSClient/AppDelegate.swift

@@ -642,7 +642,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
     func createDataAccountFile() -> Error? {
         guard !account.isEmpty, let dirGroupApps = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: NCBrandOptions.shared.capabilitiesGroupApps) else { return nil }
 
-        try? FileManager.default.createDirectory(at: dirGroupApps.appendingPathComponent(NCGlobal.shared.appDatabaseNextcloud), withIntermediateDirectories: true)
+        try? FileManager.default.createDirectory(at: dirGroupApps.appendingPathComponent(NCGlobal.shared.appDataShareNextcloud), withIntermediateDirectories: true)
         let url =  dirGroupApps.appendingPathComponent(NCGlobal.shared.appDatabaseNextcloud + "/" + NCGlobal.shared.fileAccounts)
 
         let tableAccount = NCManageDatabase.shared.getAllAccount()

+ 1 - 1
iOSClient/Brand/NCBrand.swift

@@ -60,7 +60,7 @@ import UIKit
     // BRAND ONLY
     @objc public var use_login_web_personalized:        Bool = false                                                // Don't touch me !!
     @objc public var use_AppConfig:                     Bool = false                                                // Don't touch me !!
-    @objc public var use_GroupApp:                      Bool = true                                                 // Don't touch me !!
+    @objc public var use_GroupApps:                     Bool = true                                                 // Don't touch me !!
 
     // Options
     @objc public var use_default_auto_upload:           Bool = false

+ 1 - 1
iOSClient/Login/NCLogin.swift

@@ -115,7 +115,7 @@ class NCLogin: UIViewController, UITextFieldDelegate, NCLoginQRCodeDelegate {
             navigationItem.leftBarButtonItem = navigationItemCancel
         }
 
-        if NCBrandOptions.shared.use_GroupApp, let dirGroupApps = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: NCBrandOptions.shared.capabilitiesGroupApps) {
+        if NCBrandOptions.shared.use_GroupApps, let dirGroupApps = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: NCBrandOptions.shared.capabilitiesGroupApps) {
             let url = dirGroupApps.appendingPathComponent(NCGlobal.shared.appDataShareTalk + "/" + NCGlobal.shared.fileAccounts)
             if FileManager.default.fileExists(atPath: url.path), let talkAccounts = NKCommon.shared.readDataAccountFile(at: url) {
                 var accountTemp = [NKDataAccountFile]()

+ 4 - 0
iOSClient/NCGlobal.swift

@@ -77,7 +77,11 @@ class NCGlobal: NSObject {
     @objc let appDatabaseNextcloud                  = "Library/Application Support/Nextcloud"
     @objc let appScan                               = "Library/Application Support/Scan"
     @objc let appUserData                           = "Library/Application Support/UserData"
+
+    // Directory on Group data share Nextcloud apps
+    //
     @objc let appDataShareTalk                      = "Library/Application Support/Talk"
+    @objc let appDataShareNextcloud                 = "Library/Application Support/Nextcloud"
 
     // Service
     //

+ 1 - 0
iOSClient/Settings/CCAdvanced.m

@@ -461,6 +461,7 @@
 
         [CCUtility removeGroupDirectoryProviderStorage];
         [CCUtility removeGroupApplicationSupport];
+        [CCUtility removeGroupDataShareAppsNextcloud];
         
         [CCUtility removeDocumentsDirectory];
         [CCUtility removeTemporaryDirectory];

+ 1 - 0
iOSClient/Utility/CCUtility.h

@@ -223,6 +223,7 @@
 + (void)removeDocumentsDirectory;
 + (void)removeTemporaryDirectory;
 + (void)emptyTemporaryDirectory;
++ (void)removeGroupDataShareAppsNextcloud;
 
 + (NSString *)getTitleSectionDate:(NSDate *)date;
 

+ 7 - 0
iOSClient/Utility/CCUtility.m

@@ -1187,6 +1187,13 @@
     }
 }
 
++ (void)removeGroupDataShareAppsNextcloud
+{
+    NSURL *dirGroup = [[NSFileManager defaultManager] containerURLForSecurityApplicationGroupIdentifier:[NCBrandOptions shared].capabilitiesGroupApps];
+    NSString *path = [[dirGroup URLByAppendingPathComponent:NCGlobal.shared.appDataShareNextcloud] path];
+    [[NSFileManager defaultManager] removeItemAtPath:path error:nil];
+}
+
 + (NSString *)getTitleSectionDate:(NSDate *)date
 {
     NSString *title;