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

Removed the single message restriction from message requests (still text only)

Browse Source
pull/559/head
Morgan Pretty 3 years ago
parent 3639a21bc8
commit dfbee2a520
24 changed files with 6 additions and 31 deletions
Show Stats Download Patch File Download Diff File

5
Session/Conversations/ConversationVC+Interaction.swift
Unescape Escape View File

@ -333,10 +333,9 @@ extension ConversationVC : InputViewDelegate, MessageCellDelegate, ContextMenuAc
// so only allow text-based messages
self.snInputView.setEnabledMessageTypes(
(thread.isNoteToSelf() || contact?.didApproveMe == true || thread.isMessageRequest() ?
.all :
(contact != nil ? .none : .textOnly)
.all : .textOnly
),
message: "MESSAGE_REQUESTS_DISABLED_INPUT".localized()
message: nil
)
}

10
Session/Conversations/ConversationVC.swift
Unescape Escape View File

@ -379,10 +379,9 @@ final class ConversationVC : BaseVC, ConversationViewModelDelegate, OWSConversat
// so only allow text-based messages
self.snInputView.setEnabledMessageTypes(
(thread.isNoteToSelf() || contact?.didApproveMe == true || thread.isMessageRequest() ?
.all :
(contact != nil && thread.shouldBeVisible ? .none : .textOnly)
.all : .textOnly
),
message: "MESSAGE_REQUESTS_DISABLED_INPUT".localized()
message: nil
)
}
@ -639,10 +638,9 @@ final class ConversationVC : BaseVC, ConversationViewModelDelegate, OWSConversat
// so only allow text-based messages
self.snInputView.setEnabledMessageTypes(
(thread.isNoteToSelf() || contact?.didApproveMe == true || thread.isMessageRequest() ?
.all :
(contact != nil && thread.shouldBeVisible ? .none : .textOnly)
.all : .textOnly
),
message: "MESSAGE_REQUESTS_DISABLED_INPUT".localized()
message: nil
)
}
}

1
Session/Meta/Translations/de.lproj/Localizable.strings
Unescape Escape View File

@ -609,6 +609,5 @@
"MESSAGE_REQUESTS_DELETE_CONFIRMATION_ACTON" = "Are you sure you want to delete this message request?";
"MESSAGE_REQUESTS_INFO" = "Sending a message to this user will automatically accept their message request.";
"MESSAGE_REQUESTS_ACCEPTED" = "Your message request has been accepted.";
"MESSAGE_REQUESTS_DISABLED_INPUT" = "Your message request is currently pending.";
"TXT_HIDE_TITLE" = "Hide";
"TXT_DELETE_ACCEPT" = "Accept";

1
Session/Meta/Translations/en.lproj/Localizable.strings
Unescape Escape View File

@ -619,6 +619,5 @@
"MESSAGE_REQUESTS_DELETE_CONFIRMATION_ACTON" = "Are you sure you want to delete this message request?";
"MESSAGE_REQUESTS_INFO" = "Sending a message to this user will automatically accept their message request.";
"MESSAGE_REQUESTS_ACCEPTED" = "Your message request has been accepted.";
"MESSAGE_REQUESTS_DISABLED_INPUT" = "Your message request is currently pending.";
"TXT_HIDE_TITLE" = "Hide";
"TXT_DELETE_ACCEPT" = "Accept";

1
Session/Meta/Translations/es.lproj/Localizable.strings
Unescape Escape View File

@ -609,6 +609,5 @@
"MESSAGE_REQUESTS_DELETE_CONFIRMATION_ACTON" = "Are you sure you want to delete this message request?";
"MESSAGE_REQUESTS_INFO" = "Sending a message to this user will automatically accept their message request.";
"MESSAGE_REQUESTS_ACCEPTED" = "Your message request has been accepted.";
"MESSAGE_REQUESTS_DISABLED_INPUT" = "Your message request is currently pending.";
"TXT_HIDE_TITLE" = "Hide";
"TXT_DELETE_ACCEPT" = "Accept";

1
Session/Meta/Translations/fa.lproj/Localizable.strings
Unescape Escape View File

