diff options
| author | Christian S. <kriztan@users.noreply.github.com> | 2015-09-01 14:30:00 +0200 |
|---|---|---|
| committer | Christian S. <kriztan@users.noreply.github.com> | 2015-09-01 14:30:00 +0200 |
| commit | faf682b3c2391e4d65dd18e9aa85e4d119ed1797 (patch) | |
| tree | 456513ae024083468391973f8ba25ea8a0259c9c /src/main | |
| parent | b1d7ea54087047be5d101c379dec58605de5f4e0 (diff) | |
| parent | 74cf8320bcf918bf8b3511e752850e921a2f4df3 (diff) | |
Merge pull request #32 from siacs/master
update commits
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | src/main/java/eu/siacs/conversations/generator/MessageGenerator.java | 1 | ||||
| -rw-r--r-- | src/main/java/eu/siacs/conversations/persistance/FileBackend.java | 7 |
3 files changed, 8 insertions, 1 deletions
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index 7f07a39c7..89ea620a2 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -47,6 +47,7 @@ <activity android:name=".ui.StartConversationActivity" android:configChanges="orientation|screenSize" + android:launchMode="singleTask" android:label="@string/title_activity_start_conversation" > <intent-filter> <action android:name="android.intent.action.SENDTO" /> diff --git a/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java b/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java index a06a0dddb..2db666076 100644 --- a/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java +++ b/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java @@ -64,6 +64,7 @@ public class MessageGenerator extends AbstractGenerator { return null; } packet.setAxolotlMessage(axolotlMessage.toElement()); + packet.addChild("pretty-please-store","urn:xmpp:hints"); return packet; } diff --git a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java index 135d5648d..7fc7eb64e 100644 --- a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java +++ b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java @@ -131,11 +131,16 @@ public class FileBackend { if (path == null) { return false; } + File file = new File(path); + long size = file.length(); + if (size == 0 || size >= 524288 ) { + return false; + } BitmapFactory.Options options = new BitmapFactory.Options(); options.inJustDecodeBounds = true; try { BitmapFactory.decodeStream(mXmppConnectionService.getContentResolver().openInputStream(uri), null, options); - if (options == null || options.outMimeType == null) { + if (options == null || options.outMimeType == null || options.outHeight <= 0 || options.outWidth <= 0) { return false; } return (options.outWidth <= Config.IMAGE_SIZE && options.outHeight <= Config.IMAGE_SIZE && options.outMimeType.contains(Config.IMAGE_FORMAT.name().toLowerCase())); |