From 9c7cacdbddf6ba1a34fd56b71718ba4e44e20efa Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sun, 16 Feb 2014 16:32:15 +0100 Subject: show unknown otr fingerprint warining --- src/de/gultsch/chat/persistance/DatabaseBackend.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/de/gultsch/chat/persistance') diff --git a/src/de/gultsch/chat/persistance/DatabaseBackend.java b/src/de/gultsch/chat/persistance/DatabaseBackend.java index df919f72..4607883c 100644 --- a/src/de/gultsch/chat/persistance/DatabaseBackend.java +++ b/src/de/gultsch/chat/persistance/DatabaseBackend.java @@ -56,7 +56,7 @@ public class DatabaseBackend extends SQLiteOpenHelper { db.execSQL("create table " + Contact.TABLENAME + "(" + Contact.UUID + " TEXT PRIMARY KEY, " + Contact.ACCOUNT + " TEXT, " + Contact.DISPLAYNAME + " TEXT," + Contact.JID + " TEXT," - + Contact.PRESENCES + " TEXT, " + Contact.OPENPGPKEY + + Contact.PRESENCES + " TEXT, " + Contact.KEYS + " TEXT," + Contact.PHOTOURI + " TEXT," + Contact.SUBSCRIPTION + " TEXT," + Contact.SYSTEMACCOUNT + " NUMBER, " + "FOREIGN KEY(" + Contact.ACCOUNT + ") REFERENCES " @@ -227,10 +227,6 @@ public class DatabaseBackend extends SQLiteOpenHelper { } } } - - public void mergeMessageIntoConversation(Message message) { - // select counterpart,body,(timeSent/1000)-180 as min,(timeSent/1000)+180 as max from messages where min<1392035670 and max>1392035670; - } public List getContacts(Account account) { List list = new ArrayList(); -- cgit v1.2.3