Merge branch 'development' into feature/take_picture

1 files changed, 8 insertions, 0 deletions

diff --git a/src/eu/siacs/conversations/services/ImageProvider.java b/src/eu/siacs/conversations/services/ImageProvider.java
index c1bae661..7ca57032 100644
--- a/src/eu/siacs/conversations/services/ImageProvider.java
+++ b/src/eu/siacs/conversations/services/ImageProvider.java
@@ -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());
+	}
 
 }