moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-28 11:42:15 -05:00
Code Issues Releases Wiki Activity

Merge branch 'development' into feature/take_picture

Browse Source
This commit is contained in:
Daniel Gultsch 2014-05-13 15:40:59 +02:00
commit a8010e7133
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/eu/siacs/conversations/services/ImageProvider.java
View File

@ -94,4 +94,12 @@ public class ImageProvider extends ContentProvider {
return 0;
}
public static Uri getContentUri(Message message) {
return Uri
.parse("content://eu.siacs.conversations.images/"
+ message.getConversationUuid()
+ "/"
+ message.getUuid());
}
}

10
src/eu/siacs/conversations/ui/ConversationFragment.java
View File

@ -16,6 +16,7 @@ import eu.siacs.conversations.entities.Conversation;
import eu.siacs.conversations.entities.Message;
import eu.siacs.conversations.entities.MucOptions;
import eu.siacs.conversations.entities.MucOptions.OnRenameListener;
import eu.siacs.conversations.services.ImageProvider;
import eu.siacs.conversations.services.XmppConnectionService;
import eu.siacs.conversations.utils.UIHelper;
import eu.siacs.conversations.xmpp.jingle.JingleConnection;
@ -329,15 +330,8 @@ public class ConversationFragment extends Fragment {
@Override
public void onClick(View v) {
Uri uri = Uri
.parse("content://eu.siacs.conversations.images/"
+ message.getConversationUuid()
+ "/"
+ message.getUuid());
Log.d("xmppService",
"staring intent with uri:" + uri.toString());
Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setDataAndType(uri, "image/*");
intent.setDataAndType(ImageProvider.getContentUri(message), "image/*");
startActivity(intent);
}
});