diff options
author | iNPUTmice <daniel@gultsch.de> | 2014-10-24 13:29:18 +0200 |
---|---|---|
committer | iNPUTmice <daniel@gultsch.de> | 2014-10-24 13:29:18 +0200 |
commit | cbc3d9bd6f275984b390eb4dae48f8eed669fe7a (patch) | |
tree | 41833ad63e232ef255566b964e8e770520c4efbf /src/eu/siacs/conversations/entities/Message.java | |
parent | d73a77643d7923cae0789c5ed9f6a2a4cf41385f (diff) |
notify only after image has been received over http. introduced mini grace for catching up with SM or offline messages
Diffstat (limited to 'src/eu/siacs/conversations/entities/Message.java')
-rw-r--r-- | src/eu/siacs/conversations/entities/Message.java | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/eu/siacs/conversations/entities/Message.java b/src/eu/siacs/conversations/entities/Message.java index 5fa16460c..68a71d4ae 100644 --- a/src/eu/siacs/conversations/entities/Message.java +++ b/src/eu/siacs/conversations/entities/Message.java @@ -5,9 +5,7 @@ import java.net.URL; import java.util.Arrays; import eu.siacs.conversations.Config; -import eu.siacs.conversations.R; import android.content.ContentValues; -import android.content.Context; import android.database.Cursor; public class Message extends AbstractEntity { @@ -145,19 +143,6 @@ public class Message extends AbstractEntity { return body; } - public String getReadableBody(Context context) { - if (encryption == ENCRYPTION_PGP) { - return context.getText(R.string.encrypted_message_received) - .toString(); - } else if (encryption == ENCRYPTION_DECRYPTION_FAILED) { - return context.getText(R.string.decryption_failed).toString(); - } else if (type == TYPE_IMAGE) { - return context.getText(R.string.image_file).toString(); - } else { - return body.trim(); - } - } - public long getTimeSent() { return timeSent; } |