@ -609,6 +609,5 @@
"MESSAGE_REQUESTS_DELETE_CONFIRMATION_ACTON" = "Are you sure you want to delete this message request?";
"MESSAGE_REQUESTS_INFO" = "Sending a message to this user will automatically accept their message request.";
"MESSAGE_REQUESTS_ACCEPTED" = "Your message request has been accepted.";
"MESSAGE_REQUESTS_DISABLED_INPUT" = "Your message request is currently pending.";
"TXT_HIDE_TITLE" = "Hide";
"TXT_DELETE_ACCEPT" = "Accept";

1
Session/Meta/Translations/fi.lproj/Localizable.strings
Unescape Escape View File

@ -609,6 +609,5 @@
"MESSAGE_REQUESTS_DELETE_CONFIRMATION_ACTON" = "Are you sure you want to delete this message request?";
"MESSAGE_REQUESTS_INFO" = "Sending a message to this user will automatically accept their message request.";
"MESSAGE_REQUESTS_ACCEPTED" = "Your message request has been accepted.";
"MESSAGE_REQUESTS_DISABLED_INPUT" = "Your message request is currently pending.";
"TXT_HIDE_TITLE" = "Hide";
"TXT_DELETE_ACCEPT" = "Accept";

1
Session/Meta/Translations/fr.lproj/Localizable.strings
Unescape Escape View File

@ -609,6 +609,5 @@
"MESSAGE_REQUESTS_DELETE_CONFIRMATION_ACTON" = "Are you sure you want to delete this message request?";
"MESSAGE_REQUESTS_INFO" = "Sending a message to this user will automatically accept their message request.";
"MESSAGE_REQUESTS_ACCEPTED" = "Your message request has been accepted.";
"MESSAGE_REQUESTS_DISABLED_INPUT" = "Your message request is currently pending.";
"TXT_HIDE_TITLE" = "Hide";
"TXT_DELETE_ACCEPT" = "Accept";

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

@ -609,6 +609,5 @@
"MESSAGE_REQUESTS_DELETE_CONFIRMATION_ACTON" = "Are you sure you want to delete this message request?";
"MESSAGE_REQUESTS_INFO" = "Sending a message to this user will automatically accept their message request.";
"MESSAGE_REQUESTS_ACCEPTED" = "Your message request has been accepted.";
"MESSAGE_REQUESTS_DISABLED_INPUT" = "Your message request is currently pending.";
"TXT_HIDE_TITLE" = "Hide";
"TXT_DELETE_ACCEPT" = "Accept";

1
Session/Meta/Translations/hr.lproj/Localizable.strings
Unescape Escape View File

@ -609,6 +609,5 @@
"MESSAGE_REQUESTS_DELETE_CONFIRMATION_ACTON" = "Are you sure you want to delete this message request?";
"MESSAGE_REQUESTS_INFO" = "Sending a message to this user will automatically accept their message request.";
"MESSAGE_REQUESTS_ACCEPTED" = "Your message request has been accepted.";
"MESSAGE_REQUESTS_DISABLED_INPUT" = "Your message request is currently pending.";
"TXT_HIDE_TITLE" = "Hide";
"TXT_DELETE_ACCEPT" = "Accept";

1
Session/Meta/Translations/id-ID.lproj/Localizable.strings
Unescape Escape View File

@ -609,6 +609,5 @@
"MESSAGE_REQUESTS_DELETE_CONFIRMATION_ACTON" = "Are you sure you want to delete this message request?";
"MESSAGE_REQUESTS_INFO" = "Sending a message to this user will automatically accept their message request.";
"MESSAGE_REQUESTS_ACCEPTED" = "Your message request has been accepted.";
"MESSAGE_REQUESTS_DISABLED_INPUT" = "Your message request is currently pending.";
"TXT_HIDE_TITLE" = "Hide";
"TXT_DELETE_ACCEPT" = "Accept";

1
Session/Meta/Translations/it.lproj/Localizable.strings
Unescape Escape View File

@ -609,6 +609,5 @@
"MESSAGE_REQUESTS_DELETE_CONFIRMATION_ACTON" = "Are you sure you want to delete this message request?";
"MESSAGE_REQUESTS_INFO" = "Sending a message to this user will automatically accept their message request.";
"MESSAGE_REQUESTS_ACCEPTED" = "Your message request has been accepted.";
"MESSAGE_REQUESTS_DISABLED_INPUT" = "Your message request is currently pending.";
"TXT_HIDE_TITLE" = "Hide";
"TXT_DELETE_ACCEPT" = "Accept";

