Merge remote-tracking branch 'origin/0.4.1' into 0.4.1

Author: Tom James Holub

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

@@ -150,11 +150,11 @@ private void upgradeDatabaseFrom3To4Version(SQLiteDatabase sqLiteDatabase) {
         sqLiteDatabase.beginTransaction();
         try {
             sqLiteDatabase.execSQL("ALTER TABLE " + AccountDaoSource.TABLE_NAME_ACCOUNTS +
-                    " ADD COLUMN " + AccountDaoSource.COL_USERNAME + " TEXT NOT NULL DEFAULT 'user';");
+                    " ADD COLUMN " + AccountDaoSource.COL_USERNAME + " TEXT NOT NULL DEFAULT '';");
             sqLiteDatabase.execSQL("ALTER TABLE " + AccountDaoSource.TABLE_NAME_ACCOUNTS +
-                    " ADD COLUMN " + AccountDaoSource.COL_PASSWORD + " TEXT NOT NULL DEFAULT 'password';");
+                    " ADD COLUMN " + AccountDaoSource.COL_PASSWORD + " TEXT NOT NULL DEFAULT '';");
             sqLiteDatabase.execSQL("ALTER TABLE " + AccountDaoSource.TABLE_NAME_ACCOUNTS +
-                    " ADD COLUMN " + AccountDaoSource.COL_IMAP_SERVER + " TEXT NOT NULL DEFAULT 'example.com';");
+                    " ADD COLUMN " + AccountDaoSource.COL_IMAP_SERVER + " TEXT NOT NULL DEFAULT '';");
             sqLiteDatabase.execSQL("ALTER TABLE " + AccountDaoSource.TABLE_NAME_ACCOUNTS +
                     " ADD COLUMN " + AccountDaoSource.COL_IMAP_PORT + " INTEGER DEFAULT 143;");
             sqLiteDatabase.execSQL("ALTER TABLE " + AccountDaoSource.TABLE_NAME_ACCOUNTS +
@@ -164,7 +164,7 @@ private void upgradeDatabaseFrom3To4Version(SQLiteDatabase sqLiteDatabase) {
             sqLiteDatabase.execSQL("ALTER TABLE " + AccountDaoSource.TABLE_NAME_ACCOUNTS +
                     " ADD COLUMN " + AccountDaoSource.COL_IMAP_AUTH_MECHANISMS + " TEXT;");
             sqLiteDatabase.execSQL("ALTER TABLE " + AccountDaoSource.TABLE_NAME_ACCOUNTS +
-                    " ADD COLUMN " + AccountDaoSource.COL_SMTP_SERVER + " TEXT NOT NULL DEFAULT 'example.com';");
+                    " ADD COLUMN " + AccountDaoSource.COL_SMTP_SERVER + " TEXT NOT NULL DEFAULT '';");
             sqLiteDatabase.execSQL("ALTER TABLE " + AccountDaoSource.TABLE_NAME_ACCOUNTS +
                     " ADD COLUMN " + AccountDaoSource.COL_SMTP_PORT + " INTEGER DEFAULT 25;");
             sqLiteDatabase.execSQL("ALTER TABLE " + AccountDaoSource.TABLE_NAME_ACCOUNTS +

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

@@ -162,10 +162,17 @@ public static AuthCredentials getCurrentAuthCredentialsFromCursor(KeyStoreCrypto
             smtpSecurityTypeOption = SecurityType.Option.STARTLS;
         }
 
+        String originalPassword = cursor.getString(cursor.getColumnIndex(COL_PASSWORD));
+
+        //fixed a bug when try to decrypting the template password.
+        // See https://github.com/FlowCrypt/flowcrypt-android/issues/168
+        if (originalPassword.equalsIgnoreCase("password")) {
+            originalPassword = "";
+        }
+
         return new AuthCredentials.Builder().setEmail(cursor.getString(cursor.getColumnIndex(COL_EMAIL)))
                 .setUsername(cursor.getString(cursor.getColumnIndex(COL_USERNAME)))
-                .setPassword(keyStoreCryptoManager.decryptWithRSA(
-                        cursor.getString(cursor.getColumnIndex(COL_PASSWORD))))
+                .setPassword(keyStoreCryptoManager.decryptWithRSA(originalPassword))
                 .setImapServer(cursor.getString(cursor.getColumnIndex(COL_IMAP_SERVER)))
                 .setImapPort(cursor.getInt(cursor.getColumnIndex(COL_IMAP_PORT)))
                 .setImapSecurityTypeOption(imapSecurityTypeOption)