get rid of special self presence object and incorporate that into roster

3 files changed, 46 insertions, 75 deletions

diff --git a/src/main/java/eu/siacs/conversations/entities/Account.java b/src/main/java/eu/siacs/conversations/entities/Account.java
index 538d0ec2..d9001017 100644
--- a/src/main/java/eu/siacs/conversations/entities/Account.java
+++ b/src/main/java/eu/siacs/conversations/entities/Account.java
@@ -116,10 +116,9 @@ public class Account extends AbstractEntity {
 	protected boolean online = false;
 	private OtrEngine otrEngine = null;
 	private XmppConnection xmppConnection = null;
-	private Presences presences = new Presences();
 	private long mEndGracePeriod = 0L;
 	private String otrFingerprint;
-	private Roster roster = null;
+	private final Roster roster = new Roster(this);
 	private List<Bookmark> bookmarks = new CopyOnWriteArrayList<>();
 
 	public Account() {
@@ -328,20 +327,8 @@ public class Account extends AbstractEntity {
 		this.rosterVersion = version;
 	}
 
-	public void updatePresence(String resource, int status) {
-		this.presences.updatePresence(resource, status);
-	}
-
-	public void removePresence(String resource) {
-		this.presences.removePresence(resource);
-	}
-
-	public void clearPresences() {
-		this.presences = new Presences();
-	}
-
 	public int countPresences() {
-		return this.presences.size();
+		return this.getRoster().getContact(this.getJid().toBareJid()).getPresences().size();
 	}
 
 	public String getPgpSignature() {
@@ -357,9 +344,6 @@ public class Account extends AbstractEntity {
 	}
 
 	public Roster getRoster() {
-		if (this.roster == null) {
-			this.roster = new Roster(this);
-		}
 		return this.roster;
 	}
 
diff --git a/src/main/java/eu/siacs/conversations/parser/PresenceParser.java b/src/main/java/eu/siacs/conversations/parser/PresenceParser.java
index 43c8fa8d..684713f0 100644
--- a/src/main/java/eu/siacs/conversations/parser/PresenceParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/PresenceParser.java
@@ -45,69 +45,57 @@ public class PresenceParser extends AbstractParser implements
 		}
 		final Jid from = packet.getFrom();
 		String type = packet.getAttribute("type");
-		if (from.toBareJid().equals(account.getJid().toBareJid())) {
+		Contact contact = account.getRoster().getContact(packet.getFrom());
+		if (type == null) {
+			String presence;
 			if (!from.isBareJid()) {
-				if (type == null) {
-					account.updatePresence(from.getResourcepart(),
-							Presences.parseShow(packet.findChild("show")));
-				} else if (type.equals("unavailable")) {
-					account.removePresence(from.getResourcepart());
-					account.deactivateGracePeriod();
-				}
+				presence = from.getResourcepart();
+			} else {
+				presence = "";
 			}
-		} else {
-			Contact contact = account.getRoster().getContact(packet.getFrom());
-			if (type == null) {
-				String presence;
-				if (!from.isBareJid()) {
-					presence = from.getResourcepart();
-				} else {
-					presence = "";
-				}
-				int sizeBefore = contact.getPresences().size();
-				contact.updatePresence(presence,
-						Presences.parseShow(packet.findChild("show")));
-				PgpEngine pgp = mXmppConnectionService.getPgpEngine();
-				if (pgp != null) {
-					Element x = packet.findChild("x", "jabber:x:signed");
-					if (x != null) {
-						Element status = packet.findChild("status");
-						String msg;
-						if (status != null) {
-							msg = status.getContent();
-						} else {
-							msg = "";
-						}
-						contact.setPgpKeyId(pgp.fetchKeyId(account, msg,
-								x.getContent()));
+			int sizeBefore = contact.getPresences().size();
+			contact.updatePresence(presence,
+					Presences.parseShow(packet.findChild("show")));
+			PgpEngine pgp = mXmppConnectionService.getPgpEngine();
+			if (pgp != null) {
+				Element x = packet.findChild("x", "jabber:x:signed");
+				if (x != null) {
+					Element status = packet.findChild("status");
+					String msg;
+					if (status != null) {
+						msg = status.getContent();
+					} else {
+						msg = "";
 					}
+					contact.setPgpKeyId(pgp.fetchKeyId(account, msg,
+							x.getContent()));
 				}
-				boolean online = sizeBefore < contact.getPresences().size();
-				updateLastseen(packet, account, true);
-				mXmppConnectionService.onContactStatusChanged
-						.onContactStatusChanged(contact, online);
-			} else if (type.equals("unavailable")) {
-				if (from.isBareJid()) {
-					contact.clearPresences();
-				} else {
-					contact.removePresence(from.getResourcepart());
-				}
-				mXmppConnectionService.onContactStatusChanged
-						.onContactStatusChanged(contact, false);
-			} else if (type.equals("subscribe")) {
-				if (contact.getOption(Contact.Options.PREEMPTIVE_GRANT)) {
-					mXmppConnectionService.sendPresencePacket(account,
-							mPresenceGenerator.sendPresenceUpdatesTo(contact));
-				} else {
-					contact.setOption(Contact.Options.PENDING_SUBSCRIPTION_REQUEST);
-				}
 			}
-			Element nick = packet.findChild("nick",
-					"http://jabber.org/protocol/nick");
-			if (nick != null) {
-				contact.setPresenceName(nick.getContent());
+			boolean online = sizeBefore < contact.getPresences().size();
+			updateLastseen(packet, account, true);
+			mXmppConnectionService.onContactStatusChanged
+					.onContactStatusChanged(contact, online);
+		} else if (type.equals("unavailable")) {
+			if (from.isBareJid()) {
+				contact.clearPresences();
+			} else {
+				contact.removePresence(from.getResourcepart());
+			}
+			mXmppConnectionService.onContactStatusChanged
+					.onContactStatusChanged(contact, false);
+		} else if (type.equals("subscribe")) {
+			if (contact.getOption(Contact.Options.PREEMPTIVE_GRANT)) {
+				mXmppConnectionService.sendPresencePacket(account,
+						mPresenceGenerator.sendPresenceUpdatesTo(contact));
+			} else {
+				contact.setOption(Contact.Options.PENDING_SUBSCRIPTION_REQUEST);
 			}
 		}
+		Element nick = packet.findChild("nick",
+				"http://jabber.org/protocol/nick");
+		if (nick != null) {
+			contact.setPresenceName(nick.getContent());
+		}
 		mXmppConnectionService.updateRosterUi();
 	}
 
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 76f2e36b..dc3b3200 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -241,7 +241,6 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		@Override
 		public void onBind(final Account account) {
 			account.getRoster().clearPresences();
-			account.clearPresences(); // self presences
 			account.pendingConferenceJoins.clear();
 			account.pendingConferenceLeaves.clear();
 			fetchRosterFromServer(account);