shadowfacts
/
Tusker
2
10
Fork 2
Code Issues 78 Pull Requests Releases Wiki Activity

Merge branch 'private-beta' into develop

This commit is contained in:
Shadowfacts 2020-06-16 23:19:33 -04:00
parent 056346cee9 b623e348c2
commit a901af6be9
Signed by: shadowfacts
GPG Key ID: 94A5AB95422746E5
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Tusker/Screens/Compose/ComposeAttachmentsViewController.swift
View File

@ -75,6 +75,15 @@ class ComposeAttachmentsViewController: UITableViewController {
tableView.dragInteractionEnabled = true tableView.dragInteractionEnabled = true
tableView.dragDelegate = self tableView.dragDelegate = self
tableView.dropDelegate = 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) { override func viewWillAppear(_ animated: Bool) {
@ -98,7 +107,9 @@ class ComposeAttachmentsViewController: UITableViewController {
} }
private func isAddAttachmentsButtonEnabled() -> Bool { private func isAddAttachmentsButtonEnabled() -> Bool {
switch mastodonController.instance.instanceType { switch mastodonController.instance?.instanceType {
case nil:
return false
case .pleroma: case .pleroma:
return true return true
case .mastodon: case .mastodon: