Add support for Upsert via Room API, remove custom exception classes

Removed the following exception classes for better integration with Room:

net.zetetic.database.SQLException
net.zetetic.database.sqlcipher.SQLiteAbortException
net.zetetic.database.sqlcipher.SQLiteAccessPermException
net.zetetic.database.sqlcipher.SQLiteBindOrColumnIndexOutOfRangeException
net.zetetic.database.sqlcipher.SQLiteBlobTooBigException
net.zetetic.database.sqlcipher.SQLiteCantOpenDatabaseException
net.zetetic.database.sqlcipher.SQLiteConstraintException
net.zetetic.database.sqlcipher.SQLiteDatabaseCorruptException
net.zetetic.database.sqlcipher.SQLiteDatabaseLockedException
net.zetetic.database.sqlcipher.SQLiteDatatypeMismatchException
net.zetetic.database.sqlcipher.SQLiteDiskIOException
net.zetetic.database.sqlcipher.SQLiteDoneException
net.zetetic.database.sqlcipher.SQLiteException
net.zetetic.database.sqlcipher.SQLiteFullException
net.zetetic.database.sqlcipher.SQLiteMisuseException
net.zetetic.database.sqlcipher.SQLiteOutOfMemoryException
net.zetetic.database.sqlcipher.SQLiteReadOnlyDatabaseException
net.zetetic.database.sqlcipher.SQLiteTableLockedException

Author: developernotes

README.md

