Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[fix/single-accouont-display-name] Show Display Name in Branded Single Account View #1049

Merged
merged 6 commits into from
Nov 17, 2021
Merged

[fix/single-accouont-display-name] Show Display Name in Branded Single Account View #1049

Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
77fe6c3
username could be like a uuid, which is not user readable. Instead no…
hosy Oct 14, 2021
96ae32c
fixed syntax error
hosy Oct 14, 2021
aa4373d
fixed compile error
hosy Oct 20, 2021
2b52eb7
first draft for retrieving the user display name for the header view
hosy Nov 12, 2021
d449b38
retrieving the users display name by init a connection and reloading …
hosy Nov 15, 2021
c9e1dbd
fixed merge conflict with branch milestone/11.7.2
hosy Nov 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 28 additions & 3 deletions ownCloud/Static Login/Interface/StaticLoginSingleAccountServerListViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import UIKit
import ownCloudSDK
import ownCloudAppShared
import CoreMedia

class StaticLoginSingleAccountServerListViewController: ServerListTableViewController {
// Sections in the table view controller
Expand Down Expand Up @@ -48,6 +49,7 @@ class StaticLoginSingleAccountServerListViewController: ServerListTableViewContr
weak var staticLoginViewController : StaticLoginViewController?
var canConfigureURL: Bool = true
private var actionRows: [ActionRowIndex] = [.editLogin, .manageStorage, .logout]
var displayName: String?

override func viewDidLoad() {
super.viewDidLoad()
Expand All @@ -59,6 +61,7 @@ class StaticLoginSingleAccountServerListViewController: ServerListTableViewContr
if !VendorServices.shared.canEditAccount {
actionRows = [.manageStorage, .logout]
}
retrieveDisplayName()
}

override func viewWillAppear(_ animated: Bool) {
Expand Down Expand Up @@ -160,9 +163,11 @@ class StaticLoginSingleAccountServerListViewController: ServerListTableViewContr

override func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
if SingleAccountSection(rawValue: section) == .accessFiles {
if headerView == nil, let bookmark : OCBookmark = OCBookmarkManager.shared.bookmarks.first, let userName = bookmark.userName {
let headerText = String(format: "You are connected as\n%@".localized, userName)
headerView = StaticTableViewSection.buildHeader(title: headerText)
if headerView == nil, let bookmark : OCBookmark = OCBookmarkManager.shared.bookmarks.first {
if let displayName = self.displayName ?? bookmark.userName {
let headerText = String(format: "You are connected as\n%@".localized, displayName)
self.headerView = StaticTableViewSection.buildHeader(title: headerText)
}
}

return headerView
Expand Down Expand Up @@ -244,3 +249,23 @@ class StaticLoginSingleAccountServerListViewController: ServerListTableViewContr
self.showModal(viewController: navigationController)
}
}

extension StaticLoginSingleAccountServerListViewController {

func retrieveDisplayName() {
guard let bookmark : OCBookmark = OCBookmarkManager.shared.bookmarks.first else { return }
let connection = OCConnection(bookmark: bookmark)

connection.connect { error, issue in
guard error == nil, issue == nil, let displayName = connection.loggedInUser?.displayName else { return }
self.displayName = displayName
self.headerView = nil
OnMainThread {
self.tableView.reloadData()
}
connection.disconnect {
}
}
}

}