Additional safeguard of both versions of SQLiteDatabase.changePassword() against database not opened

Author: Chris Brody

src/net/sqlcipher/database/SQLiteDatabase.java

@@ -82,12 +82,40 @@ public int status(int operation, boolean reset){
         return native_status(operation, reset);
     }
 
+    /**
+     * Change the password of the open database using sqlite3_rekey().
+     *
+     * @param password new database password
+     *
+     * @throws SQLiteException if there is an issue changing the password internally
+     *                         OR if the database is not open
+     *
+     * FUTURE @todo throw IllegalStateException if the database is not open and
+     *              update the test suite
+     */
     public void changePassword(String password) throws SQLiteException {
-      native_rekey(password);
+        if (!isOpen()) {
+            throw new SQLiteException("database not open");
+        }
+        native_rekey(password);
     }
 
+    /**
+     * Change the password of the open database using sqlite3_rekey().
+     *
+     * @param password new database password (char array)
+     *
+     * @throws SQLiteException if there is an issue changing the password internally
+     *                         OR if the database is not open
+     *
+     * FUTURE @todo throw IllegalStateException if the database is not open and
+     *              update the test suite
+     */
     public void changePassword(char[] password) throws SQLiteException {
-      native_rekey(password);
+        if (!isOpen()) {
+            throw new SQLiteException("database not open");
+        }
+        native_rekey(password);
     }
 
     private static void loadICUData(Context context, File workingDir) {
@@ -2655,7 +2683,7 @@ private static ArrayList<Pair<String, String>> getAttachedDbs(SQLiteDatabase dbO
 
     private native void native_key(char[] key) throws SQLException;
     private native void native_key(String key) throws SQLException;
-  
+
     private native void native_rekey(String key) throws SQLException;
     private native void native_rekey(char[] key) throws SQLException;
 }