Merge branch 'private-beta' into develop
This commit is contained in:
commit
a901af6be9
|
@ -75,6 +75,15 @@ class ComposeAttachmentsViewController: UITableViewController {
|
|||
tableView.dragInteractionEnabled = true
|
||||
tableView.dragDelegate = self
|
||||
tableView.dropDelegate = self
|
||||
|
||||
if mastodonController.instance == nil {
|
||||
mastodonController.getOwnInstance { [weak self] (_) in
|
||||
guard let self = self else { return }
|
||||
DispatchQueue.main.async {
|
||||
self.updateAddAttachmentsButtonEnabled()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override func viewWillAppear(_ animated: Bool) {
|
||||
|
@ -98,7 +107,9 @@ class ComposeAttachmentsViewController: UITableViewController {
|
|||
}
|
||||
|
||||
private func isAddAttachmentsButtonEnabled() -> Bool {
|
||||
switch mastodonController.instance.instanceType {
|
||||
switch mastodonController.instance?.instanceType {
|
||||
case nil:
|
||||
return false
|
||||
case .pleroma:
|
||||
return true
|
||||
case .mastodon:
|
||||
|
|
Loading…
Reference in New Issue