minor db revert

Panagiotis Triantafyllou
Commit bf8219dd97ab3ba368d46e54c2551d93ed5ab3de bf8219dd 1 parent c5f83d27
Showing 1 changed file with 64 additions and 100 deletions
warply_android_sdk/src/main/java/ly/warp/sdk/db/WarplyDBHelper.java
--- a/warply_android_sdk/src/main/java/ly/warp/sdk/db/WarplyDBHelper.java
View file @bf8219d
+++ b/warply_android_sdk/src/main/java/ly/warp/sdk/db/WarplyDBHelper.java
View file @bf8219d
@@ -35,7 +35,7 @@ public class WarplyDBHelper extends SQLiteOpenHelper {
     }
     private static final String DB_NAME = "warply.db";
-    private static final int DB_VERSION = 6;
+    private static final int DB_VERSION = 7;
     private static final String KEY_CIPHER = "tn#mpOl3v3Dy1pr@W";
     //------------------------------ Fields -----------------------------//
@@ -222,15 +222,10 @@ public class WarplyDBHelper extends SQLiteOpenHelper {
             values.put(KEY_CLIENT_ID, clientId);
         if (!TextUtils.isEmpty(clientSecret))
             values.put(KEY_CLIENT_SECRET, clientSecret);
-        if (isTableNotEmpty(TABLE_CLIENT)) {
+        if (isTableNotEmpty(TABLE_CLIENT))
-            new Thread(() -> {
+            update(TABLE_CLIENT, values);
-                update(TABLE_CLIENT, values);
+        else
-            }).start();
+            insert(TABLE_CLIENT, values);
-        } else {
-            new Thread(() -> {
-                insert(TABLE_CLIENT, values);
-            }).start();
-        }
     }
     public synchronized void saveAuthAccess(String accessToken, String refreshToken) {
@@ -239,15 +234,10 @@ public class WarplyDBHelper extends SQLiteOpenHelper {
             values.put(KEY_ACCESS_TOKEN, accessToken);
         if (!TextUtils.isEmpty(refreshToken))
             values.put(KEY_REFRESH_TOKEN, refreshToken);
-        if (isTableNotEmpty(TABLE_AUTH)) {
+        if (isTableNotEmpty(TABLE_AUTH))
-            new Thread(() -> {
+            update(TABLE_AUTH, values);
-                update(TABLE_AUTH, values);
+        else
-            }).start();
+            insert(TABLE_AUTH, values);
-        } else {
-            new Thread(() -> {
-                insert(TABLE_AUTH, values);
-            }).start();
-        }
     }
     @Nullable
@@ -275,15 +265,11 @@ public class WarplyDBHelper extends SQLiteOpenHelper {
     }
     public synchronized void deleteClient() {
-        new Thread(() -> {
+        clearTable(TABLE_CLIENT);
-            clearTable(TABLE_CLIENT);
-        }).start();
     }
     public synchronized void deleteAuth() {
-        new Thread(() -> {
+        clearTable(TABLE_AUTH);
-            clearTable(TABLE_AUTH);
-        }).start();
     }
     //------------------------------ Api requests -----------------------------//
@@ -312,56 +298,44 @@ public class WarplyDBHelper extends SQLiteOpenHelper {
     }
     public synchronized void deleteAllRequests() {
-        new Thread(() -> {
+        clearTable(TABLE_REQUESTS);
-            clearTable(TABLE_REQUESTS);
-        }).start();
     }
     public synchronized void deleteAllPushRequests() {
-        new Thread(() -> {
+        clearTable(TABLE_PUSH_REQUESTS);
-            clearTable(TABLE_PUSH_REQUESTS);
-        }).start();
     }
     public synchronized void deleteAllPushAckRequests() {
-        new Thread(() -> {
+        clearTable(TABLE_PUSH_ACK_REQUESTS);
-            clearTable(TABLE_PUSH_ACK_REQUESTS);
-        }).start();
     }
     public synchronized long addRequest(String microapp, String entity, boolean force) {
-        new Thread(() -> {
+        ContentValues values = new ContentValues();
-            ContentValues values = new ContentValues();
+        values.put(KEY_REQUESTS_MICROAPP, microapp);
-            values.put(KEY_REQUESTS_MICROAPP, microapp);
+        values.put(KEY_REQUESTS_ENTITY, entity);
-            values.put(KEY_REQUESTS_ENTITY, entity);
+        values.put(KEY_REQUESTS_FORCE, force ? 1 : 0);
-            values.put(KEY_REQUESTS_FORCE, force ? 1 : 0);
+        values.put(KEY_REQUESTS_DATE_ADDED, System.currentTimeMillis());
-            values.put(KEY_REQUESTS_DATE_ADDED, System.currentTimeMillis());
+        insert(TABLE_REQUESTS, values);
-            insert(TABLE_REQUESTS, values);
-        }).start();
         return getRequestsInQueueCount();
     }
     public synchronized long addPushRequest(String microapp, String entity, boolean force) {
-        new Thread(() -> {
+        ContentValues values = new ContentValues();
-            ContentValues values = new ContentValues();
+        values.put(KEY_REQUESTS_MICROAPP, microapp);
-            values.put(KEY_REQUESTS_MICROAPP, microapp);
+        values.put(KEY_REQUESTS_ENTITY, entity);
-            values.put(KEY_REQUESTS_ENTITY, entity);
+        values.put(KEY_REQUESTS_FORCE, force ? 1 : 0);
-            values.put(KEY_REQUESTS_FORCE, force ? 1 : 0);
+        values.put(KEY_REQUESTS_DATE_ADDED, System.currentTimeMillis());
-            values.put(KEY_REQUESTS_DATE_ADDED, System.currentTimeMillis());
+        insert(TABLE_PUSH_REQUESTS, values);
-            insert(TABLE_PUSH_REQUESTS, values);
-        }).start();
         return getPushRequestsInQueueCount();
     }
     public synchronized long addPushAckRequest(String microapp, String entity, boolean force) {
-        new Thread(() -> {
+        ContentValues values = new ContentValues();
-            ContentValues values = new ContentValues();
+        values.put(KEY_REQUESTS_MICROAPP, microapp);
-            values.put(KEY_REQUESTS_MICROAPP, microapp);
+        values.put(KEY_REQUESTS_ENTITY, entity);
-            values.put(KEY_REQUESTS_ENTITY, entity);
+        values.put(KEY_REQUESTS_FORCE, force ? 1 : 0);
-            values.put(KEY_REQUESTS_FORCE, force ? 1 : 0);
+        values.put(KEY_REQUESTS_DATE_ADDED, System.currentTimeMillis());
-            values.put(KEY_REQUESTS_DATE_ADDED, System.currentTimeMillis());
+        insert(TABLE_PUSH_ACK_REQUESTS, values);
-            insert(TABLE_PUSH_ACK_REQUESTS, values);
-        }).start();
         return getPushAckRequestsInQueueCount();
     }
@@ -388,9 +362,7 @@ public class WarplyDBHelper extends SQLiteOpenHelper {
             strFilter.append("=");
             strFilter.append(ids[i]);
         }
-        new Thread(() -> {
+        getDb().delete(TABLE_REQUESTS, strFilter.toString(), null);
-            getDb().delete(TABLE_REQUESTS, strFilter.toString(), null);
-        }).start();
     }
     public synchronized void deletePushRequests(Long... ids) {
@@ -404,9 +376,7 @@ public class WarplyDBHelper extends SQLiteOpenHelper {
             strFilter.append("=");
             strFilter.append(ids[i]);
         }
-        new Thread(() -> {
+        getDb().delete(TABLE_PUSH_REQUESTS, strFilter.toString(), null);
-            getDb().delete(TABLE_PUSH_REQUESTS, strFilter.toString(), null);
-        }).start();
     }
     public synchronized void deletePushAckRequests(Long... ids) {
@@ -420,9 +390,7 @@ public class WarplyDBHelper extends SQLiteOpenHelper {
             strFilter.append("=");
             strFilter.append(ids[i]);
         }
-        new Thread(() -> {
+        getDb().delete(TABLE_PUSH_ACK_REQUESTS, strFilter.toString(), null);
-            getDb().delete(TABLE_PUSH_ACK_REQUESTS, strFilter.toString(), null);
-        }).start();
     }
     public synchronized boolean isForceRequestsExist() {
@@ -460,45 +428,41 @@ public class WarplyDBHelper extends SQLiteOpenHelper {
     //------------------------------ Tags -----------------------------//
     public synchronized void saveTags(String[] tags) {
-        new Thread(() -> {
+        if (tags != null && tags.length > 0) {
-            if (tags != null && tags.length > 0) {
+
-
+            try {
-                try {
+                getDb().beginTransaction();
-                    getDb().beginTransaction();
+                ContentValues values = new ContentValues();
-                    ContentValues values = new ContentValues();
+                for (String tag : tags) {
-                    for (String tag : tags) {
+                    values.put(KEY_TAG, tag);
-                        values.put(KEY_TAG, tag);
+                    values.put(KEY_TAG_LAST_ADD_DATE, System.currentTimeMillis());
-                        values.put(KEY_TAG_LAST_ADD_DATE, System.currentTimeMillis());
+                    insert(TABLE_TAGS, values);
-                        insert(TABLE_TAGS, values);
+                }
-                    }
+                getDb().setTransactionSuccessful();
-                    getDb().setTransactionSuccessful();
+
-
+            } catch (SQLException e) {
-                } catch (SQLException e) {
+                if (WarpConstants.DEBUG) {
-                    if (WarpConstants.DEBUG) {
+                    e.printStackTrace();
-                        e.printStackTrace();
-                    }
-                } finally {
-                    getDb().endTransaction();
                 }
+            } finally {
+                getDb().endTransaction();
             }
-        }).start();
+        }
     }
     public synchronized void removeTags(String[] tags) {
-        new Thread(() -> {
+        StringBuilder strFilter = new StringBuilder();
-            StringBuilder strFilter = new StringBuilder();
+        for (int i = 0; i < tags.length; i++) {
-            for (int i = 0; i < tags.length; i++) {
+            if (i > 0) {
-                if (i > 0) {
+                strFilter.append(" OR ");
-                    strFilter.append(" OR ");
-                }
-                strFilter.append(KEY_TAG);
-                strFilter.append("=");
-                strFilter.append("'");
-                strFilter.append(tags[i]);
-                strFilter.append("'");
             }
-            getDb().delete(TABLE_TAGS, strFilter.toString(), null);
+            strFilter.append(KEY_TAG);
-        }).start();
+            strFilter.append("=");
+            strFilter.append("'");
+            strFilter.append(tags[i]);
+            strFilter.append("'");
+        }
+        getDb().delete(TABLE_TAGS, strFilter.toString(), null);
     }
     public synchronized void removeAllTags() {