attach contact to notification

1 files changed, 14 insertions, 2 deletions

diff --git a/src/main/java/de/pixart/messenger/entities/Contact.java b/src/main/java/de/pixart/messenger/entities/Contact.java
index 06fd4592c..090486243 100644
--- a/src/main/java/de/pixart/messenger/entities/Contact.java
+++ b/src/main/java/de/pixart/messenger/entities/Contact.java
@@ -3,6 +3,8 @@ package de.pixart.messenger.entities;
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
+import android.net.Uri;
+import android.provider.ContactsContract;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -265,8 +267,18 @@ public class Contact implements ListItem, Blockable {
 		this.presenceName = presenceName;
 	}
 
-	public String getSystemAccount() {
-		return systemAccount;
+	public Uri getSystemAccount() {
+		if (systemAccount == null) {
+			return null;
+		} else {
+			String[] parts = systemAccount.split("#");
+			if (parts.length != 2) {
+				return null;
+			} else {
+				long id = Long.parseLong(parts[0]);
+				return ContactsContract.Contacts.getLookupUri(id, parts[1]);
+			}
+		}
 	}
 
 	public void setSystemAccount(String account) {