diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/de/pixart/messenger/services/NotificationService.java | 4 | ||||
| -rw-r--r-- | src/main/java/de/pixart/messenger/utils/UIHelper.java | 22 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 3 |
3 files changed, 5 insertions, 24 deletions
diff --git a/src/main/java/de/pixart/messenger/services/NotificationService.java b/src/main/java/de/pixart/messenger/services/NotificationService.java index 5e6081155..cb76691a7 100644 --- a/src/main/java/de/pixart/messenger/services/NotificationService.java +++ b/src/main/java/de/pixart/messenger/services/NotificationService.java @@ -509,9 +509,7 @@ public class NotificationService { bigPictureStyle.setSummaryText(text); builder.setContentText(text); } else { - builder.setContentText(mXmppConnectionService.getString( - R.string.received_x_file, - UIHelper.getFileDescriptionString(mXmppConnectionService, message))); + builder.setContentText(UIHelper.getFileDescriptionString(mXmppConnectionService, message)); } builder.setStyle(bigPictureStyle); } catch (final FileNotFoundException e) { diff --git a/src/main/java/de/pixart/messenger/utils/UIHelper.java b/src/main/java/de/pixart/messenger/utils/UIHelper.java index 217425cad..ea9f97f98 100644 --- a/src/main/java/de/pixart/messenger/utils/UIHelper.java +++ b/src/main/java/de/pixart/messenger/utils/UIHelper.java @@ -275,29 +275,15 @@ public class UIHelper { } else if (message.getEncryption() == Message.ENCRYPTION_AXOLOTL_NOT_FOR_THIS_DEVICE) { return new Pair<>(context.getString(R.string.not_encrypted_for_this_device), true); } else if (message.getType() == Message.TYPE_FILE || message.getType() == Message.TYPE_IMAGE) { - if (message.getStatus() == Message.STATUS_RECEIVED) { - return new Pair<>(context.getString(R.string.received_x_file, - getFileDescriptionString(context, message)), true); - } else { - return new Pair<>(getFileDescriptionString(context, message), true); - } + return new Pair<>(getFileDescriptionString(context, message), true); } else { final String body = message.getBody(); if (body.startsWith(Message.ME_COMMAND)) { - return new Pair<>(body.replaceAll("^" + Message.ME_COMMAND, - UIHelper.getMessageDisplayName(message)), false); + return new Pair<>(body.replaceAll("^" + Message.ME_COMMAND, UIHelper.getMessageDisplayName(message)), false); } else if (message.isGeoUri()) { - if (message.getStatus() == Message.STATUS_RECEIVED) { - return new Pair<>(context.getString(R.string.received_location), true); - } else { - return new Pair<>(context.getString(R.string.location), true); - } + return new Pair<>(context.getString(R.string.location), true); } else if (message.isXmppUri()) { - if (message.getStatus() == Message.STATUS_RECEIVED) { - return new Pair<>(context.getString(R.string.received_contact), true); - } else { - return new Pair<>(context.getString(R.string.contact), true); - } + return new Pair<>(context.getString(R.string.contact), true); } else if (message.treatAsDownloadable()) { return new Pair<>(context.getString(R.string.x_file_offered_for_download, getFileDescriptionString(context, message)), true); diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 2bdcd1f56..3b176f4f3 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -401,7 +401,6 @@ <string name="pdf_document">PDF document</string> <string name="apk">Android App</string> <string name="vcard">Contact</string> - <string name="received_x_file">Received %s</string> <string name="touch_to_open_conversations">Touch to open Pix-Art Messenger</string> <string name="avatar_has_been_published">Avatar has been published!</string> <string name="sending_x_file">Sending %s</string> @@ -414,7 +413,6 @@ <string name="show_location">Show location</string> <string name="no_application_found_to_display_location">No application found to display location</string> <string name="location">Location</string> - <string name="received_location">Received location</string> <string name="pref_dont_trust_system_cas_title">Don’t trust system CAs</string> <string name="pref_dont_trust_system_cas_summary">All certificates must be manually approved</string> <string name="pref_remove_trusted_certificates_title">Remove certificates</string> @@ -611,7 +609,6 @@ <string name="device_does_not_support_data_saver">Your device does not supporting disabling data saver for Pix-Art Messenger.</string> <string name="navigate">Navigate to location</string> <string name="add_to_contact_list">Add to contact list</string> - <string name="received_contact">Received contact</string> <string name="contact">Contact</string> <string name="unable_to_start_recording">Unable to start recording</string> <string name="error_unable_to_create_temporary_file">Unable to create temporary file</string> |