aboutsummaryrefslogtreecommitdiffstats
path: root/src/de/gultsch/chat/entities
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-02-13 23:40:08 +0100
committerDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-02-13 23:40:08 +0100
commit42c4c1789a75c87b67c38ef9ca3f57ddd10f0548 (patch)
treec5bf69cb73c3e4c3be0439c175774561f8b0a5e7 /src/de/gultsch/chat/entities
parente63109215e9dda9152f0bc92bf230b652413a677 (diff)
basic otr support
Diffstat (limited to 'src/de/gultsch/chat/entities')
-rw-r--r--src/de/gultsch/chat/entities/Account.java53
-rw-r--r--src/de/gultsch/chat/entities/Conversation.java54
2 files changed, 93 insertions, 14 deletions
diff --git a/src/de/gultsch/chat/entities/Account.java b/src/de/gultsch/chat/entities/Account.java
index 0f7bfd52..7f14b090 100644
--- a/src/de/gultsch/chat/entities/Account.java
+++ b/src/de/gultsch/chat/entities/Account.java
@@ -1,7 +1,14 @@
package de.gultsch.chat.entities;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import de.gultsch.chat.crypto.OtrEngine;
+import de.gultsch.chat.xmpp.XmppConnection;
import android.content.ContentValues;
+import android.content.Context;
import android.database.Cursor;
+import android.util.JsonReader;
import android.util.Log;
public class Account extends AbstractEntity{
@@ -15,6 +22,7 @@ public class Account extends AbstractEntity{
public static final String PASSWORD = "password";
public static final String OPTIONS = "options";
public static final String ROSTERVERSION = "rosterversion";
+ public static final String KEYS = "keys";
public static final int OPTION_USETLS = 0;
public static final int OPTION_DISABLED = 1;
@@ -34,23 +42,32 @@ public class Account extends AbstractEntity{
protected String rosterVersion;
protected String resource;
protected int status = 0;
+ protected JSONObject keys = new JSONObject();
protected boolean online = false;
+ transient OtrEngine otrEngine = null;
+ transient XmppConnection xmppConnection = null;
+
public Account() {
this.uuid = "0";
}
public Account(String username, String server, String password) {
- this(java.util.UUID.randomUUID().toString(),username,server,password,0,null);
+ this(java.util.UUID.randomUUID().toString(),username,server,password,0,null,"");
}
- public Account(String uuid, String username, String server,String password, int options, String rosterVersion) {
+ public Account(String uuid, String username, String server,String password, int options, String rosterVersion, String keys) {
this.uuid = uuid;
this.username = username;
this.server = server;
this.password = password;
this.options = options;
this.rosterVersion = rosterVersion;
+ try {
+ this.keys = new JSONObject(keys);
+ } catch (JSONException e) {
+
+ }
}
public boolean isOptionSet(int option) {
@@ -108,6 +125,14 @@ public class Account extends AbstractEntity{
public String getJid() {
return username+"@"+server;
}
+
+ public JSONObject getKeys() {
+ return keys;
+ }
+
+ public void setKey(String keyName, String keyValue) throws JSONException {
+ this.keys.put(keyName, keyValue);
+ }
@Override
public ContentValues getContentValues() {
@@ -117,6 +142,8 @@ public class Account extends AbstractEntity{
values.put(SERVER, server);
values.put(PASSWORD, password);
values.put(OPTIONS,options);
+ values.put(KEYS,this.keys.toString());
+ values.put(ROSTERVERSION,rosterVersion);
return values;
}
@@ -126,8 +153,28 @@ public class Account extends AbstractEntity{
cursor.getString(cursor.getColumnIndex(SERVER)),
cursor.getString(cursor.getColumnIndex(PASSWORD)),
cursor.getInt(cursor.getColumnIndex(OPTIONS)),
- cursor.getString(cursor.getColumnIndex(ROSTERVERSION))
+ cursor.getString(cursor.getColumnIndex(ROSTERVERSION)),
+ cursor.getString(cursor.getColumnIndex(KEYS))
);
}
+
+ public OtrEngine getOtrEngine(Context context) {
+ if (otrEngine==null) {
+ otrEngine = new OtrEngine(context,this);
+ }
+ return this.otrEngine;
+ }
+
+ public XmppConnection getXmppConnection() {
+ return this.xmppConnection;
+ }
+
+ public void setXmppConnection(XmppConnection connection) {
+ this.xmppConnection = connection;
+ }
+
+ public String getFullJid() {
+ return this.getJid()+"/"+this.resource;
+ }
}
diff --git a/src/de/gultsch/chat/entities/Conversation.java b/src/de/gultsch/chat/entities/Conversation.java
index fba5464a..7339aadb 100644
--- a/src/de/gultsch/chat/entities/Conversation.java
+++ b/src/de/gultsch/chat/entities/Conversation.java
@@ -3,7 +3,16 @@ package de.gultsch.chat.entities;
import java.util.ArrayList;
import java.util.List;
+import de.gultsch.chat.crypto.OtrEngine;
+import de.gultsch.chat.xmpp.XmppConnection;
+
+import net.java.otr4j.OtrException;
+import net.java.otr4j.session.SessionID;
+import net.java.otr4j.session.SessionImpl;
+import net.java.otr4j.session.SessionStatus;
+
import android.content.ContentValues;
+import android.content.Context;
import android.database.Cursor;
import android.net.Uri;
import android.util.Log;
@@ -40,6 +49,9 @@ public class Conversation extends AbstractEntity {
private transient List<Message> messages = null;
private transient Account account = null;
private transient Contact contact;
+
+ private transient SessionImpl otrSession;
+ private transient String foreignOtrPresence;
public Conversation(String name, Account account,
String contactJid, int mode) {
@@ -85,19 +97,13 @@ public class Conversation extends AbstractEntity {
}
}
- public String getLatestMessage() {
- if ((this.messages == null)||(this.messages.size()==0)) {
- return null;
- } else {
- return this.messages.get(this.messages.size() - 1).getBody();
- }
- }
-
- public long getLatestMessageDate() {
+ public Message getLatestMessage() {
if ((this.messages == null)||(this.messages.size()==0)) {
- return this.getCreated();
+ Message message = new Message(this,"",Message.ENCRYPTION_NONE);
+ message.setTime(0);
+ return message;
} else {
- return this.messages.get(this.messages.size() - 1).getTimeSent();
+ return this.messages.get(this.messages.size() - 1);
}
}
@@ -198,4 +204,30 @@ public class Conversation extends AbstractEntity {
public void setMode(int mode) {
this.mode = mode;
}
+
+ public void startOtrSession(Context context, String presence) {
+ Log.d("xmppService","starting otr session with "+presence);
+ SessionID sessionId = new SessionID(this.getContactJid(),presence,"xmpp");
+ this.otrSession = new SessionImpl(sessionId, getAccount().getOtrEngine(context));
+ }
+
+ public SessionImpl getOtrSession() {
+ return this.otrSession;
+ }
+
+ public void resetOtrSession() {
+ this.otrSession = null;
+ }
+
+ public void endOtrIfNeeded() throws OtrException {
+ if (this.otrSession!=null) {
+ if (this.otrSession.getSessionStatus() == SessionStatus.ENCRYPTED) {
+ this.otrSession.endSession();
+ }
+ }
+ }
+
+ public boolean hasOtrSession() {
+ return (this.otrSession!=null);
+ }
}