narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

removed 'received' prefix from description

Browse source
This commit is contained in:
Daniel Gultsch 2018-04-16 09:55:16 +02:00
parent 9f34e53b98
commit 406a5a10f9
3 changed files with 3 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/eu/siacs/conversations/services/NotificationService.java
View file

@ -499,9 +499,7 @@ public class NotificationService {
bigPictureStyle.setSummaryText(text); bigPictureStyle.setSummaryText(text);
builder.setContentText(text); builder.setContentText(text);
} else { } else {
builder.setContentText(mXmppConnectionService.getString( builder.setContentText(UIHelper.getFileDescriptionString(mXmppConnectionService, message));
R.string.received_x_file,
UIHelper.getFileDescriptionString(mXmppConnectionService, message)));
} }
builder.setStyle(bigPictureStyle); builder.setStyle(bigPictureStyle);
} catch (final FileNotFoundException e) { } catch (final FileNotFoundException e) {

13
src/main/java/eu/siacs/conversations/utils/UIHelper.java
View file

@ -280,23 +280,14 @@ public class UIHelper {
} else if (message.getEncryption() == Message.ENCRYPTION_AXOLOTL_NOT_FOR_THIS_DEVICE) { } else if (message.getEncryption() == Message.ENCRYPTION_AXOLOTL_NOT_FOR_THIS_DEVICE) {
return new Pair<>(context.getString(R.string.not_encrypted_for_this_device), true); 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) { } else if (message.getType() == Message.TYPE_FILE || message.getType() == Message.TYPE_IMAGE) {
if (message.getStatus() == Message.STATUS_RECEIVED) { return new Pair<>(getFileDescriptionString(context, message), true);
return new Pair<>(context.getString(R.string.received_x_file,
getFileDescriptionString(context, message)), true);
} else {
return new Pair<>(getFileDescriptionString(context, message), true);
}
} else { } else {
final String body = message.getBody(); final String body = message.getBody();
if (body.startsWith(Message.ME_COMMAND)) { if (body.startsWith(Message.ME_COMMAND)) {
return new Pair<>(body.replaceAll("^" + Message.ME_COMMAND, return new Pair<>(body.replaceAll("^" + Message.ME_COMMAND,
UIHelper.getMessageDisplayName(message) + " "), false); UIHelper.getMessageDisplayName(message) + " "), false);
} else if (message.isGeoUri()) { } else if (message.isGeoUri()) {
if (message.getStatus() == Message.STATUS_RECEIVED) { return new Pair<>(context.getString(R.string.location), true);
return new Pair<>(context.getString(R.string.received_location), true);
} else {
return new Pair<>(context.getString(R.string.location), true);
}
} else if (message.treatAsDownloadable()) { } else if (message.treatAsDownloadable()) {
return new Pair<>(context.getString(R.string.x_file_offered_for_download, return new Pair<>(context.getString(R.string.x_file_offered_for_download,
getFileDescriptionString(context, message)), true); getFileDescriptionString(context, message)), true);

2
src/main/res/values/strings.xml
View file

@ -388,7 +388,6 @@
<string name="pdf_document">PDF document</string> <string name="pdf_document">PDF document</string>
<string name="apk">Android App</string> <string name="apk">Android App</string>
<string name="vcard">Contact</string> <string name="vcard">Contact</string>
<string name="received_x_file">Received %s</string>
<string name="touch_to_open_conversations">Touch to open Conversations</string> <string name="touch_to_open_conversations">Touch to open Conversations</string>
<string name="avatar_has_been_published">Avatar has been published!</string> <string name="avatar_has_been_published">Avatar has been published!</string>
<string name="sending_x_file">Sending %s</string> <string name="sending_x_file">Sending %s</string>
@ -404,7 +403,6 @@
<string name="show_location">Show location</string> <string name="show_location">Show location</string>
<string name="no_application_found_to_display_location">No application found to display location</string> <string name="no_application_found_to_display_location">No application found to display location</string>
<string name="location">Location</string> <string name="location">Location</string>
<string name="received_location">Received location</string>
<string name="title_undo_swipe_out_conversation">Conversation closed</string> <string name="title_undo_swipe_out_conversation">Conversation closed</string>
<string name="title_undo_swipe_out_muc">Left group chat</string> <string name="title_undo_swipe_out_muc">Left group chat</string>
<string name="pref_dont_trust_system_cas_title">Don’t trust system CAs</string> <string name="pref_dont_trust_system_cas_title">Don’t trust system CAs</string>