minor db revert

@@ -35,7 +35,7 @@ public class WarplyDBHelper extends SQLiteOpenHelper {
     }
     }
 
 
     private static final String DB_NAME = "warply.db";
     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";
     private static final String KEY_CIPHER = "tn#mpOl3v3Dy1pr@W";
 
 
     //------------------------------ Fields -----------------------------//
     //------------------------------ Fields -----------------------------//
@@ -222,15 +222,10 @@ public class WarplyDBHelper extends SQLiteOpenHelper {
             values.put(KEY_CLIENT_ID, clientId);
             values.put(KEY_CLIENT_ID, clientId);
         if (!TextUtils.isEmpty(clientSecret))
         if (!TextUtils.isEmpty(clientSecret))
             values.put(KEY_CLIENT_SECRET, clientSecret);
             values.put(KEY_CLIENT_SECRET, clientSecret);
-        if (isTableNotEmpty(TABLE_CLIENT)) {
-            new Thread(() -> {
+        if (isTableNotEmpty(TABLE_CLIENT))
             update(TABLE_CLIENT, values);
             update(TABLE_CLIENT, values);
-            }).start();
-        } else {
-            new Thread(() -> {
+        else
             insert(TABLE_CLIENT, values);
             insert(TABLE_CLIENT, values);
-            }).start();
-        }
     }
     }
 
 
     public synchronized void saveAuthAccess(String accessToken, String refreshToken) {
     public synchronized void saveAuthAccess(String accessToken, String refreshToken) {
@@ -239,15 +234,10 @@ public class WarplyDBHelper extends SQLiteOpenHelper {
             values.put(KEY_ACCESS_TOKEN, accessToken);
             values.put(KEY_ACCESS_TOKEN, accessToken);
         if (!TextUtils.isEmpty(refreshToken))
         if (!TextUtils.isEmpty(refreshToken))
             values.put(KEY_REFRESH_TOKEN, refreshToken);
             values.put(KEY_REFRESH_TOKEN, refreshToken);
-        if (isTableNotEmpty(TABLE_AUTH)) {
-            new Thread(() -> {
+        if (isTableNotEmpty(TABLE_AUTH))
             update(TABLE_AUTH, values);
             update(TABLE_AUTH, values);
-            }).start();
-        } else {
-            new Thread(() -> {
+        else
             insert(TABLE_AUTH, values);
             insert(TABLE_AUTH, values);
-            }).start();
-        }
     }
     }
 
 
     @Nullable
     @Nullable
@@ -275,15 +265,11 @@ public class WarplyDBHelper extends SQLiteOpenHelper {
     }
     }
 
 
     public synchronized void deleteClient() {
     public synchronized void deleteClient() {
-        new Thread(() -> {
         clearTable(TABLE_CLIENT);
         clearTable(TABLE_CLIENT);
-        }).start();
     }
     }
 
 
     public synchronized void deleteAuth() {
     public synchronized void deleteAuth() {
-        new Thread(() -> {
         clearTable(TABLE_AUTH);
         clearTable(TABLE_AUTH);
-        }).start();
     }
     }
 
 
     //------------------------------ Api requests -----------------------------//
     //------------------------------ Api requests -----------------------------//
@@ -312,56 +298,44 @@ public class WarplyDBHelper extends SQLiteOpenHelper {
     }
     }
 
 
     public synchronized void deleteAllRequests() {
     public synchronized void deleteAllRequests() {
-        new Thread(() -> {
         clearTable(TABLE_REQUESTS);
         clearTable(TABLE_REQUESTS);
-        }).start();
     }
     }
 
 
     public synchronized void deleteAllPushRequests() {
     public synchronized void deleteAllPushRequests() {
-        new Thread(() -> {
         clearTable(TABLE_PUSH_REQUESTS);
         clearTable(TABLE_PUSH_REQUESTS);
-        }).start();
     }
     }
 
 
     public synchronized void deleteAllPushAckRequests() {
     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) {
     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();
         return getRequestsInQueueCount();
     }
     }
 
 
     public synchronized long addPushRequest(String microapp, String entity, boolean force) {
     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();
         return getPushRequestsInQueueCount();
     }
     }
 
 
     public synchronized long addPushAckRequest(String microapp, String entity, boolean force) {
     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();
         return getPushAckRequestsInQueueCount();
     }
     }
 
 
@@ -388,9 +362,7 @@ public class WarplyDBHelper extends SQLiteOpenHelper {
             strFilter.append("=");
             strFilter.append("=");
             strFilter.append(ids[i]);
             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) {
     public synchronized void deletePushRequests(Long... ids) {
@@ -404,9 +376,7 @@ public class WarplyDBHelper extends SQLiteOpenHelper {
             strFilter.append("=");
             strFilter.append("=");
             strFilter.append(ids[i]);
             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) {
     public synchronized void deletePushAckRequests(Long... ids) {
@@ -420,9 +390,7 @@ public class WarplyDBHelper extends SQLiteOpenHelper {
             strFilter.append("=");
             strFilter.append("=");
             strFilter.append(ids[i]);
             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() {
     public synchronized boolean isForceRequestsExist() {
@@ -460,7 +428,6 @@ public class WarplyDBHelper extends SQLiteOpenHelper {
 
 
     //------------------------------ Tags -----------------------------//
     //------------------------------ Tags -----------------------------//
     public synchronized void saveTags(String[] tags) {
     public synchronized void saveTags(String[] tags) {
-        new Thread(() -> {
         if (tags != null && tags.length > 0) {
         if (tags != null && tags.length > 0) {
 
 
             try {
             try {
@@ -481,11 +448,9 @@ public class WarplyDBHelper extends SQLiteOpenHelper {
                 getDb().endTransaction();
                 getDb().endTransaction();
             }
             }
         }
         }
-        }).start();
     }
     }
 
 
     public synchronized void removeTags(String[] tags) {
     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) {
@@ -498,7 +463,6 @@ public class WarplyDBHelper extends SQLiteOpenHelper {
             strFilter.append("'");
             strFilter.append("'");
         }
         }
         getDb().delete(TABLE_TAGS, strFilter.toString(), null);
         getDb().delete(TABLE_TAGS, strFilter.toString(), null);
-        }).start();
     }
     }
 
 
     public synchronized void removeAllTags() {
     public synchronized void removeAllTags() {