switch to a supported constructor for tests

Author: commonsguy

app/src/main/java/net/zetetic/tests/support/AES128CipherTest.java

@@ -2,6 +2,7 @@
 
 import android.database.Cursor;
 import net.sqlcipher.database.SQLiteDatabase;
+import net.sqlcipher.database.SQLiteDatabaseHook;
 import net.sqlcipher.database.SupportFactory;
 import net.zetetic.ZeteticApplication;
 import net.zetetic.tests.TestResult;
@@ -13,7 +14,18 @@ public TestResult run() {
         TestResult result = new TestResult(getName(), false);
 
         byte[] passphrase = SQLiteDatabase.getBytes(ZeteticApplication.DATABASE_PASSWORD.toCharArray());
-        SupportFactory factory = new SupportFactory(passphrase, "PRAGMA cipher = 'aes-128-cbc'");
+        SQLiteDatabaseHook hook = new SQLiteDatabaseHook() {
+            @Override
+            public void preKey(SQLiteDatabase sqLiteDatabase) {
+
+            }
+
+            @Override
+            public void postKey(SQLiteDatabase sqLiteDatabase) {
+                sqLiteDatabase.rawExecSQL("PRAGMA cipher = 'aes-128-cbc'");
+            }
+        };
+        SupportFactory factory = new SupportFactory(passphrase, hook);
         SupportSQLiteOpenHelper.Configuration cfg =
           SupportSQLiteOpenHelper.Configuration.builder(ZeteticApplication.getInstance())
             .name(ZeteticApplication.DATABASE_NAME)

app/src/main/java/net/zetetic/tests/support/MigrateDatabaseFrom1xFormatToCurrentFormat.java

@@ -2,6 +2,7 @@
 
 import android.database.Cursor;
 import net.sqlcipher.database.SQLiteDatabase;
+import net.sqlcipher.database.SQLiteDatabaseHook;
 import net.sqlcipher.database.SupportFactory;
 import net.zetetic.ZeteticApplication;
 import net.zetetic.tests.TestResult;
@@ -14,10 +15,21 @@ public TestResult run() {
         TestResult result = new TestResult(getName(), false);
 
         try {
-            File sourceDatabase = ZeteticApplication.getInstance().getDatabasePath(ZeteticApplication.ONE_X_DATABASE);
+            final File sourceDatabase = ZeteticApplication.getInstance().getDatabasePath(ZeteticApplication.ONE_X_DATABASE);
             byte[] passphrase = SQLiteDatabase.getBytes(ZeteticApplication.DATABASE_PASSWORD.toCharArray());
             ZeteticApplication.getInstance().extractAssetToDatabaseDirectory(ZeteticApplication.ONE_X_DATABASE);
-            SupportFactory factory = new SupportFactory(passphrase, "PRAGMA cipher_migrate;");
+            SQLiteDatabaseHook hook = new SQLiteDatabaseHook() {
+                @Override
+                public void preKey(SQLiteDatabase sqLiteDatabase) {
+
+                }
+
+                @Override
+                public void postKey(SQLiteDatabase sqLiteDatabase) {
+                    sqLiteDatabase.rawExecSQL("PRAGMA cipher_migrate;");
+                }
+            };
+            SupportFactory factory = new SupportFactory(passphrase, hook);
             SupportSQLiteOpenHelper.Configuration cfg =
               SupportSQLiteOpenHelper.Configuration.builder(ZeteticApplication.getInstance())
                 .name(sourceDatabase.getAbsolutePath())

app/src/main/java/net/zetetic/tests/support/MigrationUserVersion.java

@@ -21,7 +21,18 @@ public TestResult run() {
 
             File sourceDatabase = ZeteticApplication.getInstance().getDatabasePath(ZeteticApplication.ONE_X_USER_VERSION_DATABASE);
             byte[] passphrase = SQLiteDatabase.getBytes(ZeteticApplication.DATABASE_PASSWORD.toCharArray());
-            SupportFactory factory = new SupportFactory(passphrase, "PRAGMA cipher_migrate;");
+            SQLiteDatabaseHook hook = new SQLiteDatabaseHook() {
+                @Override
+                public void preKey(SQLiteDatabase sqLiteDatabase) {
+
+                }
+
+                @Override
+                public void postKey(SQLiteDatabase sqLiteDatabase) {
+                    sqLiteDatabase.rawExecSQL("PRAGMA cipher_migrate;");
+                }
+            };
+            SupportFactory factory = new SupportFactory(passphrase, hook);
             SupportSQLiteOpenHelper.Configuration cfg =
               SupportSQLiteOpenHelper.Configuration.builder(ZeteticApplication.getInstance())
                 .name(sourceDatabase.getAbsolutePath())

app/src/main/java/net/zetetic/tests/support/VerifyUTF8EncodingForKeyTest.java

@@ -57,7 +57,18 @@ public void onUpgrade(SupportSQLiteDatabase db, int oldVersion,
             } catch (SQLiteException ex){}
 
             passphrase = SQLiteDatabase.getBytes(password.toCharArray());
-            factory = new SupportFactory(passphrase, "PRAGMA cipher_migrate;");
+            SQLiteDatabaseHook hook = new SQLiteDatabaseHook() {
+                @Override
+                public void preKey(SQLiteDatabase sqLiteDatabase) {
+
+                }
+
+                @Override
+                public void postKey(SQLiteDatabase sqLiteDatabase) {
+                    sqLiteDatabase.rawExecSQL("PRAGMA cipher_migrate;");
+                }
+            };
+            factory = new SupportFactory(passphrase, hook);
             cfg =
               SupportSQLiteOpenHelper.Configuration.builder(ZeteticApplication.getInstance())
                 .name(sourceDatabaseFile.getAbsolutePath())