Add char[] for password to public interface to open database connections

Author: developernotes

src/net/sqlcipher/database/SQLiteDatabase.java

@@ -865,6 +865,10 @@ public Cursor newCursor(SQLiteDatabase db,
      * @throws SQLiteException if the database cannot be opened
      */
     public static SQLiteDatabase openDatabase(String path, String password, CursorFactory factory, int flags, SQLiteDatabaseHook databaseHook) {
+      return openDatabase(path, password.toCharArray(), factory, flags, databaseHook);
+    }
+
+    public static SQLiteDatabase openDatabase(String path, char[] password, CursorFactory factory, int flags, SQLiteDatabaseHook databaseHook) {
         SQLiteDatabase sqliteDatabase = null;
         try {
             // Open the database.
@@ -899,6 +903,10 @@ public static SQLiteDatabase openOrCreateDatabase(String path, String password,
         return openDatabase(path, password, factory, CREATE_IF_NECESSARY, databaseHook);
     }
 
+    public static SQLiteDatabase openOrCreateDatabase(String path, char[] password, CursorFactory factory, SQLiteDatabaseHook databaseHook) {
+      return openDatabase(path, password, factory, CREATE_IF_NECESSARY, databaseHook);
+    }
+
     /**
      * Equivalent to openDatabase(file.getPath(), factory, CREATE_IF_NECESSARY).
      */
@@ -911,11 +919,19 @@ public static SQLiteDatabase openOrCreateDatabase(File file, String password, Cu
      */
 
     public static SQLiteDatabase openOrCreateDatabase(String path, String password, CursorFactory factory) {
-        return openDatabase(path, password, factory, CREATE_IF_NECESSARY, null);
+      return openDatabase(path, password.toCharArray(), factory, CREATE_IF_NECESSARY, null);
+    }
+
+    public static SQLiteDatabase openOrCreateDatabase(String path, char[] password, CursorFactory factory) {
+      return openDatabase(path, password, factory, CREATE_IF_NECESSARY, null);
     }
 
     public static SQLiteDatabase openDatabase(String path, String password, CursorFactory factory, int flags) {
-        return openDatabase(path, password, factory, CREATE_IF_NECESSARY, null);
+      return openDatabase(path, password.toCharArray(), factory, CREATE_IF_NECESSARY, null);
+    }
+
+    public static SQLiteDatabase openDatabase(String path, char[] password, CursorFactory factory, int flags) {
+      return openDatabase(path, password, factory, CREATE_IF_NECESSARY, null);
     }
 
     /**
@@ -931,9 +947,14 @@ public static SQLiteDatabase openDatabase(String path, String password, CursorFa
      */
     public static SQLiteDatabase create(CursorFactory factory, String password) {
         // This is a magic string with special meaning for SQLite.
+      return openDatabase(":memory:", password.toCharArray(), factory, CREATE_IF_NECESSARY);
+    }
+
+    public static SQLiteDatabase create(CursorFactory factory, char[] password) {
         return openDatabase(":memory:", password, factory, CREATE_IF_NECESSARY);
     }
 
+
     /**
      * Close the database.
      */
@@ -1895,7 +1916,7 @@ protected void finalize() {
         }
     }
 
-    public SQLiteDatabase(String path, String password, CursorFactory factory, int flags) {
+    public SQLiteDatabase(String path, char[] password, CursorFactory factory, int flags) {
         this(path, password, factory, flags, null);
     }
 
@@ -1907,7 +1928,7 @@ public SQLiteDatabase(String path, String password, CursorFactory factory, int f
      * @param flags 0 or {@link #NO_LOCALIZED_COLLATORS}.  If the database file already
      *              exists, mFlags will be updated appropriately.
      */
-    public SQLiteDatabase(String path, String password, CursorFactory factory, int flags, SQLiteDatabaseHook databaseHook) {
+    public SQLiteDatabase(String path, char[] password, CursorFactory factory, int flags, SQLiteDatabaseHook databaseHook) {
 
         if (path == null) {
             throw new IllegalArgumentException("path should not be null");
@@ -1924,7 +1945,7 @@ public SQLiteDatabase(String path, String password, CursorFactory factory, int f
             databaseHook.preKey(this);
         }
 
-        native_key(password.toCharArray());
+        native_key(password);
 
         if(databaseHook != null){
             databaseHook.postKey(this);

src/net/sqlcipher/database/SQLiteOpenHelper.java

@@ -94,7 +94,12 @@ public SQLiteOpenHelper(Context context, String name, CursorFactory factory,
      * @throws SQLiteException if the database cannot be opened for writing
      * @return a read/write database object valid until {@link #close} is called
      */
+
     public synchronized SQLiteDatabase getWritableDatabase(String password) {
+      return getWritableDatabase(password.toCharArray());
+    }
+  
+    public synchronized SQLiteDatabase getWritableDatabase(char[] password) {
         if (mDatabase != null && mDatabase.isOpen() && !mDatabase.isReadOnly()) {
             return mDatabase;  // The database is already open for business
         }
@@ -176,6 +181,10 @@ public synchronized SQLiteDatabase getWritableDatabase(String password) {
      *     or {@link #close} is called.
      */
     public synchronized SQLiteDatabase getReadableDatabase(String password) {
+      return getReadableDatabase(password.toCharArray());
+    }
+  
+    public synchronized SQLiteDatabase getReadableDatabase(char[] password) {
         if (mDatabase != null && mDatabase.isOpen()) {
             return mDatabase;  // The database is already open for business
         }