permanently cache last resolver result

1 files changed, 40 insertions, 38 deletions

diff --git a/src/main/java/de/pixart/messenger/persistance/DatabaseBackend.java b/src/main/java/de/pixart/messenger/persistance/DatabaseBackend.java
index 09a018d3d..cc334addb 100644
--- a/src/main/java/de/pixart/messenger/persistance/DatabaseBackend.java
+++ b/src/main/java/de/pixart/messenger/persistance/DatabaseBackend.java
@@ -49,6 +49,7 @@ import de.pixart.messenger.entities.Roster;
 import de.pixart.messenger.entities.ServiceDiscoveryResult;
 import de.pixart.messenger.services.ShortcutService;
 import de.pixart.messenger.utils.CryptoHelper;
+import de.pixart.messenger.utils.Resolver;
 import de.pixart.messenger.xmpp.jid.InvalidJidException;
 import de.pixart.messenger.xmpp.jid.Jid;
 import de.pixart.messenger.xmpp.mam.MamReference;
@@ -58,7 +59,7 @@ public class DatabaseBackend extends SQLiteOpenHelper {
     private static DatabaseBackend instance = null;
 
     public static final String DATABASE_NAME = "history";
-    public static final int DATABASE_VERSION = 39; // = Conversations DATABASE_VERSION + 1
+    public static final int DATABASE_VERSION = 40; // = Conversations DATABASE_VERSION + 1
 
     private static String CREATE_CONTATCS_STATEMENT = "create table "
             + Contact.TABLENAME + "(" + Contact.ACCOUNT + " TEXT, "
@@ -145,8 +146,17 @@ public class DatabaseBackend extends SQLiteOpenHelper {
             + ") ON CONFLICT IGNORE"
             + ");";
 
-    private static String START_TIMES_TABLE = "start_times";
-    private static String CREATE_START_TIMES_TABLE = "create table " + START_TIMES_TABLE + " (timestamp NUMBER);";
+    private static String RESOLVER_RESULTS_TABLENAME = "resolver_results";
+    private static String CREATE_RESOLVER_RESULTS_TABLE = "create table " + RESOLVER_RESULTS_TABLENAME + "("
+            + Resolver.Result.DOMAIN + " TEXT,"
+            + Resolver.Result.HOSTNAME + " TEXT,"
+            + Resolver.Result.IP + " BLOB,"
+            + Resolver.Result.PRIORITY + " NUMBER,"
+            + Resolver.Result.DIRECT_TLS + " NUMBER,"
+            + Resolver.Result.AUTHENTICATED + " NUMBER,"
+            + Resolver.Result.PORT + " NUMBER,"
+            + "UNIQUE(" + Resolver.Result.DOMAIN + ") ON CONFLICT REPLACE"
+            + ");";
     private static String CREATE_MESSAGE_TIME_INDEX = "create INDEX message_time_index ON " + Message.TABLENAME + "(" + Message.TIME_SENT + ")";
     private static String CREATE_MESSAGE_CONVERSATION_INDEX = "create INDEX message_conversation_index ON " + Message.TABLENAME + "(" + Message.CONVERSATION + ")";
 
@@ -209,7 +219,7 @@ public class DatabaseBackend extends SQLiteOpenHelper {
         db.execSQL(CREATE_SIGNED_PREKEYS_STATEMENT);
         db.execSQL(CREATE_IDENTITIES_STATEMENT);
         db.execSQL(CREATE_PRESENCE_TEMPLATES_STATEMENT);
-        db.execSQL(CREATE_START_TIMES_TABLE);
+        db.execSQL(CREATE_RESOLVER_RESULTS_TABLE);
     }
 
     @Override
@@ -366,9 +376,6 @@ public class DatabaseBackend extends SQLiteOpenHelper {
             db.execSQL("ALTER TABLE " + Message.TABLENAME + " ADD COLUMN " + Message.ERROR_MESSAGE + " TEXT");
         }
 
-        if (oldVersion < 30 && newVersion >= 30) {
-            db.execSQL(CREATE_START_TIMES_TABLE);
-        }
         if (oldVersion >= 15 && oldVersion < 31 && newVersion >= 31) {
             db.execSQL("ALTER TABLE " + SQLiteAxolotlStore.IDENTITIES_TABLENAME + " ADD COLUMN " + SQLiteAxolotlStore.TRUST + " TEXT");
             db.execSQL("ALTER TABLE " + SQLiteAxolotlStore.IDENTITIES_TABLENAME + " ADD COLUMN " + SQLiteAxolotlStore.ACTIVE + " NUMBER");
@@ -475,6 +482,10 @@ public class DatabaseBackend extends SQLiteOpenHelper {
         if (oldVersion < 39 && newVersion >= 39) {
             db.execSQL("ALTER TABLE " + Message.TABLENAME + " ADD COLUMN " + Message.MARKABLE + " NUMBER DEFAULT 0");
         }
+
+        if (oldVersion < 40 && newVersion >= 40) {
+            db.execSQL(CREATE_RESOLVER_RESULTS_TABLE);
+        }
     }
 
     private static ContentValues createFingerprintStatusContentValues(FingerprintStatus.Trust trust, boolean active) {
@@ -615,6 +626,28 @@ public class DatabaseBackend extends SQLiteOpenHelper {
         return result;
     }
 
+    public void saveResolverResult(String domain, Resolver.Result result) {
+        SQLiteDatabase db = this.getWritableDatabase();
+        ContentValues contentValues = result.toContentValues();
+        contentValues.put(Resolver.Result.DOMAIN, domain);
+        db.insert(RESOLVER_RESULTS_TABLENAME, null, contentValues);
+    }
+
+    public Resolver.Result findResolverResult(String domain) {
+        SQLiteDatabase db = this.getReadableDatabase();
+        String where = Resolver.Result.DOMAIN + "=?";
+        String[] whereArgs = {domain};
+        Cursor cursor = db.query(RESOLVER_RESULTS_TABLENAME, null, where, whereArgs, null, null, null);
+        Resolver.Result result = null;
+        if (cursor != null) {
+            if (cursor.moveToFirst()) {
+                result = Resolver.Result.fromCursor(cursor);
+            }
+            cursor.close();
+        }
+        return result;
+    }
+
     public void insertPresenceTemplate(PresenceTemplate template) {
         SQLiteDatabase db = this.getWritableDatabase();
         db.insert(PresenceTemplate.TABELNAME, null, template.getContentValues());
@@ -1442,37 +1475,6 @@ public class DatabaseBackend extends SQLiteOpenHelper {
                 deleteArgs);
     }
 
-    public boolean startTimeCountExceedsThreshold() {
-        SQLiteDatabase db = this.getWritableDatabase();
-        long cleanBeforeTimestamp = System.currentTimeMillis() - Config.FREQUENT_RESTARTS_DETECTION_WINDOW;
-        db.execSQL("delete from " + START_TIMES_TABLE + " where timestamp < " + cleanBeforeTimestamp);
-        ContentValues values = new ContentValues();
-        values.put("timestamp", System.currentTimeMillis());
-        db.insert(START_TIMES_TABLE, null, values);
-        String[] columns = new String[]{"count(timestamp)"};
-        Cursor cursor = db.query(START_TIMES_TABLE, columns, null, null, null, null, null);
-        int count;
-        if (cursor.moveToFirst()) {
-            count = cursor.getInt(0);
-        } else {
-            count = 0;
-        }
-        cursor.close();
-        Log.d(Config.LOGTAG, "start time counter reached " + count);
-        return count >= Config.FREQUENT_RESTARTS_THRESHOLD;
-    }
-
-    public void clearStartTimeCounter(boolean justOne) {
-        SQLiteDatabase db = this.getWritableDatabase();
-        if (justOne) {
-            db.execSQL("delete from "+START_TIMES_TABLE+" where timestamp in (select timestamp from "+START_TIMES_TABLE+" order by timestamp desc limit 1)");
-            Log.d(Config.LOGTAG,"do not count start up after being swiped away");
-        } else {
-            Log.d(Config.LOGTAG,"resetting start time counter");
-            db.execSQL("delete from " + START_TIMES_TABLE);
-        }
-    }
-
     public List<ShortcutService.FrequentContact> getFrequentContacts(int days) {
         SQLiteDatabase db = this.getReadableDatabase();
         final String SQL = "select " + Conversation.TABLENAME + "." + Conversation.ACCOUNT + "," + Conversation.TABLENAME + "." + Conversation.CONTACTJID + " from " + Conversation.TABLENAME + " join " + Message.TABLENAME + " on conversations.uuid=messages.conversationUuid where messages.status!=0 and carbon==0  and conversations.mode=0 and messages.timeSent>=? group by conversations.uuid order by count(body) desc limit 4;";