TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-30 13:35:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove newlines in text-only group messages

Browse Source 
Closes #4963
//FREEBIE
This commit is contained in:
agrajaghh 2015-12-26 12:48:58 +01:00 committed by Moxie Marlinspike
parent 759ecbc7b8
commit d61e5094de
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/org/thoughtcrime/securesms/mms/OutgoingMediaMessage.java
View File

@ -29,7 +29,7 @@ public class OutgoingMediaMessage {
public OutgoingMediaMessage(Recipients recipients, SlideDeck slideDeck, String message, long sentTimeMillis, int distributionType) public OutgoingMediaMessage(Recipients recipients, SlideDeck slideDeck, String message, long sentTimeMillis, int distributionType)
{ {
this(recipients, this(recipients,
TextUtils.isEmpty(message) ? slideDeck.getBody() : slideDeck.getBody() + "\n\n" + message, buildMessage(slideDeck, message),
slideDeck.asAttachments(), slideDeck.asAttachments(),
sentTimeMillis, sentTimeMillis,
distributionType); distributionType);
@ -71,4 +71,13 @@ public class OutgoingMediaMessage {
return sentTimeMillis; return sentTimeMillis;
} }
private static String buildMessage(SlideDeck slideDeck, String message) {
if (!TextUtils.isEmpty(message) && !TextUtils.isEmpty(slideDeck.getBody())) {
return slideDeck.getBody() + "\n\n" + message;
} else if (!TextUtils.isEmpty(message)) {
return message;
} else {
return slideDeck.getBody();
}
}
} }