Merge pull request #642 from Kommunicate-io/development

Release/2.14.3

Author: KommunicateDeveloper

app/proguard-rules.pro

@@ -23,4 +23,6 @@
 -printconfiguration proguard-merged-config.txt
 -keep class net.sqlcipher.** { *; }
 -keep class javax.crypto.** { *; }
+-keep class net.zetetic.database.sqlcipher.* { *; }
+-keep class net.zetetic.database.sqlcipher.** { *; }
 -keepattributes *Annotation*

gradle.properties

@@ -1,3 +1,3 @@
 android.enableJetifier=true
 android.useAndroidX=true
-org.gradle.jvmargs=-Xmx4096m
+org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=1g

gradle/libs.versions.toml

@@ -1,5 +1,4 @@
 [versions]
-androidDatabaseSqlcipher = "4.5.0"
 androidGradlePlugin = '8.5.2'
 appcompat = "1.7.0"
 browser = "1.8.0"
@@ -34,15 +33,14 @@ retrofit = "2.11.0"
 robolectric = "4.13"
 runner = "1.6.2"
 seleniumJava = "4.1.0"
-sentryAndroid = "6.28.0"
+sentryAndroid = "7.18.0"
 silicompressor = "2.2.4"
 swiperefreshlayout = "1.1.0"
 googleSecret = "2.0.1"
 coreKtxVersion = "1.6.1"
 sentryPluginVersion = "4.11.0"
 
 [libraries]
-android-database-sqlcipher = { module = "net.zetetic:android-database-sqlcipher", version.ref = "androidDatabaseSqlcipher" }
 browser = { module = "androidx.browser:browser", version.ref = "browser" }
 cardview = { module = "androidx.cardview:cardview", version.ref = "cardview" }
 circleimageview = { module = "de.hdodenhof:circleimageview", version.ref = "circleimageview" }

kommunicate/build.gradle

