Merge branch 'brodybits-npe-fixes'

Author: developernotes

src/net/sqlcipher/database/SQLiteDatabase.java

@@ -100,7 +100,9 @@ public void changePassword(String password) throws SQLiteException {
         if (!isOpen()) {
             throw new SQLiteException("database not open");
         }
-        native_rekey(password);
+        if (password != null) {
+            native_rekey(password);
+        }
     }
 
     /**
@@ -119,7 +121,9 @@ public void changePassword(char[] password) throws SQLiteException {
         if (!isOpen()) {
             throw new SQLiteException("database not open");
         }
-        native_rekey(String.valueOf(password));
+        if (password != null) {
+            native_rekey(String.valueOf(password));
+        }
     }
 
     private static void loadICUData(Context context, File workingDir) {
@@ -294,6 +298,11 @@ public static synchronized void loadLibs (Context context, File workingDir) {
      */
     public static final int CREATE_IF_NECESSARY = 0x10000000;     // update native code if changing
 
+    /**
+     * SQLite memory database name
+     */
+    public static final String MEMORY = ":memory:";
+
     /**
      * Indicates whether the most-recently started transaction has been marked as successful.
      */
@@ -959,7 +968,7 @@ public Cursor newCursor(SQLiteDatabase db,
      * @throws IllegalArgumentException if the database path is null
      */
     public static SQLiteDatabase openDatabase(String path, String password, CursorFactory factory, int flags) {
-      return openDatabase(path, password.toCharArray(), factory, flags, null);
+      return openDatabase(path, password, factory, flags, null);
     }
 
     /**
@@ -981,7 +990,7 @@ public static SQLiteDatabase openDatabase(String path, String password, CursorFa
      * @throws IllegalArgumentException if the database path is null
      */
     public static SQLiteDatabase openDatabase(String path, char[] password, CursorFactory factory, int flags) {
-      return openDatabase(path, password, factory, flags, null);
+      return openDatabase(path, password, factory, flags, null, null);
     }
 
     /**
@@ -1005,7 +1014,7 @@ public static SQLiteDatabase openDatabase(String path, char[] password, CursorFa
      * @throws IllegalArgumentException if the database path is null
      */
     public static SQLiteDatabase openDatabase(String path, String password, CursorFactory factory, int flags, SQLiteDatabaseHook hook) {
-      return openDatabase(path, password.toCharArray(), factory, flags, hook);
+      return openDatabase(path, password, factory, flags, hook, null);
     }
 
     /**
@@ -1029,7 +1038,7 @@ public static SQLiteDatabase openDatabase(String path, String password, CursorFa
      * @throws IllegalArgumentException if the database path is null
      */
     public static SQLiteDatabase openDatabase(String path, char[] password, CursorFactory factory, int flags, SQLiteDatabaseHook hook) {
-        return openDatabase(path, password, factory, flags, hook, new DefaultDatabaseErrorHandler());
+        return openDatabase(path, password, factory, flags, hook, null);
     }
 
     /**
@@ -1056,7 +1065,7 @@ public static SQLiteDatabase openDatabase(String path, char[] password, CursorFa
      */
     public static SQLiteDatabase openDatabase(String path, String password, CursorFactory factory, int flags,
                                               SQLiteDatabaseHook hook, DatabaseErrorHandler errorHandler) {
-      return openDatabase(path, password.toCharArray(), factory, flags, hook, errorHandler);
+      return openDatabase(path, password == null ? null : password.toCharArray(), factory, flags, hook, errorHandler);
     }
 
     /**
@@ -1084,10 +1093,11 @@ public static SQLiteDatabase openDatabase(String path, String password, CursorFa
     public static SQLiteDatabase openDatabase(String path, char[] password, CursorFactory factory, int flags,
                                               SQLiteDatabaseHook hook, DatabaseErrorHandler errorHandler) {
         SQLiteDatabase sqliteDatabase = null;
+        DatabaseErrorHandler myErrorHandler = (errorHandler != null) ? errorHandler : new DefaultDatabaseErrorHandler();
 
         try {
             // Open the database.
-            sqliteDatabase = new SQLiteDatabase(path, factory, flags, errorHandler);
+            sqliteDatabase = new SQLiteDatabase(path, factory, flags, myErrorHandler);
             sqliteDatabase.openDatabaseInternal(password, hook);
         } catch (SQLiteDatabaseCorruptException e) {
             // Try to recover from this, if possible.
@@ -1097,10 +1107,10 @@ public static SQLiteDatabase openDatabase(String path, char[] password, CursorFa
             // NOTE: if this errorHandler.onCorruption() throws the exception _should_
             // bubble back to the original caller.
             // DefaultDatabaseErrorHandler deletes the corrupt file, EXCEPT for memory database
-            errorHandler.onCorruption(sqliteDatabase);
+            myErrorHandler.onCorruption(sqliteDatabase);
 
             // try *once* again:
-            sqliteDatabase = new SQLiteDatabase(path, factory, flags, errorHandler);
+            sqliteDatabase = new SQLiteDatabase(path, factory, flags, myErrorHandler);
             sqliteDatabase.openDatabaseInternal(password, hook);
         }
 
@@ -1122,7 +1132,7 @@ public static SQLiteDatabase openDatabase(String path, char[] password, CursorFa
      * Equivalent to openDatabase(file.getPath(), password, factory, CREATE_IF_NECESSARY, databaseHook).
      */
     public static SQLiteDatabase openOrCreateDatabase(File file, String password, CursorFactory factory, SQLiteDatabaseHook databaseHook) {
-        return openOrCreateDatabase(file.getPath(), password, factory, databaseHook);
+        return openOrCreateDatabase(file, password, factory, databaseHook, null);
     }
 
     /**
@@ -1137,12 +1147,12 @@ public static SQLiteDatabase openOrCreateDatabase(String path, String password,
      */
     public static SQLiteDatabase openOrCreateDatabase(File file, String password, CursorFactory factory, SQLiteDatabaseHook databaseHook,
                                                       DatabaseErrorHandler errorHandler) {
-        return openDatabase(file.getPath(), password.toCharArray(), factory, CREATE_IF_NECESSARY, databaseHook, errorHandler);
+        return openOrCreateDatabase(file == null ? null : file.getPath(), password, factory, databaseHook, errorHandler);
     }
 
     public static SQLiteDatabase openOrCreateDatabase(String path, String password, CursorFactory factory, SQLiteDatabaseHook databaseHook,
                                                       DatabaseErrorHandler errorHandler) {
-        return openDatabase(path, password.toCharArray(), factory, CREATE_IF_NECESSARY, databaseHook, errorHandler);
+        return openDatabase(path, password == null ? null : password.toCharArray(), factory, CREATE_IF_NECESSARY, databaseHook, errorHandler);
     }
 
     public static SQLiteDatabase openOrCreateDatabase(String path, char[] password, CursorFactory factory, SQLiteDatabaseHook databaseHook) {
@@ -1158,14 +1168,14 @@ public static SQLiteDatabase openOrCreateDatabase(String path, char[] password,
      * Equivalent to openDatabase(file.getPath(), password, factory, CREATE_IF_NECESSARY).
      */
     public static SQLiteDatabase openOrCreateDatabase(File file, String password, CursorFactory factory) {
-        return openOrCreateDatabase(file.getPath(), password, factory, null);
+        return openOrCreateDatabase(file, password, factory, null);
     }
 
     /**
      * Equivalent to openDatabase(path, password, factory, CREATE_IF_NECESSARY).
      */
     public static SQLiteDatabase openOrCreateDatabase(String path, String password, CursorFactory factory) {
-      return openDatabase(path, password.toCharArray(), factory, CREATE_IF_NECESSARY, null);
+      return openDatabase(path, password, factory, CREATE_IF_NECESSARY, null);
     }
 
     /**
@@ -1192,7 +1202,7 @@ public static SQLiteDatabase openOrCreateDatabase(String path, char[] password,
      */
     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);
+      return openDatabase(MEMORY, password == null ? null : password.toCharArray(), factory, CREATE_IF_NECESSARY);
     }
 
     /**
@@ -1211,7 +1221,7 @@ public static SQLiteDatabase create(CursorFactory factory, String password) {
      * @throws SQLiteException if the database cannot be opened 
      */
     public static SQLiteDatabase create(CursorFactory factory, char[] password) {
-        return openDatabase(":memory:", password, factory, CREATE_IF_NECESSARY);
+        return openDatabase(MEMORY, password, factory, CREATE_IF_NECESSARY);
     }
 
 
@@ -2823,7 +2833,7 @@ private static ArrayList<Pair<String, String>> getAttachedDbs(SQLiteDatabase dbO
 
     private native int native_status(int operation, boolean reset);
 
-  private native void native_key(char[] key) throws SQLException;
+    private native void native_key(char[] key) throws SQLException;
 
     private native void native_rekey(String key) throws SQLException;
 }

src/net/sqlcipher/database/SQLiteOpenHelper.java

@@ -126,7 +126,7 @@ public SQLiteOpenHelper(Context context, String name, CursorFactory factory,
      */
 
     public synchronized SQLiteDatabase getWritableDatabase(String password) {
-      return getWritableDatabase(password.toCharArray());
+      return getWritableDatabase(password == null ? null : password.toCharArray());
     }
 
     public synchronized SQLiteDatabase getWritableDatabase(char[] password) {
@@ -211,7 +211,7 @@ public synchronized SQLiteDatabase getWritableDatabase(char[] password) {
      *     or {@link #close} is called.
      */
     public synchronized SQLiteDatabase getReadableDatabase(String password) {
-      return getReadableDatabase(password.toCharArray());
+      return getReadableDatabase(password == null ? null : password.toCharArray());
     }
 
     public synchronized SQLiteDatabase getReadableDatabase(char[] password) {