don't treat SQLITE_NOTADB error as a corruption because it can occur with mismatched keys

Author: sjlombardo

sqlcipher/src/main/jni/sqlcipher/android_database_SQLiteCommon.cpp

@@ -68,9 +68,14 @@ void throw_sqlite3_exception(JNIEnv* env, int errcode,
             exceptionClass = "android/database/sqlite/SQLiteDiskIOException";
             break;
         case SQLITE_CORRUPT:
-        case SQLITE_NOTADB: // treat "unsupported file format" error as corruption also
             exceptionClass = "android/database/sqlite/SQLiteDatabaseCorruptException";
             break;
+        case SQLITE_NOTADB:
+            /* Upstream treats treat "unsupported file format" error as corruption (SQLiteDatabaseCorruptException).
+               However, SQLITE_NOTADB can occur with mismatched keys, which is not a corruption case, so SQLCipher
+               treats this as a general exception */
+            exceptionClass = "android/database/sqlite/SQLiteException";
+            break;
         case SQLITE_CONSTRAINT:
             exceptionClass = "android/database/sqlite/SQLiteConstraintException";
             break;