Update SQLCipher to the latest version

Author: prattpratt

build.gradle

@@ -27,7 +27,7 @@ task clean(type: Delete) {
     delete rootProject.buildDir
 }
 ext {
-    compileSdk = 33
-    targetSdk = 33
-    minSdk = 14
-}
+    compileSdk = 34
+    targetSdk = 34
+    minSdk = 21
+}

debug-db-encrypt/build.gradle

@@ -19,8 +19,9 @@ android {
 
 dependencies {
     api project(':debug-db-base')
-    implementation 'net.zetetic:android-database-sqlcipher:3.5.9'
+    implementation 'androidx.sqlite:sqlite:2.4.0'
+    implementation 'net.zetetic:sqlcipher-android:4.6.1'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test:runner:1.5.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-}
+}

debug-db-encrypt/src/main/java/com/amitshekhar/debug/encrypt/sqlite/DebugDBEncryptFactory.java

@@ -4,15 +4,17 @@
 
 import com.amitshekhar.sqlite.DBFactory;
 import com.amitshekhar.sqlite.SQLiteDB;
-
-import net.sqlcipher.database.SQLiteDatabase;
+import net.zetetic.database.sqlcipher.SQLiteDatabase;
 
 public class DebugDBEncryptFactory implements DBFactory {
 
+    static {
+        System.loadLibrary("sqlcipher");
+    }
+
     @Override
     public SQLiteDB create(Context context, String path, String password) {
-        SQLiteDatabase.loadLibs(context);
-        return new DebugEncryptSQLiteDB(SQLiteDatabase.openOrCreateDatabase(path, password, null));
+        return new DebugEncryptSQLiteDB(SQLiteDatabase.openOrCreateDatabase(path, password, null, null));
     }
 
     @Override

debug-db-encrypt/src/main/java/com/amitshekhar/debug/encrypt/sqlite/DebugEncryptSQLiteDB.java

@@ -5,8 +5,7 @@
 import android.database.SQLException;
 
 import com.amitshekhar.sqlite.SQLiteDB;
-
-import net.sqlcipher.database.SQLiteDatabase;
+import net.zetetic.database.sqlcipher.SQLiteDatabase;
 
 /**
  * Created by anandgaurav on 12/02/18.

sample-app-encrypt/build.gradle

@@ -24,8 +24,9 @@ android {
 
 dependencies {
     debugImplementation project(':debug-db-encrypt')
+    implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0"))
     implementation 'androidx.appcompat:appcompat:1.4.2'
-    implementation 'net.zetetic:android-database-sqlcipher:3.5.9'
+    implementation 'net.zetetic:sqlcipher-android:4.6.1'
     implementation "androidx.room:room-runtime:2.5.0"
     annotationProcessor "androidx.room:room-compiler:2.5.0"
     testImplementation 'junit:junit:4.13.2'

sample-app-encrypt/src/main/java/com/sample/encrypt/database/PersonDBHelper.java

@@ -19,13 +19,14 @@
 
 package com.sample.encrypt.database;
 
+import android.annotation.SuppressLint;
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
 
-import net.sqlcipher.DatabaseUtils;
-import net.sqlcipher.database.SQLiteDatabase;
-import net.sqlcipher.database.SQLiteOpenHelper;
+import net.zetetic.database.DatabaseUtils;
+import net.zetetic.database.sqlcipher.SQLiteDatabase;
+import net.zetetic.database.sqlcipher.SQLiteOpenHelper;
 
 import java.util.ArrayList;
 
@@ -39,10 +40,12 @@ public class PersonDBHelper extends SQLiteOpenHelper {
     public static final String PERSON_COLUMN_ADDRESS = "address";
     private static final String DB_PASSWORD = "a_password";
 
-    public PersonDBHelper(Context context) {
+    static {
+        System.loadLibrary("sqlcipher");
+    }
 
-        super(context, DATABASE_NAME, null, 1);
-        SQLiteDatabase.loadLibs(context);
+    public PersonDBHelper(Context context) {
+        super(context, DATABASE_NAME, DB_PASSWORD, null, 1, 0, null, null, false);
     }
 
     @Override
@@ -60,7 +63,7 @@ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
     }
 
     public boolean insertPerson(String firstName, String lastName, String address) {
-        SQLiteDatabase db = this.getWritableDatabase(DB_PASSWORD);
+        SQLiteDatabase db = this.getWritableDatabase();
         ContentValues contentValues = new ContentValues();
         contentValues.put("first_name", firstName);
         contentValues.put("last_name", lastName);
@@ -71,19 +74,19 @@ public boolean insertPerson(String firstName, String lastName, String address) {
     }
 
     public Cursor getData(int id) {
-        SQLiteDatabase db = this.getReadableDatabase(DB_PASSWORD);
+        SQLiteDatabase db = this.getReadableDatabase();
         Cursor res = db.rawQuery("select * from person where id=" + id + "", null);
         return res;
     }
 
     public int numberOfRows() {
-        SQLiteDatabase db = this.getReadableDatabase(DB_PASSWORD);
+        SQLiteDatabase db = this.getReadableDatabase();
         int numRows = (int) DatabaseUtils.queryNumEntries(db, PERSON_TABLE_NAME);
         return numRows;
     }
 
     public boolean updatePerson(Integer id, String firstName, String lastName, String address, float mileage) {
-        SQLiteDatabase db = this.getWritableDatabase(DB_PASSWORD);
+        SQLiteDatabase db = this.getWritableDatabase();
         ContentValues contentValues = new ContentValues();
         contentValues.put("first_name", firstName);
         contentValues.put("last_name", lastName);
@@ -94,16 +97,17 @@ public boolean updatePerson(Integer id, String firstName, String lastName, Strin
     }
 
     public Integer deletePerson(Integer id) {
-        SQLiteDatabase db = this.getWritableDatabase(DB_PASSWORD);
+        SQLiteDatabase db = this.getWritableDatabase();
         return db.delete("person",
                 "id = ? ",
                 new String[]{Integer.toString(id)});
     }
 
+    @SuppressLint("Range")
     public ArrayList<String> getAllPerson() {
         ArrayList<String> arrayList = new ArrayList<>();
 
-        SQLiteDatabase db = this.getReadableDatabase(DB_PASSWORD);
+        SQLiteDatabase db = this.getReadableDatabase();
         Cursor res = db.rawQuery("select * from person", null);
         res.moveToFirst();
 
@@ -119,7 +123,7 @@ public ArrayList<String> getAllPerson() {
     }
 
     public int count() {
-        SQLiteDatabase db = getReadableDatabase(DB_PASSWORD);
+        SQLiteDatabase db = getReadableDatabase();
         Cursor cursor = db.rawQuery("select * from person", null);
         try {
             if (cursor != null && cursor.getCount() > 0) {