oxen-io/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2023-12-14 02:53:01 +01:00
Code Issues 1 Projects Releases Wiki Activity

Fix copy

Browse source
This commit is contained in:
Niels Andriesse 2020-02-11 14:02:01 +11:00
parent 2fbe33736c
commit b1cbbf2940
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
res/values/strings.xml
View file

@ -1618,13 +1618,13 @@
<!-- Friend request view -->
<string name="view_friend_request_accept_button_title">Accept</string>
<string name="view_friend_request_reject_button_title">Decline</string>
<string name="view_friend_request_incoming_pending_message">%1$s sent you a message request</string>
<string name="view_friend_request_incoming_accepted_message">You\'ve accepted %1$s\'s message request</string>
<string name="view_friend_request_incoming_declined_message">You\'ve declined %1$s\'s message request</string>
<string name="view_friend_request_incoming_expired_message">%1$s\'s message request has expired</string>
<string name="view_friend_request_outgoing_pending_message">You\'ve sent %1$s a message request</string>
<string name="view_friend_request_outgoing_accepted_message">%1$s accepted your message request</string>
<string name="view_friend_request_outgoing_expired_message">Your message request to %1$s has expired</string>
<string name="view_friend_request_incoming_pending_message">%1$s sent you a session request</string>
<string name="view_friend_request_incoming_accepted_message">You\'ve accepted %1$s\'s session request</string>
<string name="view_friend_request_incoming_declined_message">You\'ve declined %1$s\'s session request</string>
<string name="view_friend_request_incoming_expired_message">%1$s\'s session request has expired</string>
<string name="view_friend_request_outgoing_pending_message">You\'ve sent %1$s a session request</string>
<string name="view_friend_request_outgoing_accepted_message">%1$s accepted your session request</string>
<string name="view_friend_request_outgoing_expired_message">Your session request to %1$s has expired</string>
<!-- Conversation activity -->
<string name="activity_conversation_pending_friend_request_hint">Pending Friend Request…</string>
<string name="activity_conversation_default_hint">New Message</string>

2
src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
View file

@ -2353,7 +2353,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
private void setInputPanelEnabled(boolean enabled) {
Util.runOnMain(() -> {
updateToggleButtonState();
String hint = enabled ? "Message" : "Pending message request";
String hint = enabled ? "Message" : "Pending session request";
inputPanel.setHint(hint);
inputPanel.setEnabled(enabled);
if (enabled) {