2 files changed, 28 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 fad4806de..e428362c6 100644
--- a/src/main/java/de/pixart/messenger/entities/Contact.java
+++ b/src/main/java/de/pixart/messenger/entities/Contact.java
@@ -20,6 +20,7 @@ import java.util.Locale;
 
 import de.pixart.messenger.Config;
 import de.pixart.messenger.R;
+import de.pixart.messenger.android.AbstractPhoneContact;
 import de.pixart.messenger.utils.JidHelper;
 import de.pixart.messenger.utils.UIHelper;
 import de.pixart.messenger.xml.Element;
@@ -579,6 +580,27 @@ public class Contact implements ListItem, Blockable {
         return serverName;
     }
 
+    public synchronized boolean setPhoneContact(AbstractPhoneContact phoneContact) {
+        setOption(getOption(phoneContact.getClass()));
+        setSystemAccount(phoneContact.getLookupUri());
+        boolean changed = setSystemName(phoneContact.getDisplayName());
+        changed |= setPhotoUri(phoneContact.getPhotoUri());
+        return changed;
+    }
+    public synchronized boolean unsetPhoneContact(Class<?extends AbstractPhoneContact> clazz) {
+        resetOption(getOption(clazz));
+        boolean changed = false;
+        if (!getOption(Options.SYNCED_VIA_ADDRESSBOOK) && !getOption(Options.SYNCED_VIA_OTHER)) {
+            setSystemAccount(null);
+            changed |= setPhotoUri(null);
+            changed |= setSystemName(null);
+        }
+        return changed;
+    }
+    public static int getOption(Class<? extends AbstractPhoneContact> clazz) {
+        return Options.SYNCED_VIA_OTHER;
+    }
+
     public final class Options {
         public static final int TO = 0;
         public static final int FROM = 1;
@@ -588,5 +610,7 @@ public class Contact implements ListItem, Blockable {
         public static final int PENDING_SUBSCRIPTION_REQUEST = 5;
         public static final int DIRTY_PUSH = 6;
         public static final int DIRTY_DELETE = 7;
+        private static final int SYNCED_VIA_ADDRESSBOOK = 8;
+        private static final int SYNCED_VIA_OTHER = 9;
     }
 }
diff --git a/src/main/java/de/pixart/messenger/entities/Roster.java b/src/main/java/de/pixart/messenger/entities/Roster.java
index 2db0c796e..fea3af1f7 100644
--- a/src/main/java/de/pixart/messenger/entities/Roster.java
+++ b/src/main/java/de/pixart/messenger/entities/Roster.java
@@ -5,6 +5,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 
+import de.pixart.messenger.android.AbstractPhoneContact;
 import rocks.xmpp.addr.Jid;
 
 public class Roster {
@@ -54,11 +55,12 @@ public class Roster {
         }
     }
 
-    public List<Contact> getWithSystemAccounts() {
+    public List<Contact> getWithSystemAccounts(Class<?extends AbstractPhoneContact> clazz) {
+        int option = Contact.getOption(clazz);
         List<Contact> with = getContacts();
         for (Iterator<Contact> iterator = with.iterator(); iterator.hasNext(); ) {
             Contact contact = iterator.next();
-            if (contact.getSystemAccount() == null) {
+            if (!contact.getOption(option)) {
                 iterator.remove();
             }
         }