Remove unneeded brand flags

Signed-off-by: Milen Pivchev <[email protected]>
nextcloud · Jun 12, 2024 · b01a8bb · b01a8bb
1 parent e87f4a1
commit b01a8bb
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 28 deletions.
diff --git a/Brand/NCBrand.swift b/Brand/NCBrand.swift
@@ -47,10 +47,6 @@ let userAgent: String = {
     @objc public var sourceCode: String = "https://github.com/nextcloud/ios"
     @objc public var mobileconfig: String = "/remote.php/dav/provisioning/apple-provisioning.mobileconfig"
 
-    // Personalized
-    @objc public var webCloseViewProtocolPersonalized: String = ""                                                  // example "abc://change/plan"      Don't touch me !!
-    @objc public var folderBrandAutoUpload: String = ""                                                             // example "_auto_upload_folder_"   Don't touch me !!
-
     // Auto Upload default folder
     @objc public var folderDefaultAutoUpload: String = "Photos"
 
@@ -59,15 +55,10 @@ let userAgent: String = {
     @objc public var capabilitiesGroupApps: String = "group.com.nextcloud.apps"
 
     // 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_GroupApps: Bool = true                                                 // Don't touch me !!
 
     // Options
-    @objc public var use_default_auto_upload: Bool = false
     @objc public var use_themingColor: Bool = true
-    @objc public var use_themingLogo: Bool = false
-    @objc public var use_storeLocalAutoUploadAll: Bool = false
 
     @objc public var disable_intro: Bool = false
     @objc public var disable_request_login_url: Bool = false
@@ -98,11 +89,6 @@ let userAgent: String = {
     }
 
     override init() {
-
-        if folderBrandAutoUpload != "" {
-            folderDefaultAutoUpload = folderBrandAutoUpload
-        }
-
         // wrapper AppConfig
         if let configurationManaged = UserDefaults.standard.dictionary(forKey: "com.apple.configuration.managed"), use_AppConfig {
 

diff --git a/iOSClient/AppDelegate.swift b/iOSClient/AppDelegate.swift
@@ -372,7 +372,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
         }
 
         // [WEBPersonalized] [AppConfig]
-        if NCBrandOptions.shared.use_login_web_personalized || NCBrandOptions.shared.use_AppConfig {
+        if NCBrandOptions.shared.use_AppConfig {
             if activeLogin?.view.window == nil {
                 urlBase = NCBrandOptions.shared.loginBaseUrl
                 pollLogin()

diff --git a/iOSClient/Data/NCManageDatabase+Account.swift b/iOSClient/Data/NCManageDatabase+Account.swift
@@ -97,14 +97,14 @@ extension NCManageDatabase {
 
                 addObject.account = account
 
-                // Brand
-                if NCBrandOptions.shared.use_default_auto_upload {
-
-                    addObject.autoUpload = true
-                    addObject.autoUploadImage = true
-                    addObject.autoUploadVideo = true
-                    addObject.autoUploadWWAnVideo = true
-                }
+//                // Brand
+//                if NCBrandOptions.shared.use_default_auto_upload {
+//
+//                    addObject.autoUpload = true
+//                    addObject.autoUploadImage = true
+//                    addObject.autoUploadVideo = true
+//                    addObject.autoUploadWWAnVideo = true
+//                }
 
                 NCKeychain().setPassword(account: account, password: password)
 

diff --git a/iOSClient/Login/NCLogin.swift b/iOSClient/Login/NCLogin.swift
@@ -132,7 +132,7 @@ class NCLogin: UIViewController, UITextFieldDelegate, NCLoginQRCodeDelegate {
             navigationItem.leftBarButtonItem = navigationItemCancel
         }
 
-        if NCBrandOptions.shared.use_GroupApps, let dirGroupApps = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: NCBrandOptions.shared.capabilitiesGroupApps) {
+        if let dirGroupApps = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: NCBrandOptions.shared.capabilitiesGroupApps) {
             // Nextcloud update share accounts
             if let error = appDelegate.updateShareAccounts() {
                 NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Create share accounts \(error.localizedDescription)")

diff --git a/iOSClient/Login/NCLoginPoll.swift b/iOSClient/Login/NCLoginPoll.swift
@@ -21,7 +21,7 @@ struct NCLoginPoll: View {
 
     var body: some View {
         VStack {
-            Text("Please complete the log in process your browser")
+            Text(NSLocalizedString("_poll_desc_", comment: ""))
                 .multilineTextAlignment(.center)
                 .foregroundStyle(.white)
                 .padding()
@@ -32,14 +32,14 @@ struct NCLoginPoll: View {
                 .padding()
 
             HStack {
-                Button("Cancel") {
+                Button(NSLocalizedString("_cancel_", comment: "")) {
                     dismiss()
                 }
                 .disabled(loginManager.isLoading || cancelButtonDisabled)
                 .buttonStyle(.bordered)
                 .tint(.white)
 
-                Button("Retry") {
+                Button(NSLocalizedString("_retry_", comment: "")) {
                     loginManager.openLoginInBrowser()
                 }
                 .buttonStyle(.borderedProminent)

diff --git a/iOSClient/Supporting Files/en.lproj/Localizable.strings b/iOSClient/Supporting Files/en.lproj/Localizable.strings
@@ -158,7 +158,8 @@
 "_disabled_"                = "Disabled";
 "_standard_"                = "Standard";
 "_maximum_"                 = "Maximum";
-"_error_occurred_"           = "An error occurred, please try again";
+"_error_occurred_"          = "An error occurred, please try again";
+"_retry_"                   = "Retry";
 
 /* MARK: Files lock */
 
@@ -1075,3 +1076,5 @@
 "_no_types_"                     = "No provider found";
 "_no_types_subtitle_"            = "AI Providers need to be installed to use the Assistant";
 
+// MARK: Login poll
+"_poll_desc_"                    = "Please complete the log in process your browser";