Adjustment from merge of upstream changes from AndroidBindings

Author: developernotes

sqlcipher/src/main/java/net/zetetic/database/sqlcipher/SQLiteOpenHelper.java

@@ -324,19 +324,18 @@ private SQLiteDatabase getDatabaseLocked(boolean writable) {
             } else if (mName == null) {
                 db = SQLiteDatabase.create(null);
             } else {
-                String path = mName;
-                if (!path.startsWith("file:")) {
-                  path = mContext.getDatabasePath(path).getPath();
-                }
                 try {
-                    final File filePath = mContext.getDatabasePath(mName);
-                    final String path = filePath.getPath();
+                    String path = mName;
+                    if (!path.startsWith("file:")) {
+                        path = mContext.getDatabasePath(path).getPath();
+                    }
                     /*
                     Modified by Zetetic, newer Android OS versions will create the
                     databases directory upon installation of the APK, whereas older
                     versions, such as some devices running API 21 the databases directory
                     does not exist.
                      */
+                    File filePath = new File(path);
                     final File databasesDirectory = new File(filePath.getParent());
                     if(!databasesDirectory.exists()){
                         databasesDirectory.mkdirs();