Updated a structure of the local database.

Author: DenBond7

FlowCrypt/src/main/java/com/flowcrypt/email/database/FlowCryptSQLiteOpenHelper.java

@@ -81,11 +81,25 @@ public void onUpgrade(SQLiteDatabase sqLiteDatabase, int oldVersion, int newVers
     }
 
     private void upgradeDatabaseFrom1To2Version(SQLiteDatabase sqLiteDatabase) {
-        sqLiteDatabase.execSQL(AttachmentDaoSource.ATTACHMENT_TABLE_SQL_CREATE);
-        sqLiteDatabase.execSQL(AttachmentDaoSource.CREATE_INDEX_EMAIL_UID_FOLDER_IN_MESSAGES);
-
-        sqLiteDatabase.execSQL("ALTER TABLE " + MessageDaoSource.TABLE_NAME_MESSAGES +
-                " ADD COLUMN " + MessageDaoSource.COL_IS_MESSAGE_HAS_ATTACHMENTS
-                + " INTEGER DEFAULT 0;");
+        sqLiteDatabase.beginTransaction();
+        try {
+            sqLiteDatabase.execSQL(AttachmentDaoSource.ATTACHMENT_TABLE_SQL_CREATE);
+            sqLiteDatabase.execSQL(AttachmentDaoSource.CREATE_INDEX_EMAIL_UID_FOLDER_IN_MESSAGES);
+
+            sqLiteDatabase.execSQL("ALTER TABLE " + MessageDaoSource.TABLE_NAME_MESSAGES +
+                    " ADD COLUMN " + MessageDaoSource.COL_IS_MESSAGE_HAS_ATTACHMENTS
+                    + " INTEGER DEFAULT 0;");
+
+            sqLiteDatabase.execSQL("ALTER TABLE " + AccountDaoSource.TABLE_NAME_ACCOUNTS +
+                    " ADD COLUMN " + AccountDaoSource.COL_IS_ENABLE
+                    + " INTEGER DEFAULT 1;");
+
+            sqLiteDatabase.execSQL("ALTER TABLE " + AccountDaoSource.TABLE_NAME_ACCOUNTS +
+                    " ADD COLUMN " + AccountDaoSource.COL_IS_ACTIVE
+                    + " INTEGER DEFAULT 0;");
+            sqLiteDatabase.setTransactionSuccessful();
+        } finally {
+            sqLiteDatabase.endTransaction();
+        }
     }
 }

FlowCrypt/src/main/java/com/flowcrypt/email/database/dao/source/AccountDaoSource.java

@@ -36,6 +36,8 @@ public class AccountDaoSource extends BaseDaoSource {
     public static final String COL_GIVEN_NAME = "given_name";
     public static final String COL_FAMILY_NAME = "family_name";
     public static final String COL_PHOTO_URL = "photo_url";
+    public static final String COL_IS_ENABLE = "is_enable";
+    public static final String COL_IS_ACTIVE = "is_active";
 
     public static final String ACCOUNTS_TABLE_SQL_CREATE = "CREATE TABLE IF NOT EXISTS " +
             TABLE_NAME_ACCOUNTS + " (" +
@@ -45,7 +47,9 @@ public class AccountDaoSource extends BaseDaoSource {
             COL_DISPLAY_NAME + " VARCHAR(100) DEFAULT NULL, " +
             COL_GIVEN_NAME + " VARCHAR(100) DEFAULT NULL, " +
             COL_FAMILY_NAME + " VARCHAR(100) DEFAULT NULL, " +
-            COL_PHOTO_URL + " TEXT DEFAULT NULL " + ");";
+            COL_PHOTO_URL + " TEXT DEFAULT NULL, " +
+            COL_IS_ENABLE + " INTEGER DEFAULT 1, " +
+            COL_IS_ACTIVE + " INTEGER DEFAULT 0 " + ");";
 
     public static final String CREATE_INDEX_EMAIL_TYPE_IN_ACCOUNTS =
             "CREATE UNIQUE INDEX IF NOT EXISTS " + COL_EMAIL + "_" + COL_ACCOUNT_TYPE +
@@ -91,6 +95,28 @@ public Uri addRow(Context context, GoogleSignInAccount googleSignInAccount) {
         } else return null;
     }
 
+    /**
+     * Get an active {@link AccountDao} object from the local database.
+     *
+     * @param context Interface to global information about an application environment.
+     * @return The {@link AccountDao};
+     */
+    public AccountDao getActiveAccountInformation(Context context) {
+        Cursor cursor = context.getContentResolver().query(
+                getBaseContentUri(), null, AccountDaoSource.COL_IS_ACTIVE +
+                        " = ?", new String[]{"1"}, null);
+
+        if (cursor != null && cursor.moveToFirst()) {
+            return getCurrentAccountDao(cursor);
+        }
+
+        if (cursor != null) {
+            cursor.close();
+        }
+
+        return null;
+    }
+
     /**
      * Get a {@link AccountDao} object from the local database.
      *
@@ -104,8 +130,8 @@ public AccountDao getAccountInformation(Context context, String email) {
         }
 
         Cursor cursor = context.getContentResolver().query(
-                getBaseContentUri(), null, ContactsDaoSource.COL_EMAIL +
-                        " = ?", new String[]{email}, null);
+                getBaseContentUri(), null, AccountDaoSource.COL_EMAIL + " = ?",
+                new String[]{email}, null);
 
         if (cursor != null && cursor.moveToFirst()) {
             return getCurrentAccountDao(cursor);
@@ -215,6 +241,7 @@ private ContentValues generateContentValues(GoogleSignInAccount googleSignInAcco
         contentValues.put(COL_DISPLAY_NAME, googleSignInAccount.getDisplayName());
         contentValues.put(COL_GIVEN_NAME, googleSignInAccount.getGivenName());
         contentValues.put(COL_FAMILY_NAME, googleSignInAccount.getFamilyName());
+        contentValues.put(COL_IS_ACTIVE, true);
         if (googleSignInAccount.getPhotoUrl() != null) {
             contentValues.put(COL_PHOTO_URL, googleSignInAccount.getPhotoUrl().toString());
         }