Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase

Conflicts:
	src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java

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;