support full hooks in addition to simple postKey SQL

Author: commonsguy

android-database-sqlcipher/src/main/java/net/sqlcipher/database/SupportFactory.java

@@ -20,19 +20,35 @@
 
 public class SupportFactory implements SupportSQLiteOpenHelper.Factory {
     private final byte[] passphrase;
-    private final String postKeySql;
+    private final SQLiteDatabaseHook hook;
 
     public SupportFactory(byte[] passphrase) {
-        this(passphrase, null);
+        this(passphrase, (SQLiteDatabaseHook)null);
     }
 
-    public SupportFactory(byte[] passphrase, String postKeySql) {
+    public SupportFactory(byte[] passphrase, final String postKeySql) {
+        this(passphrase, new SQLiteDatabaseHook() {
+            @Override
+            public void preKey(SQLiteDatabase database) {
+                // unused
+            }
+
+            @Override
+            public void postKey(SQLiteDatabase database) {
+                if (postKeySql != null) {
+                    database.rawExecSQL(postKeySql);
+                }
+            }
+        });
+    }
+
+    public SupportFactory(byte[] passphrase, SQLiteDatabaseHook hook) {
         this.passphrase = passphrase;
-        this.postKeySql = postKeySql;
+        this.hook = hook;
     }
 
     @Override
     public SupportSQLiteOpenHelper create(SupportSQLiteOpenHelper.Configuration configuration) {
-        return new SupportHelper(configuration, passphrase, postKeySql);
+        return new SupportHelper(configuration, passphrase, hook);
     }
 }

android-database-sqlcipher/src/main/java/net/sqlcipher/database/SupportHelper.java

@@ -24,24 +24,10 @@ public class SupportHelper implements SupportSQLiteOpenHelper {
     private byte[] passphrase;
 
     SupportHelper(final SupportSQLiteOpenHelper.Configuration configuration,
-                  byte[] passphrase, final String postKeySql) {
+                  byte[] passphrase, final SQLiteDatabaseHook hook) {
         SQLiteDatabase.loadLibs(configuration.context);
         this.passphrase = passphrase;
 
-        SQLiteDatabaseHook hook = new SQLiteDatabaseHook() {
-            @Override
-            public void preKey(SQLiteDatabase database) {
-                // unused
-            }
-
-            @Override
-            public void postKey(SQLiteDatabase database) {
-                if (postKeySql != null) {
-                    database.rawExecSQL(postKeySql);
-                }
-            }
-        };
-
         standardHelper =
             new SQLiteOpenHelper(configuration.context, configuration.name,
                 null, configuration.callback.version, hook) {