1
Session/Meta/Translations/ja.lproj/Localizable.strings
Unescape Escape View File

@ -609,6 +609,5 @@
"MESSAGE_REQUESTS_DELETE_CONFIRMATION_ACTON" = "Are you sure you want to delete this message request?";
"MESSAGE_REQUESTS_INFO" = "Sending a message to this user will automatically accept their message request.";
"MESSAGE_REQUESTS_ACCEPTED" = "Your message request has been accepted.";
"MESSAGE_REQUESTS_DISABLED_INPUT" = "Your message request is currently pending.";
"TXT_HIDE_TITLE" = "Hide";
"TXT_DELETE_ACCEPT" = "Accept";

1
Session/Meta/Translations/nl.lproj/Localizable.strings
Unescape Escape View File

@ -609,6 +609,5 @@
"MESSAGE_REQUESTS_DELETE_CONFIRMATION_ACTON" = "Are you sure you want to delete this message request?";
"MESSAGE_REQUESTS_INFO" = "Sending a message to this user will automatically accept their message request.";
"MESSAGE_REQUESTS_ACCEPTED" = "Your message request has been accepted.";
"MESSAGE_REQUESTS_DISABLED_INPUT" = "Your message request is currently pending.";
"TXT_HIDE_TITLE" = "Hide";
"TXT_DELETE_ACCEPT" = "Accept";

1
Session/Meta/Translations/pl.lproj/Localizable.strings
Unescape Escape View File

@ -609,6 +609,5 @@
"MESSAGE_REQUESTS_DELETE_CONFIRMATION_ACTON" = "Are you sure you want to delete this message request?";
"MESSAGE_REQUESTS_INFO" = "Sending a message to this user will automatically accept their message request.";
"MESSAGE_REQUESTS_ACCEPTED" = "Your message request has been accepted.";
"MESSAGE_REQUESTS_DISABLED_INPUT" = "Your message request is currently pending.";
"TXT_HIDE_TITLE" = "Hide";
"TXT_DELETE_ACCEPT" = "Accept";

1
Session/Meta/Translations/pt_BR.lproj/Localizable.strings
Unescape Escape View File

@ -609,6 +609,5 @@
"MESSAGE_REQUESTS_DELETE_CONFIRMATION_ACTON" = "Are you sure you want to delete this message request?";
"MESSAGE_REQUESTS_INFO" = "Sending a message to this user will automatically accept their message request.";
"MESSAGE_REQUESTS_ACCEPTED" = "Your message request has been accepted.";
"MESSAGE_REQUESTS_DISABLED_INPUT" = "Your message request is currently pending.";
"TXT_HIDE_TITLE" = "Hide";
"TXT_DELETE_ACCEPT" = "Accept";

1
Session/Meta/Translations/ru.lproj/Localizable.strings
Unescape Escape View File

@ -609,6 +609,5 @@
"MESSAGE_REQUESTS_DELETE_CONFIRMATION_ACTON" = "Are you sure you want to delete this message request?";
"MESSAGE_REQUESTS_INFO" = "Sending a message to this user will automatically accept their message request.";
"MESSAGE_REQUESTS_ACCEPTED" = "Your message request has been accepted.";
"MESSAGE_REQUESTS_DISABLED_INPUT" = "Your message request is currently pending.";
"TXT_HIDE_TITLE" = "Hide";
"TXT_DELETE_ACCEPT" = "Accept";

1
Session/Meta/Translations/si.lproj/Localizable.strings
Unescape Escape View File

@ -610,6 +610,5 @@
"MESSAGE_REQUESTS_DELETE_CONFIRMATION_ACTON" = "Are you sure you want to delete this message request?";
"MESSAGE_REQUESTS_INFO" = "Sending a message to this user will automatically accept their message request.";
"MESSAGE_REQUESTS_ACCEPTED" = "Your message request has been accepted.";
"MESSAGE_REQUESTS_DISABLED_INPUT" = "Your message request is currently pending.";
"TXT_HIDE_TITLE" = "Hide";
"TXT_DELETE_ACCEPT" = "Accept";