@@ -19,14 +19,14 @@ Add a local reference to the local library and dependency:
 
 ```
 implementation files('libs/sqlcipher-android-4.5.2-release.aar')
-implementation 'androidx.sqlite:sqlite:2.1.0'
+implementation 'androidx.sqlite:sqlite:2.2.0'
 ```
 
 or source a Community edition build from Maven Central:
 
 ```
 implementation 'net.zetetic:sqlcipher-android:4.5.2@aar'
-implementation 'androidx.sqlite:sqlite:2.1.0'
+implementation 'androidx.sqlite:sqlite:2.2.0'
 ```
 
 ```

sqlcipher/src/androidTest/java/net/zetetic/database/database_cts/DatabaseUtilsTest.java

@@ -20,15 +20,15 @@
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
+import android.database.sqlite.SQLiteDoneException;
+import android.database.sqlite.SQLiteException;
 import android.os.ParcelFileDescriptor;
 import android.test.AndroidTestCase;
 import android.test.MoreAsserts;
 
 import net.zetetic.database.DatabaseUtils;
 import net.zetetic.database.DatabaseUtils.InsertHelper;
 import net.zetetic.database.sqlcipher.SQLiteDatabase;
-import net.zetetic.database.sqlcipher.SQLiteDoneException;
-import net.zetetic.database.sqlcipher.SQLiteException;
 import net.zetetic.database.sqlcipher.SQLiteStatement;
 
 import java.io.ByteArrayOutputStream;

sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/DatabaseStatementTest.java

@@ -17,13 +17,13 @@
 package net.zetetic.database.sqlcipher_cts;
 
 import android.database.Cursor;
+import android.database.sqlite.SQLiteConstraintException;
+import android.database.sqlite.SQLiteDoneException;
 import android.test.AndroidTestCase;
 import android.test.PerformanceTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
 
-import net.zetetic.database.sqlcipher.SQLiteConstraintException;
 import net.zetetic.database.sqlcipher.SQLiteDatabase;
-import net.zetetic.database.sqlcipher.SQLiteDoneException;
 import net.zetetic.database.sqlcipher.SQLiteStatement;
 
 import java.io.File;

sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/RoomUpsertTest.java

@@ -0,0 +1,80 @@
+package net.zetetic.database.sqlcipher_cts;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import android.content.Context;
+
+import androidx.room.Dao;
+import androidx.room.Database;
+import androidx.room.Entity;
+import androidx.room.PrimaryKey;
+import androidx.room.Query;
+import androidx.room.Room;
+import androidx.room.RoomDatabase;
+import androidx.room.Upsert;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import net.zetetic.database.sqlcipher.SupportOpenHelperFactory;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.File;
+import java.nio.charset.StandardCharsets;
+
+@RunWith(AndroidJUnit4.class)
+public class RoomUpsertTest {
+	private UserDatabase database;
+	private UserDao userDao;
+
+	@Before
+	public void before(){
+		Context context = ApplicationProvider.getApplicationContext();
+		File databaseFile = context.getDatabasePath("upsert.db");
+		if(databaseFile.exists()){
+			databaseFile.delete();
+		}
+		System.loadLibrary("sqlcipher");
+		final byte[] passphrase = "user".getBytes(StandardCharsets.UTF_8);
+		SupportOpenHelperFactory factory = new SupportOpenHelperFactory(passphrase);
+		database = Room.databaseBuilder(context, UserDatabase.class, databaseFile.getName())
+			.openHelperFactory(factory).build();
+		userDao = database.userDao();
+	}
+
+	@Test
+	public void shouldAllowUpsertBehavior(){
+		User user = new User();
+		user.name = "Foo Bar";
+		user.age = 41;
+		user.id = userDao.upsert(user);
+		user.age = 42;
+		userDao.upsert(user);
+		User[] searchUser = userDao.findById(user.id);
+		assertThat(searchUser[0].age , is(42));
+	}
+
+	@Entity
+	public static class User {
+		@PrimaryKey(autoGenerate = true) long id;
+		String name;
+		int age;
+	}
+
+	@Dao
+	public static abstract class UserDao {
+		@Upsert
+		abstract long upsert(User user);
+		@Query("SELECT * FROM user WHERE id=:id")
+		abstract User[] findById(long id);
+	}
+
+	@Database(entities = {User.class}, version = 1)
+	public static abstract class UserDatabase extends RoomDatabase {
+		abstract UserDao userDao();
+	}
+
+}

sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLCipherDatabaseTest.java

@@ -8,15 +8,14 @@
 
 import android.content.ContentValues;
 import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabaseCorruptException;
+import android.database.sqlite.SQLiteException;
 
 import net.zetetic.database.sqlcipher.SQLiteCursor;
 import net.zetetic.database.sqlcipher.SQLiteDatabase;
 import net.zetetic.database.sqlcipher.SQLiteDatabaseConfiguration;
-import net.zetetic.database.sqlcipher.SQLiteDatabaseCorruptException;
-import net.zetetic.database.sqlcipher.SQLiteException;
 import net.zetetic.database.sqlcipher.SQLiteStatement;
 
-import org.hamcrest.core.Is;
 import org.junit.Test;
 
 import java.io.File;

sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteAbortExceptionTest.java

@@ -16,7 +16,7 @@
 
 package net.zetetic.database.sqlcipher_cts;
 
-import net.zetetic.database.sqlcipher.SQLiteAbortException;
+import android.database.sqlite.SQLiteAbortException;
 import android.test.AndroidTestCase;
 
 public class SQLiteAbortExceptionTest extends AndroidTestCase {

sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteConstraintExceptionTest.java

@@ -16,7 +16,7 @@
 
 package net.zetetic.database.sqlcipher_cts;
 
-import net.zetetic.database.sqlcipher.SQLiteConstraintException;
+import android.database.sqlite.SQLiteConstraintException;
 import android.test.AndroidTestCase;
 
 public class SQLiteConstraintExceptionTest extends AndroidTestCase {

sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteDatabaseTest.java

@@ -18,11 +18,11 @@
 
 import android.content.ContentValues;
 import android.database.Cursor;
+import android.database.SQLException;
 import android.test.AndroidTestCase;
 import android.test.suitebuilder.annotation.LargeTest;
 
 import net.zetetic.database.DatabaseUtils;
-import net.zetetic.database.SQLException;
 import net.zetetic.database.sqlcipher.SQLiteCursor;
 import net.zetetic.database.sqlcipher.SQLiteCursorDriver;
 import net.zetetic.database.sqlcipher.SQLiteDatabase;

sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteDiskIOExceptionTest.java

@@ -16,7 +16,7 @@
 
 package net.zetetic.database.sqlcipher_cts;
 
-import net.zetetic.database.sqlcipher.SQLiteDiskIOException;
+import android.database.sqlite.SQLiteDiskIOException;
 import android.test.AndroidTestCase;
 
 public class SQLiteDiskIOExceptionTest extends AndroidTestCase {

sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteDoneExceptionTest.java

@@ -16,7 +16,7 @@
 
 package net.zetetic.database.sqlcipher_cts;
 
-import net.zetetic.database.sqlcipher.SQLiteDoneException;
+import android.database.sqlite.SQLiteDoneException;
 import android.test.AndroidTestCase;
 
 public class SQLiteDoneExceptionTest extends AndroidTestCase {