Remove several net.sqlcipher.database exceptions, use android.database.sqlite variants

This removes the following net.zetetic exceptions:

- net.sqlcipher.SQLException
- net.sqlcipher.database.SQLiteAbortException
- net.sqlcipher.database.SQLiteConstraintException
- net.sqlcipher.database.SQLiteDatabaseCorruptException
- net.sqlcipher.database.SQLiteDiskIOException
- net.sqlcipher.database.SQLiteDoneException
- net.sqlcipher.database.SQLiteException
- net.sqlcipher.database.SQLiteFullException
- net.sqlcipher.database.SQLiteMisuseException

Most clients will likely need to adjust the following import statements:

-import net.sqlcipher.database.SQLiteException;
+import android.database.sqlite.SQLiteException;

This change normalizes the exception classes used by the library for better
integration with the androidx Room library.

Author: developernotes

android-database-sqlcipher/src/main/cpp/net_sqlcipher_database_SQLiteDatabase.cpp

@@ -645,28 +645,28 @@ namespace sqlcipher {
     const char* exceptionClass;
     switch (errcode) {
     case SQLITE_IOERR:
-      exceptionClass = "net/sqlcipher/database/SQLiteDiskIOException";
+      exceptionClass = "android/database/sqlite/SQLiteDiskIOException";
       break;
     case SQLITE_CORRUPT:
-      exceptionClass = "net/sqlcipher/database/SQLiteDatabaseCorruptException";
+      exceptionClass = "android/database/sqlite/SQLiteDatabaseCorruptException";
       break;
     case SQLITE_CONSTRAINT:
-      exceptionClass = "net/sqlcipher/database/SQLiteConstraintException";
+      exceptionClass = "android/database/sqlite/SQLiteConstraintException";
       break;
     case SQLITE_ABORT:
-      exceptionClass = "net/sqlcipher/database/SQLiteAbortException";
+      exceptionClass = "android/database/sqlite/SQLiteAbortException";
       break;
     case SQLITE_DONE:
-      exceptionClass = "net/sqlcipher/database/SQLiteDoneException";
+      exceptionClass = "android/database/sqlite/SQLiteDoneException";
       break;
     case SQLITE_FULL:
-      exceptionClass = "net/sqlcipher/database/SQLiteFullException";
+      exceptionClass = "android/database/sqlite/SQLiteFullException";
       break;
     case SQLITE_MISUSE:
-      exceptionClass = "net/sqlcipher/database/SQLiteMisuseException";
+      exceptionClass = "android/database/sqlite/SQLiteMisuseException";
       break;
     default:
-      exceptionClass = "net/sqlcipher/database/SQLiteException";
+      exceptionClass = "android/database/sqlite/SQLiteException";
       break;
     }
 

android-database-sqlcipher/src/main/java/net/sqlcipher/DatabaseUtils.java

@@ -16,13 +16,7 @@
 
 package net.sqlcipher;
 
-import net.sqlcipher.database.SQLiteAbortException;
-import net.sqlcipher.database.SQLiteConstraintException;
 import net.sqlcipher.database.SQLiteDatabase;
-import net.sqlcipher.database.SQLiteDatabaseCorruptException;
-import net.sqlcipher.database.SQLiteDiskIOException;
-import net.sqlcipher.database.SQLiteException;
-import net.sqlcipher.database.SQLiteFullException;
 import net.sqlcipher.database.SQLiteProgram;
 import net.sqlcipher.database.SQLiteStatement;
 
@@ -34,6 +28,14 @@
 
 import android.content.ContentValues;
 import android.content.OperationApplicationException;
+import android.database.Cursor;
+import android.database.SQLException;
+import android.database.sqlite.SQLiteAbortException;
+import android.database.sqlite.SQLiteConstraintException;
+import android.database.sqlite.SQLiteDatabaseCorruptException;
+import android.database.sqlite.SQLiteDiskIOException;
+import android.database.sqlite.SQLiteException;
+import android.database.sqlite.SQLiteFullException;
 import android.os.Parcel;
 import android.text.TextUtils;
 import android.util.Config;
@@ -145,7 +147,7 @@ private static final void readExceptionFromParcel(Parcel reply, String msg, int
             case 4:
                 throw new SQLiteAbortException(msg);
             case 5:
-                throw new net.sqlcipher.database.SQLiteConstraintException(msg);
+                throw new SQLiteConstraintException(msg);
             case 6:
                 throw new SQLiteDatabaseCorruptException(msg);
             case 7:

android-database-sqlcipher/src/main/java/net/sqlcipher/DefaultDatabaseErrorHandler.java

@@ -20,8 +20,8 @@
 import java.util.List;
 
 import net.sqlcipher.database.SQLiteDatabase;
-import net.sqlcipher.database.SQLiteException;
 
+import android.database.sqlite.SQLiteException;
 import android.util.Log;
 import android.util.Pair;
 

android-database-sqlcipher/src/main/java/net/sqlcipher/SQLException.java

@@ -19,7 +19,6 @@
 import net.sqlcipher.AbstractWindowedCursor;
 import net.sqlcipher.BuildConfig;
 import net.sqlcipher.CursorWindow;
-import net.sqlcipher.SQLException;
 
 import java.lang.ref.WeakReference;
 import java.util.HashMap;
@@ -29,6 +28,7 @@
 
 import android.database.CharArrayBuffer;
 import android.database.DataSetObserver;
+import android.database.SQLException;
 import android.os.Handler;
 import android.os.Message;
 import android.os.Process;

android-database-sqlcipher/src/main/java/net/sqlcipher/database/SQLiteAbortException.java

@@ -22,7 +22,7 @@
 import net.sqlcipher.DatabaseUtils;
 import net.sqlcipher.DatabaseErrorHandler;
 import net.sqlcipher.DefaultDatabaseErrorHandler;
-import net.sqlcipher.SQLException;
+import net.sqlcipher.database.SQLiteStatement;
 import net.sqlcipher.database.SQLiteDebug.DbStats;
 import net.sqlcipher.database.SQLiteDatabaseHook;
 import net.sqlcipher.database.SQLiteQueryStats;
@@ -53,6 +53,9 @@
 import android.content.ContentValues;
 
 import android.content.Context;
+import android.database.SQLException;
+import android.database.sqlite.SQLiteDatabaseCorruptException;
+import android.database.sqlite.SQLiteException;
 
 import android.os.CancellationSignal;
 import android.os.Debug;