sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

don't simply ignore null in message body but try to avoid it

This commit is contained in:
Daniel Gultsch 2016-09-18 22:15:02 +02:00
parent 7c608c8862
commit badc97e280
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/eu/siacs/conversations/crypto/PgpDecryptionService.java
View File

@ -115,7 +115,11 @@ public class PgpDecryptionService {
case OpenPgpApi.RESULT_CODE_SUCCESS:
try {
os.flush();
message.setBody(os.toString());
final String body = os.toString();
if (body == null) {
throw new IOException("body was null");
}
message.setBody(body);
message.setEncryption(Message.ENCRYPTION_DECRYPTED);
final HttpConnectionManager manager = mXmppConnectionService.getHttpConnectionManager();
if (message.trusted()

5
src/main/java/eu/siacs/conversations/entities/Message.java
View File

@ -124,7 +124,7 @@ public class Message extends AbstractEntity {
this.conversationUuid = conversationUUid;
this.counterpart = counterpart;
this.trueCounterpart = trueCounterpart;
this.body = body;
this.body = body == null ? "" : body;
this.timeSent = timeSent;
this.encryption = encryption;
this.status = status;
@ -266,6 +266,9 @@ public class Message extends AbstractEntity {
}
public void setBody(String body) {
if (body == null) {
throw new Error("You should not set the message body to null");
}
this.body = body;
}

4
src/main/java/eu/siacs/conversations/utils/UIHelper.java
View File

@ -181,9 +181,7 @@ public class UIHelper {
}
} else {
String body = message.getBody();
if (body == null) {
body = "";
} else if (body.length() > 256) {
if (body.length() > 256) {
body = body.substring(0,256);
}
if (body.startsWith(Message.ME_COMMAND)) {