oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

tweak: Delete -> Decline

This commit is contained in:
ryanzhao 2022-08-12 15:48:09 +10:00
parent 0ed4c7d66e
commit 78d68bcc38
3 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Session/Conversations/ConversationVC+Interaction.swift
View File

@ -1713,27 +1713,9 @@ extension ConversationVC {
// Delete the request // Delete the request
Storage.shared.writeAsync( Storage.shared.writeAsync(
updates: { db in updates: { db in
// Update the contact
_ = try Contact
.fetchOrCreate(db, id: threadId)
.with(
isApproved: false,
isBlocked: true,
// Note: We set this to true so the current user will be able to send a
// message to the person who originally sent them the message request in
// the future if they unblock them
didApproveMe: true
)
.saved(db)
_ = try SessionThread _ = try SessionThread
.filter(id: threadId) .filter(id: threadId)
.deleteAll(db) .deleteAll(db)
try MessageSender
.syncConfiguration(db, forceSyncNow: true)
.retainUntilComplete()
}, },
completion: { db, _ in completion: { db, _ in
DispatchQueue.main.async { [weak self] in DispatchQueue.main.async { [weak self] in

2
Session/Conversations/ConversationVC.swift
View File

@ -260,7 +260,7 @@ final class ConversationVC: BaseVC, OWSConversationSettingsViewDelegate, Convers
result.translatesAutoresizingMaskIntoConstraints = false result.translatesAutoresizingMaskIntoConstraints = false
result.clipsToBounds = true result.clipsToBounds = true
result.titleLabel?.font = UIFont.boldSystemFont(ofSize: 18) result.titleLabel?.font = UIFont.boldSystemFont(ofSize: 18)
result.setTitle(NSLocalizedString("TXT_DELETE_TITLE", comment: ""), for: .normal) result.setTitle(NSLocalizedString("TXT_DECLINE_TITLE", comment: ""), for: .normal)
result.setTitleColor(Colors.destructive, for: .normal) result.setTitleColor(Colors.destructive, for: .normal)
result.setBackgroundImage( result.setBackgroundImage(
Colors.destructive Colors.destructive

1
Session/Meta/Translations/hi.lproj/Localizable.strings
View File

@ -644,6 +644,7 @@
"MESSAGE_REQUESTS_NOTIFICATION" = "You have a new message request"; "MESSAGE_REQUESTS_NOTIFICATION" = "You have a new message request";
"TXT_HIDE_TITLE" = "Hide"; "TXT_HIDE_TITLE" = "Hide";
"TXT_DELETE_ACCEPT" = "Accept"; "TXT_DELETE_ACCEPT" = "Accept";
"TXT_DECLINE_TITLE" = "Decline";
"ALERT_ERROR_TITLE" = "Error"; "ALERT_ERROR_TITLE" = "Error";
"NEW_CONVERSATION_MENU_OPEN_GROUP" = "Open Group"; "NEW_CONVERSATION_MENU_OPEN_GROUP" = "Open Group";
"NEW_CONVERSATION_MENU_DIRECT_MESSAGE" = "Direct Message"; "NEW_CONVERSATION_MENU_DIRECT_MESSAGE" = "Direct Message";