diff options
author | steckbrief <steckbrief@chefmail.de> | 2016-03-10 23:03:19 +0100 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2016-03-10 23:03:19 +0100 |
commit | 8585231be2844ab794cfa63454b1013bae8502f6 (patch) | |
tree | 65126dbebd698c0358b2d499be9e16c3ae8d8f5f /src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java | |
parent | 07c2aba59b0ec0fd492621406d08ce33e23ad7ad (diff) | |
parent | 27c9c0aa21e3ec1a5801f6c3279caf0cd4fe9248 (diff) |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Conflicts:
src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java')
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java index 3436d322..bc74f39b 100644 --- a/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java @@ -18,6 +18,8 @@ import de.thedevstack.conversationsplus.exceptions.UiException; import de.thedevstack.conversationsplus.utils.FileHelper; import de.thedevstack.conversationsplus.utils.ImageUtil; import de.thedevstack.conversationsplus.utils.MessageUtil; +import de.thedevstack.conversationsplus.utils.StreamUtil; + import eu.siacs.conversations.R; import eu.siacs.conversations.entities.Conversation; import eu.siacs.conversations.entities.DownloadableFile; @@ -146,7 +148,7 @@ public class ResizePictureUserDecisionListener implements UserDecisionListener { public void run() { InputStream is = null; try { - is = ConversationsPlusApplication.getInstance().getContentResolver().openInputStream(uri); + is = StreamUtil.openInputStreamFromContentResolver(uri); long imageSize = is.available(); BitmapFactory.Options options = new BitmapFactory.Options(); options.inJustDecodeBounds = true; |