aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart/messenger/ui
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2016-10-05 21:15:10 +0200
committerChristian Schneppe <christian@pix-art.de>2016-10-05 21:15:10 +0200
commite7d59858ae3354ca3945496bd297351e71b3c9d2 (patch)
treeb482525b76d16628acf32d35eb861be4f9dced36 /src/main/java/de/pixart/messenger/ui
parentf4b2ede7cc5f2bbb7e17ba5d527131b1895251f4 (diff)
resolve take photo uri for internal use
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui')
-rw-r--r--src/main/java/de/pixart/messenger/ui/ConversationActivity.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
index 845d174d5..cafd18f00 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
@@ -1688,14 +1688,15 @@ public class ConversationActivity extends XmppActivity
}
} else if (requestCode == ATTACHMENT_CHOICE_TAKE_PHOTO) {
if (mPendingPhotoUris.size() == 1) {
- Uri uri = mPendingPhotoUris.get(0);
- if (xmppConnectionServiceBound) {
+ Uri uri = FileBackend.getIndexableTakePhotoUri(mPendingPhotoUris.get(0));
+ mPendingPhotoUris.set(0, uri);
+ if (xmppConnectionServiceBound) {
Log.d(Config.LOGTAG,"ConversationsActivity.onActivityResult() - attaching photo to conversations. TAKE_PHOTO");
attachPhotoToConversation(getSelectedConversation(), uri);
mPendingPhotoUris.clear();
}
Intent intent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE);
- intent.setData(FileBackend.getIndexableTakePhotoUri(uri));
+ intent.setData(uri);
sendBroadcast(intent);
} else {
mPendingPhotoUris.clear();