implementet missing methods on the new roster mgmt

2 files changed, 17 insertions, 3 deletions

diff --git a/src/eu/siacs/conversations/entities/Roster.java b/src/eu/siacs/conversations/entities/Roster.java
index 7c18d80aa..1b4bc9549 100644
--- a/src/eu/siacs/conversations/entities/Roster.java
+++ b/src/eu/siacs/conversations/entities/Roster.java
@@ -31,12 +31,23 @@ public class Roster {
 	}
 
 	public void clearPresences() {
-		// TODO Auto-generated method stub
-		
+		for(Contact contact : getContacts()) {
+			contact.clearPresences();
+		}
 	}
 	
 	public void markAllAsNotInRoster() {
-		
+		for(Contact contact : getContacts()) {
+			contact.resetOption(Contact.Options.IN_ROSTER);
+		}
+	}
+	
+	public void clearSystemAccounts() {
+		for(Contact contact : getContacts()) {
+			contact.setPhotoUri(null);
+			contact.setSystemName(null);
+			contact.setSystemAccount(null);
+		}
 	}
 
 	public List<Contact> getContacts() {
diff --git a/src/eu/siacs/conversations/services/XmppConnectionService.java b/src/eu/siacs/conversations/services/XmppConnectionService.java
index 63ce6a5b4..c01c7a1af 100644
--- a/src/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/eu/siacs/conversations/services/XmppConnectionService.java
@@ -894,6 +894,9 @@ public class XmppConnectionService extends Service {
 				new OnPhoneContactsLoadedListener() {
 					@Override
 					public void onPhoneContactsLoaded(List<Bundle> phoneContacts) {
+						for(Account account : accounts) {
+							account.getRoster().clearSystemAccounts();
+						}
 						for (Bundle phoneContact : phoneContacts) {
 							for (Account account : accounts) {
 								String jid = phoneContact.getString("jid");