Fix loader
This commit is contained in:
parent
33a16df602
commit
57206c4a5c
|
@ -490,3 +490,5 @@
|
||||||
"vc_qr_code_view_scan_qr_code_explanation" = "Scannen Sie den QR-Code einer Person, um ein Gespräch mit ihr zu beginnen.";
|
"vc_qr_code_view_scan_qr_code_explanation" = "Scannen Sie den QR-Code einer Person, um ein Gespräch mit ihr zu beginnen.";
|
||||||
"vc_view_my_qr_code_explanation" = "Das ist Ihr QR-Code. Andere Benutzer können ihn scannen, um eine Session mit Ihnen zu starten.";
|
"vc_view_my_qr_code_explanation" = "Das ist Ihr QR-Code. Andere Benutzer können ihn scannen, um eine Session mit Ihnen zu starten.";
|
||||||
"vc_share_title" = "Share to Session";
|
"vc_share_title" = "Share to Session";
|
||||||
|
"vc_share_loading_message" = "Preparing attachments...";
|
||||||
|
"vc_share_sending_message" = "Sending...";
|
||||||
|
|
|
@ -521,3 +521,5 @@
|
||||||
"modal_link_previews_explanation" = "Enabling link previews will show previews for URLs you send and receive. This can be useful, but Session will need to contact linked websites to generate previews. You can always disable link previews in Session's settings.";
|
"modal_link_previews_explanation" = "Enabling link previews will show previews for URLs you send and receive. This can be useful, but Session will need to contact linked websites to generate previews. You can always disable link previews in Session's settings.";
|
||||||
"modal_link_previews_button_title" = "Enable";
|
"modal_link_previews_button_title" = "Enable";
|
||||||
"vc_share_title" = "Share to Session";
|
"vc_share_title" = "Share to Session";
|
||||||
|
"vc_share_loading_message" = "Preparing attachments...";
|
||||||
|
"vc_share_sending_message" = "Sending...";
|
||||||
|
|
|
@ -490,3 +490,5 @@
|
||||||
"vc_qr_code_view_scan_qr_code_explanation" = "Escanea el código QR de una persona para comenzar una conversación con ella";
|
"vc_qr_code_view_scan_qr_code_explanation" = "Escanea el código QR de una persona para comenzar una conversación con ella";
|
||||||
"vc_view_my_qr_code_explanation" = "Este es tu código QR. Otros usuarios pueden escanearlo para empezar una Session contigo.";
|
"vc_view_my_qr_code_explanation" = "Este es tu código QR. Otros usuarios pueden escanearlo para empezar una Session contigo.";
|
||||||
"vc_share_title" = "Share to Session";
|
"vc_share_title" = "Share to Session";
|
||||||
|
"vc_share_loading_message" = "Preparing attachments...";
|
||||||
|
"vc_share_sending_message" = "Sending...";
|
||||||
|
|
|
@ -490,3 +490,5 @@
|
||||||
"vc_qr_code_view_scan_qr_code_explanation" = "برای شروع مکالمه با دیگران، کد QR شخصی را اسکن کنید";
|
"vc_qr_code_view_scan_qr_code_explanation" = "برای شروع مکالمه با دیگران، کد QR شخصی را اسکن کنید";
|
||||||
"vc_view_my_qr_code_explanation" = "این کد QR شماست. سایر کاربران میتوانند برای شروع Session با شما آن را اسکن کنند.";
|
"vc_view_my_qr_code_explanation" = "این کد QR شماست. سایر کاربران میتوانند برای شروع Session با شما آن را اسکن کنند.";
|
||||||
"vc_share_title" = "Share to Session";
|
"vc_share_title" = "Share to Session";
|
||||||
|
"vc_share_loading_message" = "Preparing attachments...";
|
||||||
|
"vc_share_sending_message" = "Sending...";
|
||||||
|
|
|
@ -490,3 +490,5 @@
|
||||||
"vc_qr_code_view_scan_qr_code_explanation" = "Scannez le code QR d'un autre utilisateur pour démarrer une session";
|
"vc_qr_code_view_scan_qr_code_explanation" = "Scannez le code QR d'un autre utilisateur pour démarrer une session";
|
||||||
"vc_view_my_qr_code_explanation" = "Ceci est votre code QR. Les autres utilisateurs peuvent le scanner pour démarrer une session avec vous.";
|
"vc_view_my_qr_code_explanation" = "Ceci est votre code QR. Les autres utilisateurs peuvent le scanner pour démarrer une session avec vous.";
|
||||||
"vc_share_title" = "Share to Session";
|
"vc_share_title" = "Share to Session";
|
||||||
|
"vc_share_loading_message" = "Preparing attachments...";
|
||||||
|
"vc_share_sending_message" = "Sending...";
|
||||||
|
|
|
@ -491,3 +491,5 @@
|
||||||
"vc_qr_code_view_scan_qr_code_explanation" = "Pindai kode QR pengguna lain untuk memulai percakapan";
|
"vc_qr_code_view_scan_qr_code_explanation" = "Pindai kode QR pengguna lain untuk memulai percakapan";
|
||||||
"vc_view_my_qr_code_explanation" = "Ini adalah kode QR anda. Pengguna lain bisa memindainya untuk memulai percakapan dengan anda";
|
"vc_view_my_qr_code_explanation" = "Ini adalah kode QR anda. Pengguna lain bisa memindainya untuk memulai percakapan dengan anda";
|
||||||
"vc_share_title" = "Share to Session";
|
"vc_share_title" = "Share to Session";
|
||||||
|
"vc_share_loading_message" = "Preparing attachments...";
|
||||||
|
"vc_share_sending_message" = "Sending...";
|
||||||
|
|
|
@ -490,3 +490,5 @@
|
||||||
"vc_qr_code_view_scan_qr_code_explanation" = "Scansiona il codice QR di un utente per iniziare una conversazione con questa persona";
|
"vc_qr_code_view_scan_qr_code_explanation" = "Scansiona il codice QR di un utente per iniziare una conversazione con questa persona";
|
||||||
"vc_view_my_qr_code_explanation" = "Questo è il tuo codice QR. Altri utenti possono scansionarlo per iniziare una sessione con te.";
|
"vc_view_my_qr_code_explanation" = "Questo è il tuo codice QR. Altri utenti possono scansionarlo per iniziare una sessione con te.";
|
||||||
"vc_share_title" = "Share to Session";
|
"vc_share_title" = "Share to Session";
|
||||||
|
"vc_share_loading_message" = "Preparing attachments...";
|
||||||
|
"vc_share_sending_message" = "Sending...";
|
||||||
|
|
|
@ -491,3 +491,5 @@
|
||||||
"vc_qr_code_view_scan_qr_code_explanation" = "誰かの QR コードをスキャンして、会話を始めましょう";
|
"vc_qr_code_view_scan_qr_code_explanation" = "誰かの QR コードをスキャンして、会話を始めましょう";
|
||||||
"vc_view_my_qr_code_explanation" = "これはあなたの QR コードです。他のユーザーはそれをスキャンして、あなたとの Session を開始できます。";
|
"vc_view_my_qr_code_explanation" = "これはあなたの QR コードです。他のユーザーはそれをスキャンして、あなたとの Session を開始できます。";
|
||||||
"vc_share_title" = "Share to Session";
|
"vc_share_title" = "Share to Session";
|
||||||
|
"vc_share_loading_message" = "Preparing attachments...";
|
||||||
|
"vc_share_sending_message" = "Sending...";
|
||||||
|
|
|
@ -490,3 +490,5 @@
|
||||||
"vc_qr_code_view_scan_qr_code_explanation" = "Zeskanuj czyjś kod QR, aby rozpocząć z nim rozmowę";
|
"vc_qr_code_view_scan_qr_code_explanation" = "Zeskanuj czyjś kod QR, aby rozpocząć z nim rozmowę";
|
||||||
"vc_view_my_qr_code_explanation" = "To jest twój kod QR. Inni użytkownicy mogą go zeskanować, aby rozpocząć z tobą sesję.";
|
"vc_view_my_qr_code_explanation" = "To jest twój kod QR. Inni użytkownicy mogą go zeskanować, aby rozpocząć z tobą sesję.";
|
||||||
"vc_share_title" = "Share to Session";
|
"vc_share_title" = "Share to Session";
|
||||||
|
"vc_share_loading_message" = "Preparing attachments...";
|
||||||
|
"vc_share_sending_message" = "Sending...";
|
||||||
|
|
|
@ -490,3 +490,5 @@
|
||||||
"vc_qr_code_view_scan_qr_code_explanation" = "Escaneie o código QR de alguém para iniciar uma conversa com essa pessoa";
|
"vc_qr_code_view_scan_qr_code_explanation" = "Escaneie o código QR de alguém para iniciar uma conversa com essa pessoa";
|
||||||
"vc_view_my_qr_code_explanation" = "Este é o seu código QR. Outros usuários podem escaneá-lo para iniciar uma sessão com você.";
|
"vc_view_my_qr_code_explanation" = "Este é o seu código QR. Outros usuários podem escaneá-lo para iniciar uma sessão com você.";
|
||||||
"vc_share_title" = "Share to Session";
|
"vc_share_title" = "Share to Session";
|
||||||
|
"vc_share_loading_message" = "Preparing attachments...";
|
||||||
|
"vc_share_sending_message" = "Sending...";
|
||||||
|
|
|
@ -521,3 +521,5 @@
|
||||||
"modal_link_previews_explanation" = "Включение предпросмотра ссылок покажет превью для отправляемых и получаемых ссылок. Это может быть полезно, но Session нужно будет соединиться с сайтами, связанными с ссылками, чтобы сгенерировать предпросмотр. Вы всегда можете отключить предпросмотр ссылок в настройках Session.";
|
"modal_link_previews_explanation" = "Включение предпросмотра ссылок покажет превью для отправляемых и получаемых ссылок. Это может быть полезно, но Session нужно будет соединиться с сайтами, связанными с ссылками, чтобы сгенерировать предпросмотр. Вы всегда можете отключить предпросмотр ссылок в настройках Session.";
|
||||||
"modal_link_previews_button_title" = "Включить";
|
"modal_link_previews_button_title" = "Включить";
|
||||||
"vc_share_title" = "Share to Session";
|
"vc_share_title" = "Share to Session";
|
||||||
|
"vc_share_loading_message" = "Preparing attachments...";
|
||||||
|
"vc_share_sending_message" = "Sending...";
|
||||||
|
|
|
@ -521,3 +521,5 @@
|
||||||
"modal_link_previews_explanation" = "Enabling link previews will show previews for URLs you send and receive. This can be useful, but Session will need to contact linked websites to generate previews. You can always disable link previews in Session's settings.";
|
"modal_link_previews_explanation" = "Enabling link previews will show previews for URLs you send and receive. This can be useful, but Session will need to contact linked websites to generate previews. You can always disable link previews in Session's settings.";
|
||||||
"modal_link_previews_button_title" = "Povoliť";
|
"modal_link_previews_button_title" = "Povoliť";
|
||||||
"vc_share_title" = "Share to Session";
|
"vc_share_title" = "Share to Session";
|
||||||
|
"vc_share_loading_message" = "Preparing attachments...";
|
||||||
|
"vc_share_sending_message" = "Sending...";
|
||||||
|
|
|
@ -497,3 +497,5 @@
|
||||||
"vc_qr_code_view_scan_qr_code_explanation" = "Quét mã QR của ai đó để bắt đầu trò chuyện với họ";
|
"vc_qr_code_view_scan_qr_code_explanation" = "Quét mã QR của ai đó để bắt đầu trò chuyện với họ";
|
||||||
"vc_view_my_qr_code_explanation" = "Đây là mã QR của bạn. Những người dùng khác có thể quét mã này và bắt đầu session với bạn.";
|
"vc_view_my_qr_code_explanation" = "Đây là mã QR của bạn. Những người dùng khác có thể quét mã này và bắt đầu session với bạn.";
|
||||||
"vc_share_title" = "Share to Session";
|
"vc_share_title" = "Share to Session";
|
||||||
|
"vc_share_loading_message" = "Preparing attachments...";
|
||||||
|
"vc_share_sending_message" = "Sending...";
|
||||||
|
|
|
@ -490,3 +490,5 @@
|
||||||
"vc_qr_code_view_scan_qr_code_explanation" = "扫描对方的二维码以发起对话";
|
"vc_qr_code_view_scan_qr_code_explanation" = "扫描对方的二维码以发起对话";
|
||||||
"vc_view_my_qr_code_explanation" = "这是您的二维码。其他用户可以对其进行扫描以发起与您的对话。";
|
"vc_view_my_qr_code_explanation" = "这是您的二维码。其他用户可以对其进行扫描以发起与您的对话。";
|
||||||
"vc_share_title" = "Share to Session";
|
"vc_share_title" = "Share to Session";
|
||||||
|
"vc_share_loading_message" = "Preparing attachments...";
|
||||||
|
"vc_share_sending_message" = "Sending...";
|
||||||
|
|
|
@ -201,10 +201,10 @@ final class ShareVC : UINavigationController, ShareViewDelegate, AppModeManagerD
|
||||||
|
|
||||||
private func showMainContent() {
|
private func showMainContent() {
|
||||||
let threadPickerVC = ThreadPickerVC()
|
let threadPickerVC = ThreadPickerVC()
|
||||||
threadPickerVC.shareDelegate = self
|
threadPickerVC.shareVC = self
|
||||||
setViewControllers([ threadPickerVC ], animated: false)
|
setViewControllers([ threadPickerVC ], animated: false)
|
||||||
let promise = buildAttachments()
|
let promise = buildAttachments()
|
||||||
ModalActivityIndicatorViewController.present(fromViewController: self, canCancel: false) { activityIndicator in
|
ModalActivityIndicatorViewController.present(fromViewController: self, canCancel: false, message: NSLocalizedString("vc_share_loading_message", comment: "")) { activityIndicator in
|
||||||
promise.done { _ in
|
promise.done { _ in
|
||||||
activityIndicator.dismiss { }
|
activityIndicator.dismiss { }
|
||||||
}.catch { _ in
|
}.catch { _ in
|
||||||
|
|
|
@ -4,7 +4,7 @@ final class ThreadPickerVC : UIViewController, UITableViewDataSource, UITableVie
|
||||||
private var threads: YapDatabaseViewMappings!
|
private var threads: YapDatabaseViewMappings!
|
||||||
private var threadViewModelCache: [String:ThreadViewModel] = [:] // Thread ID to ThreadViewModel
|
private var threadViewModelCache: [String:ThreadViewModel] = [:] // Thread ID to ThreadViewModel
|
||||||
private var selectedThread: TSThread?
|
private var selectedThread: TSThread?
|
||||||
var shareDelegate: ShareViewDelegate?
|
var shareVC: ShareVC?
|
||||||
|
|
||||||
private var threadCount: UInt {
|
private var threadCount: UInt {
|
||||||
threads.numberOfItems(inGroup: TSInboxGroup)
|
threads.numberOfItems(inGroup: TSInboxGroup)
|
||||||
|
@ -107,21 +107,20 @@ final class ThreadPickerVC : UIViewController, UITableViewDataSource, UITableVie
|
||||||
Storage.write { transaction in
|
Storage.write { transaction in
|
||||||
tsMessage.save(with: transaction)
|
tsMessage.save(with: transaction)
|
||||||
}
|
}
|
||||||
// DispatchQueue.main.async {
|
shareVC!.dismiss(animated: true, completion: nil)
|
||||||
// ModalActivityIndicatorViewController.present(fromViewController: self.navigationController!, canCancel: false) { activityIndicator in
|
ModalActivityIndicatorViewController.present(fromViewController: shareVC!, canCancel: false, message: NSLocalizedString("vc_share_sending_message", comment: "")) { activityIndicator in
|
||||||
Storage.write { transaction in
|
Storage.write { transaction in
|
||||||
MessageSender.sendNonDurably(message, with: attachments, in: self.selectedThread!, using: transaction).done { [weak self] _ in
|
MessageSender.sendNonDurably(message, with: attachments, in: self.selectedThread!, using: transaction).done { [weak self] _ in
|
||||||
guard let self = self else { return }
|
guard let self = self else { return }
|
||||||
// activityIndicator.dismiss { }
|
activityIndicator.dismiss { }
|
||||||
self.shareDelegate?.shareViewWasCompleted()
|
self.shareVC!.shareViewWasCompleted()
|
||||||
}.catch { [weak self] error in
|
}.catch { [weak self] error in
|
||||||
guard let self = self else { return }
|
guard let self = self else { return }
|
||||||
// activityIndicator.dismiss { }
|
activityIndicator.dismiss { }
|
||||||
self.shareDelegate?.shareViewFailed(error: error)
|
self.shareVC!.shareViewFailed(error: error)
|
||||||
}
|
|
||||||
}
|
}
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func attachmentApprovalDidCancel(_ attachmentApproval: AttachmentApprovalViewController) {
|
func attachmentApprovalDidCancel(_ attachmentApproval: AttachmentApprovalViewController) {
|
||||||
|
|
|
@ -54,7 +54,6 @@ public class ModalActivityIndicatorViewController: OWSViewController {
|
||||||
fromViewController.present(view, animated: false) {
|
fromViewController.present(view, animated: false) {
|
||||||
DispatchQueue.global().async {
|
DispatchQueue.global().async {
|
||||||
backgroundBlock(view)
|
backgroundBlock(view)
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue