diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-10-26 20:18:57 +0100 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-10-26 20:18:57 +0100 |
| commit | b045dea5497b53c775ea3c5748d640066a088e9a (patch) | |
| tree | 9eebb01996c64929de0b781ffcf56804be065d6a /src/eu/siacs/conversations/crypto/PgpEngine.java | |
| parent | d86b7f31928a26c66d570754dafec5f63d2edd40 (diff) | |
set divider for image meta information to '|' to not conflict with URL. breaks images downloaded in between 0.7.3 and now
Diffstat (limited to '')
| -rw-r--r-- | src/eu/siacs/conversations/crypto/PgpEngine.java | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/eu/siacs/conversations/crypto/PgpEngine.java b/src/eu/siacs/conversations/crypto/PgpEngine.java index 2696c7d2a..c3935ff57 100644 --- a/src/eu/siacs/conversations/crypto/PgpEngine.java +++ b/src/eu/siacs/conversations/crypto/PgpEngine.java @@ -8,6 +8,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.net.URL; import org.openintents.openpgp.OpenPgpError; import org.openintents.openpgp.OpenPgpSignatureResult; @@ -101,14 +102,25 @@ public class PgpEngine { switch (result.getIntExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_ERROR)) { case OpenPgpApi.RESULT_CODE_SUCCESS: + URL url = message.getImageParams().url; BitmapFactory.Options options = new BitmapFactory.Options(); options.inJustDecodeBounds = true; BitmapFactory.decodeFile( outputFile.getAbsolutePath(), options); int imageHeight = options.outHeight; int imageWidth = options.outWidth; - message.setBody(Long.toString(outputFile.getSize()) - + ',' + imageWidth + ',' + imageHeight); + if (url == null) { + message.setBody(Long.toString(outputFile + .getSize()) + + '|' + + imageWidth + + '|' + + imageHeight); + } else { + message.setBody(url.toString() + "|" + + Long.toString(outputFile.getSize()) + + '|' + imageWidth + '|' + imageHeight); + } message.setEncryption(Message.ENCRYPTION_DECRYPTED); PgpEngine.this.mXmppConnectionService .updateMessage(message); |