Fixed Willena#28. A new Property for this setting has been added.

Author: Willena

src/main/java/org/sqlite/SQLiteConfig.java

@@ -188,7 +188,7 @@ public void apply(Connection conn) throws SQLException {
         pragmaParams.remove(Pragma.LIMIT_WORKER_THREADS.pragmaName);
 
 
-        //Remove SQLiteMC related PRAGMAS, so that we are not applying twice the configuration
+        //Remove SQLiteMC related PRAGMAS, so that we are not applied twice
         //TODO : Clone the pragmaTable and remove each Pragma when used so that no checking is required ?
         // will make a lighter code ?
         pragmaParams.remove(Pragma.KEY.pragmaName);
@@ -205,6 +205,8 @@ public void apply(Connection conn) throws SQLException {
         pragmaParams.remove(Pragma.KDF_ALGORITHM.pragmaName);
         pragmaParams.remove(Pragma.HMAC_ALGORITHM.pragmaName);
         pragmaParams.remove(Pragma.PLAINTEXT_HEADER_SIZE.pragmaName);
+        pragmaParams.remove(Pragma.MC_USE_SQL_INTERFACE.pragmaName);
+
 
         Statement stat = conn.createStatement();
         try {
@@ -454,7 +456,8 @@ public static enum Pragma {
         HMAC_SALT_MASK("hmac_salt_mask", null),
         KDF_ALGORITHM("kdf_algorithm", null),
         HMAC_ALGORITHM("hmac_algorithm", null),
-        PLAINTEXT_HEADER_SIZE("plaintext_header_size", null);
+        PLAINTEXT_HEADER_SIZE("plaintext_header_size", null),
+        MC_USE_SQL_INTERFACE("mc_use_sql_interface", OnOff);
 
         public final String pragmaName;
         public final String[] choices;

src/main/java/org/sqlite/mc/SQLiteMCConfig.java

@@ -13,8 +13,8 @@ public class SQLiteMCConfig extends SQLiteConfig {
 
     private static final Pragma[] CIPHER_PRAGMA_ORDER = new Pragma[]{
         Pragma.CIPHER,
-        Pragma.HMAC_CHECK,
         Pragma.LEGACY,
+        Pragma.HMAC_CHECK,
         Pragma.LEGACY_PAGE_SIZE,
         Pragma.KDF_ITER,
         Pragma.FAST_KDF_ITER,
@@ -34,8 +34,6 @@ public SQLiteMCConfig(Properties prop) {
         super(prop);
     }
 
-    private boolean useSQLInterface = false;
-
     protected boolean isValid(Integer value, int min, int max) {
         return (value >= min && value <= max);
     }
@@ -110,17 +108,19 @@ protected SQLiteMCConfig setPlaintextHeaderSize(int value) {
     }
 
     public SQLiteMCConfig useSQLInterface(boolean sqlInterface) {
-        this.useSQLInterface = sqlInterface;
+        setPragma(Pragma.MC_USE_SQL_INTERFACE, sqlInterface?"true":"false");
         return this;
     }
 
     public void applyCipherParameters(Connection conn, Statement stat) throws SQLException {
-        applyCipherParametersByNames(CIPHER_PRAGMA_ORDER, conn, stat, useSQLInterface);
+        applyCipherParametersByNames(CIPHER_PRAGMA_ORDER, conn, stat);
     }
 
-    protected void applyCipherParametersByNames(Pragma[] pragmas, Connection conn, Statement statement, boolean useSQLInterface) throws SQLException {
+    protected void applyCipherParametersByNames(Pragma[] pragmas, Connection conn, Statement statement) throws SQLException {
         Properties p = super.toProperties();
 
+        boolean useSQLInterface = Boolean.parseBoolean(p.getProperty(Pragma.MC_USE_SQL_INTERFACE.getPragmaName(), "false" ));
+
         String cipherProperty = p.getProperty(Pragma.CIPHER.getPragmaName(), null);
         if (cipherProperty == null)
             throw new SQLException("Cipher name could not be empty at this stage");