diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-09-08 23:58:37 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-09-08 23:58:37 +0200 |
| commit | d92e8381db906c20ceb7f91914d63d514a873c8a (patch) | |
| tree | 94367a08152e5704eeb4b6b51747919669b46a55 /src/eu/siacs/conversations/entities/Message.java | |
| parent | d9c4637b31c79095d7acff43fee03daa83859ea3 (diff) | |
setting to increase font size. fixed #420
Diffstat (limited to 'src/eu/siacs/conversations/entities/Message.java')
| -rw-r--r-- | src/eu/siacs/conversations/entities/Message.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/eu/siacs/conversations/entities/Message.java b/src/eu/siacs/conversations/entities/Message.java index 5cbd68dd..ce496d27 100644 --- a/src/eu/siacs/conversations/entities/Message.java +++ b/src/eu/siacs/conversations/entities/Message.java @@ -149,9 +149,11 @@ public class Message extends AbstractEntity { public String getReadableBody(Context context) { if ((encryption == ENCRYPTION_PGP) && (type == TYPE_TEXT)) { - return context.getText(R.string.encrypted_message_received).toString(); + return context.getText(R.string.encrypted_message_received) + .toString(); } else if ((encryption == ENCRYPTION_OTR) && (type == TYPE_IMAGE)) { - return context.getText(R.string.encrypted_image_received).toString(); + return context.getText(R.string.encrypted_image_received) + .toString(); } else if (encryption == ENCRYPTION_DECRYPTION_FAILED) { return context.getText(R.string.decryption_failed).toString(); } else if (type == TYPE_IMAGE) { @@ -339,7 +341,7 @@ public class Message extends AbstractEntity { } return body.trim(); } - + public int getMergedStatus() { Message next = this.next(); if (this.mergable(next)) { @@ -348,7 +350,7 @@ public class Message extends AbstractEntity { return getStatus(); } } - + public long getMergedTimeSent() { Message next = this.next(); if (this.mergable(next)) { |