Allow SQLiteOpenHelper to set WAL mode before getWritableDatabase

Author: developernotes

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

@@ -44,6 +44,7 @@ public abstract class SQLiteOpenHelper {
     private final SQLiteDatabaseHook mHook;
     private final DatabaseErrorHandler mErrorHandler;
     private boolean mEnableWriteAheadLogging;
+    private boolean mDeferSetWriteAheadLoggingEnabled;
 
     private SQLiteDatabase mDatabase = null;
     private boolean mIsInitializing = false;
@@ -152,16 +153,17 @@ public synchronized SQLiteDatabase getWritableDatabase(char[] password) {
             mIsInitializing = true;
             if (mName == null) {
                 db = SQLiteDatabase.create(null, password);
-                
             } else {
                 String path = mContext.getDatabasePath(mName).getPath();
-                
                 File dbPathFile = new File (path);
-                if (!dbPathFile.exists())
+                if (!dbPathFile.exists()) {
                 	dbPathFile.getParentFile().mkdirs();
-
+                }
                 db = SQLiteDatabase.openOrCreateDatabase(path, password, mFactory, mHook, mErrorHandler);
             }
+            if(mDeferSetWriteAheadLoggingEnabled) {
+              mEnableWriteAheadLogging = db.enableWriteAheadLogging();
+            }
             onConfigure(db);
             int version = db.getVersion();
             if (version != mNewVersion) {
@@ -306,8 +308,10 @@ public void setWriteAheadLoggingEnabled(boolean enabled) {
                     } else {
                         mDatabase.disableWriteAheadLogging();
                     }
+                    mEnableWriteAheadLogging = enabled;
+                } else {
+                    mDeferSetWriteAheadLoggingEnabled = enabled;
                 }
-                mEnableWriteAheadLogging = enabled;
             }
         }
     }