diff options
| author | Daniel Gultsch <daniel.gultsch@rwth-aachen.de> | 2014-02-16 16:32:15 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel.gultsch@rwth-aachen.de> | 2014-02-16 16:32:15 +0100 |
| commit | 9c7cacdbddf6ba1a34fd56b71718ba4e44e20efa (patch) | |
| tree | a9f138b3bd8395b3a198235a1c8d559d71347ef4 /src/de/gultsch/chat/persistance/DatabaseBackend.java | |
| parent | 42c4c1789a75c87b67c38ef9ca3f57ddd10f0548 (diff) | |
show unknown otr fingerprint warining
Diffstat (limited to 'src/de/gultsch/chat/persistance/DatabaseBackend.java')
| -rw-r--r-- | src/de/gultsch/chat/persistance/DatabaseBackend.java | 6 |
1 files changed, 1 insertions, 5 deletions
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<Contact> getContacts(Account account) { List<Contact> list = new ArrayList<Contact>(); |