1
Session/Meta/Translations/sk.lproj/Localizable.strings
Unescape Escape View File

@ -609,6 +609,5 @@
"MESSAGE_REQUESTS_DELETE_CONFIRMATION_ACTON" = "Are you sure you want to delete this message request?";
"MESSAGE_REQUESTS_INFO" = "Sending a message to this user will automatically accept their message request.";
"MESSAGE_REQUESTS_ACCEPTED" = "Your message request has been accepted.";
"MESSAGE_REQUESTS_DISABLED_INPUT" = "Your message request is currently pending.";
"TXT_HIDE_TITLE" = "Hide";
"TXT_DELETE_ACCEPT" = "Accept";

1
Session/Meta/Translations/sv.lproj/Localizable.strings
Unescape Escape View File

@ -609,6 +609,5 @@
"MESSAGE_REQUESTS_DELETE_CONFIRMATION_ACTON" = "Are you sure you want to delete this message request?";
"MESSAGE_REQUESTS_INFO" = "Sending a message to this user will automatically accept their message request.";
"MESSAGE_REQUESTS_ACCEPTED" = "Your message request has been accepted.";
"MESSAGE_REQUESTS_DISABLED_INPUT" = "Your message request is currently pending.";
"TXT_HIDE_TITLE" = "Hide";
"TXT_DELETE_ACCEPT" = "Accept";

1
Session/Meta/Translations/th.lproj/Localizable.strings
Unescape Escape View File

@ -609,6 +609,5 @@
"MESSAGE_REQUESTS_DELETE_CONFIRMATION_ACTON" = "Are you sure you want to delete this message request?";
"MESSAGE_REQUESTS_INFO" = "Sending a message to this user will automatically accept their message request.";
"MESSAGE_REQUESTS_ACCEPTED" = "Your message request has been accepted.";
"MESSAGE_REQUESTS_DISABLED_INPUT" = "Your message request is currently pending.";
"TXT_HIDE_TITLE" = "Hide";
"TXT_DELETE_ACCEPT" = "Accept";

1
Session/Meta/Translations/vi-VN.lproj/Localizable.strings
Unescape Escape View File

@ -609,6 +609,5 @@
"MESSAGE_REQUESTS_DELETE_CONFIRMATION_ACTON" = "Are you sure you want to delete this message request?";
"MESSAGE_REQUESTS_INFO" = "Sending a message to this user will automatically accept their message request.";
"MESSAGE_REQUESTS_ACCEPTED" = "Your message request has been accepted.";
"MESSAGE_REQUESTS_DISABLED_INPUT" = "Your message request is currently pending.";
"TXT_HIDE_TITLE" = "Hide";
"TXT_DELETE_ACCEPT" = "Accept";

1
Session/Meta/Translations/zh-Hant.lproj/Localizable.strings
Unescape Escape View File

@ -609,6 +609,5 @@
"MESSAGE_REQUESTS_DELETE_CONFIRMATION_ACTON" = "Are you sure you want to delete this message request?";
"MESSAGE_REQUESTS_INFO" = "Sending a message to this user will automatically accept their message request.";
"MESSAGE_REQUESTS_ACCEPTED" = "Your message request has been accepted.";
"MESSAGE_REQUESTS_DISABLED_INPUT" = "Your message request is currently pending.";
"TXT_HIDE_TITLE" = "Hide";
"TXT_DELETE_ACCEPT" = "Accept";

1
Session/Meta/Translations/zh_CN.lproj/Localizable.strings
Unescape Escape View File

@ -609,6 +609,5 @@
"MESSAGE_REQUESTS_DELETE_CONFIRMATION_ACTON" = "Are you sure you want to delete this message request?";
"MESSAGE_REQUESTS_INFO" = "Sending a message to this user will automatically accept their message request.";
"MESSAGE_REQUESTS_ACCEPTED" = "Your message request has been accepted.";
"MESSAGE_REQUESTS_DISABLED_INPUT" = "Your message request is currently pending.";
"TXT_HIDE_TITLE" = "Hide";
"TXT_DELETE_ACCEPT" = "Accept";

Write Preview
Loading…
Cancel
Save