Fixed an error when trying to insert Gmail aliases to the database. Upgrade the database version to 6. | Close #158.

Author: DenBond7

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

@@ -31,7 +31,7 @@
 public class FlowCryptSQLiteOpenHelper extends SQLiteOpenHelper {
     public static final String COLUMN_NAME_COUNT = "COUNT(*)";
     public static final String DB_NAME = "flowcrypt.db";
-    public static final int DB_VERSION = 5;
+    public static final int DB_VERSION = 6;
 
     private static final String TAG = FlowCryptSQLiteOpenHelper.class.getSimpleName();
     private static final String DROP_TABLE = "DROP TABLE IF EXISTS ";
@@ -80,21 +80,29 @@ public void onUpgrade(SQLiteDatabase sqLiteDatabase, int oldVersion, int newVers
                 upgradeDatabaseFrom2To3Version(sqLiteDatabase);
                 upgradeDatabaseFrom3To4Version(sqLiteDatabase);
                 upgradeDatabaseFrom4To5Version(sqLiteDatabase);
+                upgradeDatabaseFrom5To6Version(sqLiteDatabase);
                 break;
 
             case 2:
                 upgradeDatabaseFrom2To3Version(sqLiteDatabase);
                 upgradeDatabaseFrom3To4Version(sqLiteDatabase);
                 upgradeDatabaseFrom4To5Version(sqLiteDatabase);
+                upgradeDatabaseFrom5To6Version(sqLiteDatabase);
                 break;
 
             case 3:
                 upgradeDatabaseFrom3To4Version(sqLiteDatabase);
                 upgradeDatabaseFrom4To5Version(sqLiteDatabase);
+                upgradeDatabaseFrom5To6Version(sqLiteDatabase);
                 break;
 
             case 4:
                 upgradeDatabaseFrom4To5Version(sqLiteDatabase);
+                upgradeDatabaseFrom5To6Version(sqLiteDatabase);
+                break;
+
+            case 5:
+                upgradeDatabaseFrom5To6Version(sqLiteDatabase);
                 break;
         }
 
@@ -188,4 +196,15 @@ private void upgradeDatabaseFrom4To5Version(SQLiteDatabase sqLiteDatabase) {
             sqLiteDatabase.endTransaction();
         }
     }
+
+    private void upgradeDatabaseFrom5To6Version(SQLiteDatabase sqLiteDatabase) {
+        sqLiteDatabase.beginTransaction();
+        try {
+            sqLiteDatabase.execSQL("DROP INDEX IF EXISTS email_account_type_in_accounts_aliases");
+            sqLiteDatabase.execSQL(AccountAliasesDaoSource.CREATE_INDEX_EMAIL_TYPE_IN_ACCOUNTS_ALIASES);
+            sqLiteDatabase.setTransactionSuccessful();
+        } finally {
+            sqLiteDatabase.endTransaction();
+        }
+    }
 }

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

@@ -49,9 +49,9 @@ public class AccountAliasesDaoSource extends BaseDaoSource {
             COL_VERIFICATION_STATUS + " TEXT NOT NULL " + ");";
 
     public static final String CREATE_INDEX_EMAIL_TYPE_IN_ACCOUNTS_ALIASES = "CREATE UNIQUE INDEX IF NOT EXISTS "
-            + COL_EMAIL + "_" + COL_ACCOUNT_TYPE + "_in_" + TABLE_NAME_ACCOUNTS_ALIASES + " ON " +
-            TABLE_NAME_ACCOUNTS_ALIASES +
-            " (" + COL_EMAIL + ", " + COL_ACCOUNT_TYPE + ")";
+            + COL_EMAIL + "_" + COL_ACCOUNT_TYPE + "_" + COL_SEND_AS_EMAIL + "_in_" + TABLE_NAME_ACCOUNTS_ALIASES
+            + " ON " + TABLE_NAME_ACCOUNTS_ALIASES + " (" + COL_EMAIL + ", " + COL_ACCOUNT_TYPE + ", " +
+            COL_SEND_AS_EMAIL + ")";
 
     /**
      * Generate the {@link AccountAliasesDao} from the current cursor position;