mirror of
https://github.com/moparisthebest/Conversations
synced 2024-11-10 11:15:03 -05:00
Merge branch 'development' into feature/take_picture
This commit is contained in:
commit
a8010e7133
@ -93,5 +93,13 @@ public class ImageProvider extends ContentProvider {
|
||||
public int update(Uri arg0, ContentValues arg1, String arg2, String[] arg3) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
public static Uri getContentUri(Message message) {
|
||||
return Uri
|
||||
.parse("content://eu.siacs.conversations.images/"
|
||||
+ message.getConversationUuid()
|
||||
+ "/"
|
||||
+ message.getUuid());
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -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);
|
||||
}
|
||||
});
|
||||
|
Loading…
Reference in New Issue
Block a user