signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Merge branch 'charlesmchen/contactShareErrors'

Browse Source
This commit is contained in:
Matthew Chen 2018-05-09 17:52:11 -04:00
commit e04e063fcc
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Signal/translations/en.lproj/Localizable.strings
View File

@ -478,6 +478,12 @@
/* Title for the 'edit contact share name' view. */
"CONTACT_SHARE_EDIT_NAME_VIEW_TITLE" = "Edit Name";
/* Error indicating that an invalid contact cannot be shared. */
"CONTACT_SHARE_INVALID_CONTACT" = "Invalid contact.";
/* Error indicating that at least one contact field must be selected before sharing a contact. */
"CONTACT_SHARE_NO_FIELDS_SELECTED" = "No contact fields selected.";
/* Indicates that a contact has no name. */
"CONTACT_WITHOUT_NAME" = "Unnamed Contact";

28
SignalMessaging/attachments/ApproveContactShareViewController.swift
View File

@ -278,11 +278,6 @@ public class ApproveContactShareViewController: OWSViewController, EditContactSh
updateNavigationBar()
}
// TODO: Surface error with resolution to user if not.
func canShareContact() -> Bool {
return contactShare.ows_isValid && isAtLeastOneFieldSelected()
}
func isAtLeastOneFieldSelected() -> Bool {
for fieldView in fieldViews {
if fieldView.field.isIncluded() {
@ -297,14 +292,9 @@ public class ApproveContactShareViewController: OWSViewController, EditContactSh
target: self,
action: #selector(didPressCancel))
if canShareContact() {
self.navigationItem.rightBarButtonItem = UIBarButtonItem(title: NSLocalizedString("ATTACHMENT_APPROVAL_SEND_BUTTON",
comment: "Label for 'send' button in the 'attachment approval' dialog."),
style: .plain, target: self, action: #selector(didPressSendButton))
} else {
self.navigationItem.rightBarButtonItem = nil
}
self.navigationItem.rightBarButtonItem = UIBarButtonItem(title: NSLocalizedString("ATTACHMENT_APPROVAL_SEND_BUTTON",
comment: "Label for 'send' button in the 'attachment approval' dialog."),
style: .plain, target: self, action: #selector(didPressSendButton))
}
private func updateContent() {
@ -410,7 +400,17 @@ public class ApproveContactShareViewController: OWSViewController, EditContactSh
func didPressSendButton() {
SwiftAssertIsOnMainThread(#function)
assert(canShareContact())
guard isAtLeastOneFieldSelected() else {
OWSAlerts.showErrorAlert(message: NSLocalizedString("CONTACT_SHARE_NO_FIELDS_SELECTED",
comment: "Error indicating that at least one contact field must be selected before sharing a contact."))
return
}
guard contactShare.ows_isValid else {
OWSAlerts.showErrorAlert(message: NSLocalizedString("CONTACT_SHARE_INVALID_CONTACT",
comment: "Error indicating that an invalid contact cannot be shared."))
return
}
Logger.info("\(logTag) \(#function)")