Browse Source

alias

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>
Marino Faggiana 2 years ago
parent
commit
47fd455be4
1 changed files with 3 additions and 2 deletions
  1. 3 2
      iOSClient/AppDelegate.swift

+ 3 - 2
iOSClient/AppDelegate.swift

@@ -645,15 +645,16 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
         let tableAccount = NCManageDatabase.shared.getAllAccount()
         let tableAccount = NCManageDatabase.shared.getAllAccount()
         var accounts = [NKDataAccountFile]()
         var accounts = [NKDataAccountFile]()
         for account in tableAccount {
         for account in tableAccount {
+            let alias = account.alias.isEmpty ? account.displayName : account.alias
             let userBaseUrl = account.user + "-" + (URL(string: account.urlBase)?.host ?? "")
             let userBaseUrl = account.user + "-" + (URL(string: account.urlBase)?.host ?? "")
             let avatarFileName = userBaseUrl + "-\(account.user).png"
             let avatarFileName = userBaseUrl + "-\(account.user).png"
             let atPathAvatar = String(CCUtility.getDirectoryUserData()) + "/" + avatarFileName
             let atPathAvatar = String(CCUtility.getDirectoryUserData()) + "/" + avatarFileName
             let toPathAvatar = (dirGroupApps.appendingPathComponent(NCGlobal.shared.appDataShareNextcloud + "/" + avatarFileName)).path
             let toPathAvatar = (dirGroupApps.appendingPathComponent(NCGlobal.shared.appDataShareNextcloud + "/" + avatarFileName)).path
             if FileManager.default.fileExists(atPath: atPathAvatar) {
             if FileManager.default.fileExists(atPath: atPathAvatar) {
                 NCUtilityFileSystem.shared.copyFile(atPath: atPathAvatar, toPath: toPathAvatar)
                 NCUtilityFileSystem.shared.copyFile(atPath: atPathAvatar, toPath: toPathAvatar)
-                accounts.append(NKDataAccountFile(withUrl: account.urlBase, user: account.user, alias: account.alias, avatar: toPathAvatar))
+                accounts.append(NKDataAccountFile(withUrl: account.urlBase, user: account.user, alias: alias, avatar: toPathAvatar))
             } else {
             } else {
-                accounts.append(NKDataAccountFile(withUrl: account.urlBase, user: account.user, alias: account.alias))
+                accounts.append(NKDataAccountFile(withUrl: account.urlBase, user: account.user, alias: alias))
             }
             }
         }
         }
         return NKCommon.shared.createDataAccountFile(at: url, accounts: accounts)
         return NKCommon.shared.createDataAccountFile(at: url, accounts: accounts)