roster versioning. roster updates on air. performance fixes in conversation listview

2 files changed, 14 insertions, 1 deletions

diff --git a/src/de/gultsch/chat/entities/Account.java b/src/de/gultsch/chat/entities/Account.java
index 1bced45f..dce5677e 100644
--- a/src/de/gultsch/chat/entities/Account.java
+++ b/src/de/gultsch/chat/entities/Account.java
@@ -201,4 +201,16 @@ public class Account  extends AbstractEntity{
 		}
 		return this.otrFingerprint;
 	}
+
+	public String getRosterVersion() {
+		if (this.rosterVersion==null) {
+			return "";
+		} else {
+			return this.rosterVersion;
+		}
+	}
+	
+	public void setRosterVersion(String version) {
+		this.rosterVersion = version;
+	}
 }
diff --git a/src/de/gultsch/chat/entities/Contact.java b/src/de/gultsch/chat/entities/Contact.java
index 5d5710a5..c899603f 100644
--- a/src/de/gultsch/chat/entities/Contact.java
+++ b/src/de/gultsch/chat/entities/Contact.java
@@ -32,7 +32,7 @@ public class Contact extends AbstractEntity implements Serializable {
 	protected String subscription;
 	protected String systemAccount;
 	protected String photoUri;
-	protected JSONObject keys;
+	protected JSONObject keys = new JSONObject();
 	protected Presences presences = new Presences();
 
 	protected Account account;
@@ -47,6 +47,7 @@ public class Contact extends AbstractEntity implements Serializable {
 		this.displayName = displayName;
 		this.jid = jid;
 		this.photoUri = photoUri;
+		this.uuid = java.util.UUID.randomUUID().toString();
 	}
 
 	public Contact(String uuid, String account, String displayName, String jid,