@@ -18,7 +18,7 @@ android {
         compileSdk 34
         targetSdkVersion 35
         versionCode 1
-        versionName "2.14.2"
+        versionName "2.14.3"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         buildConfigField "String", "KOMMUNICATE_VERSION", "\"" + versionName + "\""
         buildConfigField "String", "CHAT_SERVER_URL", '"https://chat.kommunicate.io"'
@@ -52,7 +52,8 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation libs.core.ktx
-    implementation libs.android.database.sqlcipher
+    implementation 'net.zetetic:sqlcipher-android:4.9.0@aar'
+    implementation 'androidx.sqlite:sqlite-framework:2.2.0'
     api libs.org.eclipse.paho.client.mqttv3
     api libs.localbroadcastmanager
     api libs.appcompat

kommunicate/src/main/java/io/kommunicate/commons/commons/core/utils/DBUtils.java

@@ -2,9 +2,10 @@
 
 import android.content.Context;
 import android.database.Cursor;
-import net.sqlcipher.database.SQLiteDatabase;
-import net.sqlcipher.database.SQLiteStatement;
+import net.zetetic.database.sqlcipher.SQLiteDatabase;
+import net.zetetic.database.sqlcipher.SQLiteStatement;
 
+import android.database.sqlite.SQLiteException;
 import android.util.Log;
 
 import io.kommunicate.devkit.api.MobiComKitClientService;
@@ -60,10 +61,13 @@ public static boolean isDatabaseEncrypted(Context context, String dbName) {
         // Attempt to open the database with the given password
         SQLiteDatabase db = null;
         try {
-            db = SQLiteDatabase.openDatabase(dbFile.getPath(), appId, null, SQLiteDatabase.OPEN_READONLY);
+            // Corrected method call with byte array for password
+            db = SQLiteDatabase.openDatabase(dbFile.getPath(), appId.getBytes(), null, SQLiteDatabase.OPEN_READONLY, null, null);
             db.close();
             return true;
-        } catch (net.sqlcipher.database.SQLiteException e) {
+        } catch (SQLiteException e) { // Updated exception package
+            // This exception is thrown if the password is wrong or the DB is not encrypted,
+            // which for this check, means it's not encrypted with the given key.
             return false;
         } finally {
             if (db != null && db.isOpen()) {

kommunicate/src/main/java/io/kommunicate/database/DatabaseMigrationHelper.kt

@@ -4,9 +4,8 @@ import android.content.Context
 import android.database.Cursor
 import io.kommunicate.devkit.api.MobiComKitClientService
 import io.kommunicate.commons.AppContextService
-import net.sqlcipher.database.SQLiteDatabase
-import net.sqlcipher.database.SQLiteException
-import kotlin.Throws
+import net.zetetic.database.sqlcipher.SQLiteDatabase
+import android.database.sqlite.SQLiteException
 
 object DatabaseMigrationHelper {
     private const val TEMP_ENCRYPTED_DB_NAME = "temp_encrypted.db"
@@ -34,7 +33,7 @@ object DatabaseMigrationHelper {
             MobiComKitClientService.getApplicationKey(AppContextService.getContext(context))
 
         // Load SQLCipher libraries
-        SQLiteDatabase.loadLibs(context)
+        System.loadLibrary("sqlcipher")
 
         // File paths for unencrypted and temporary encrypted databases
         val unencryptedDbFile = context.getDatabasePath(databaseName)
@@ -45,18 +44,19 @@ object DatabaseMigrationHelper {
         }
 
         // Open the unencrypted database
-        val unencryptedDb = SQLiteDatabase.openDatabase(
+        val unencryptedDb = android.database.sqlite.SQLiteDatabase.openDatabase(
             unencryptedDbFile.path,
-            "",  // Empty string since it's not encrypted
             null,
-            SQLiteDatabase.OPEN_READWRITE
+            android.database.sqlite.SQLiteDatabase.OPEN_READWRITE
         )
 
+
         // Create the temporary encrypted database
         val encryptedDb = SQLiteDatabase.openOrCreateDatabase(
             encryptedTempDbFile.path,
-            password,  // Password for encryption
-            null
+            password.toByteArray(Charsets.UTF_8), // Convert the password String to a byte array
+            null, // CursorFactory
+            null  // SQLiteDatabaseHook
         )
 
         // Copy data from unencrypted to encrypted database
@@ -81,7 +81,7 @@ object DatabaseMigrationHelper {
 
     // Copy tables and data from one database to another
     @Throws(Exception::class)
-    private fun copyDataBetweenDatabases(sourceDb: SQLiteDatabase, destinationDb: SQLiteDatabase) {
+    private fun copyDataBetweenDatabases(sourceDb: android.database.sqlite.SQLiteDatabase, destinationDb: SQLiteDatabase) {
         val cursor: Cursor =
             sourceDb.rawQuery("SELECT name FROM sqlite_master WHERE type='table'", null)
         if (cursor.moveToFirst()) {
@@ -126,7 +126,7 @@ object DatabaseMigrationHelper {
     }
 
     // Get the CREATE TABLE SQL statement for a specific table
-    private fun getTableCreateSql(db: SQLiteDatabase, tableName: String): String? {
+    private fun getTableCreateSql(db: android.database.sqlite.SQLiteDatabase, tableName: String): String? {
         val cursor: Cursor = db.rawQuery(
             "SELECT sql FROM sqlite_master WHERE type='table' AND name=?",
             arrayOf(tableName)

kommunicate/src/main/java/io/kommunicate/database/KmAutoSuggestionDatabase.java

@@ -3,8 +3,8 @@
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
-import net.sqlcipher.database.SQLiteDatabase;
-import net.sqlcipher.database.SQLiteStatement;
+import net.zetetic.database.sqlcipher.SQLiteDatabase;
+import net.zetetic.database.sqlcipher.SQLiteStatement;
 import android.net.Uri;
 import androidx.loader.content.CursorLoader;
 import androidx.loader.content.Loader;

kommunicate/src/main/java/io/kommunicate/database/KmDatabaseHelper.java

@@ -1,7 +1,7 @@
 package io.kommunicate.database;
 
 import android.content.Context;
-import net.sqlcipher.database.SQLiteDatabase;
+import net.zetetic.database.sqlcipher.SQLiteDatabase;
 import android.text.TextUtils;
 
 import io.kommunicate.devkit.api.MobiComKitClientService;

kommunicate/src/main/java/io/kommunicate/devkit/api/conversation/Message.java

@@ -208,7 +208,7 @@ public void setAttDownloadInProgress(boolean attDownloadInProgress) {
     }
 
     public Boolean isRead() {
-        return read || isTypeOutbox() || getScheduledAt() != null;
+        return (read != null && read) || isTypeOutbox() || getScheduledAt() != null;
     }
 
     public void setRead(Boolean read) {

kommunicate/src/main/java/io/kommunicate/devkit/api/conversation/database/ConversationDatabaseService.java

@@ -3,8 +3,8 @@
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
-import net.sqlcipher.database.SQLiteDatabase;
-import net.sqlcipher.database.SQLiteStatement;
+import net.zetetic.database.sqlcipher.SQLiteDatabase;
+import net.zetetic.database.sqlcipher.SQLiteStatement;
 import android.text.TextUtils;
 
 import io.kommunicate.devkit.database.MobiComDatabaseHelper;