TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-27 20:15:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch from 'Contents Hidden' to 'New message'

Browse Source 
Fixes #4004
Closes #4566
This commit is contained in:
char32 2015-11-17 00:55:22 +01:00 committed by Moxie Marlinspike
parent 64ee669728
commit 796decdb0f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@ -580,8 +580,8 @@
<string name="QuickResponseService_problem_sending_message">Problem sending message!</string> <string name="QuickResponseService_problem_sending_message">Problem sending message!</string>
<!-- SingleRecipientNotificationBuilder --> <!-- SingleRecipientNotificationBuilder -->
<string name="SingleRecipientNotificationBuilder_new_signal_message">New Signal message</string> <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
<string name="SingleRecipientNotificationBuilder_contents_hidden">Contents hidden</string> <string name="SingleRecipientNotificationBuilder_new_message">New Message!</string>
<!-- attachment_type_selector --> <!-- attachment_type_selector -->
<string name="attachment_type_selector__image">Image</string> <string name="attachment_type_selector__image">Image</string>

8
src/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java
View File

@ -65,7 +65,7 @@ public class SingleRecipientNotificationBuilder extends AbstractNotificationBuil
.asDrawable(context, recipient.getColor() .asDrawable(context, recipient.getColor()
.toConversationColor(context))); .toConversationColor(context)));
} else { } else {
setContentTitle(context.getString(R.string.SingleRecipientNotificationBuilder_new_signal_message)); setContentTitle(context.getString(R.string.SingleRecipientNotificationBuilder_signal));
setLargeIcon(Recipient.getUnknownRecipient() setLargeIcon(Recipient.getUnknownRecipient()
.getContactPhoto() .getContactPhoto()
.asDrawable(context, Recipient.getUnknownRecipient() .asDrawable(context, Recipient.getUnknownRecipient()
@ -84,7 +84,7 @@ public class SingleRecipientNotificationBuilder extends AbstractNotificationBuil
setContentText(message); setContentText(message);
this.slideDeck = slideDeck; this.slideDeck = slideDeck;
} else { } else {
setContentText(context.getString(R.string.SingleRecipientNotificationBuilder_contents_hidden)); setContentText(context.getString(R.string.SingleRecipientNotificationBuilder_new_message));
} }
} }
@ -131,9 +131,9 @@ public class SingleRecipientNotificationBuilder extends AbstractNotificationBuil
if (privacy.isDisplayMessage()) { if (privacy.isDisplayMessage()) {
setTicker(getStyledMessage(recipient, message)); setTicker(getStyledMessage(recipient, message));
} else if (privacy.isDisplayContact()) { } else if (privacy.isDisplayContact()) {
setTicker(getStyledMessage(recipient, context.getString(R.string.SingleRecipientNotificationBuilder_new_signal_message))); setTicker(getStyledMessage(recipient, context.getString(R.string.SingleRecipientNotificationBuilder_new_message)));
} else { } else {
setTicker(context.getString(R.string.SingleRecipientNotificationBuilder_new_signal_message)); setTicker(context.getString(R.string.SingleRecipientNotificationBuilder_new_message));
} }
} }