Merge pull request #642 from Kommunicate-io/development

KommunicateDeveloper · web-flow · commit 4dd55f560f36 · 2025-09-16T16:50:27.000+05:30
Release/2.14.3
diff --git a/app/proguard-rules.pro b/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*
diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,3 @@
 android.enableJetifier=true
 android.useAndroidX=true
-org.gradle.jvmargs=-Xmx4096m
+org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=1g
diff --git a/gradle/libs.versions.toml b/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" }
diff --git a/kommunicate/build.gradle b/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
diff --git a/kommunicate/src/main/java/io/kommunicate/commons/commons/core/utils/DBUtils.java b/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()) {
diff --git a/kommunicate/src/main/java/io/kommunicate/database/DatabaseMigrationHelper.kt b/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)
diff --git a/kommunicate/src/main/java/io/kommunicate/database/KmAutoSuggestionDatabase.java b/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;
diff --git a/kommunicate/src/main/java/io/kommunicate/database/KmDatabaseHelper.java b/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;
diff --git a/kommunicate/src/main/java/io/kommunicate/devkit/api/conversation/Message.java b/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) {
diff --git a/kommunicate/src/main/java/io/kommunicate/devkit/api/conversation/database/ConversationDatabaseService.java b/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;
diff --git a/kommunicate/src/main/java/io/kommunicate/devkit/api/conversation/database/MessageDatabaseService.java b/kommunicate/src/main/java/io/kommunicate/devkit/api/conversation/database/MessageDatabaseService.java
@@ -4,8 +4,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.SettingsSharedPreference;
diff --git a/kommunicate/src/main/java/io/kommunicate/devkit/api/conversation/schedule/ScheduledMessageUtil.java b/kommunicate/src/main/java/io/kommunicate/devkit/api/conversation/schedule/ScheduledMessageUtil.java
@@ -5,7 +5,7 @@
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.Intent;
-import net.sqlcipher.database.SQLiteDatabase;
+import net.zetetic.database.sqlcipher.SQLiteDatabase;
 import android.os.Build;
 
 import io.kommunicate.devkit.api.conversation.Message;
diff --git a/kommunicate/src/main/java/io/kommunicate/devkit/channel/database/ChannelDatabaseService.java b/kommunicate/src/main/java/io/kommunicate/devkit/channel/database/ChannelDatabaseService.java
@@ -3,12 +3,12 @@
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
-import net.sqlcipher.database.SQLiteDatabase;
+import net.zetetic.database.sqlcipher.SQLiteDatabase;
 
 import androidx.loader.content.CursorLoader;
 import androidx.loader.content.Loader;
 
-import net.sqlcipher.database.SQLiteStatement;
+import net.zetetic.database.sqlcipher.SQLiteStatement;
 import android.text.TextUtils;
 
 import io.kommunicate.devkit.api.account.user.MobiComUserPreference;
diff --git a/kommunicate/src/main/java/io/kommunicate/devkit/contact/database/ContactDatabase.java b/kommunicate/src/main/java/io/kommunicate/devkit/contact/database/ContactDatabase.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 androidx.loader.content.CursorLoader;
diff --git a/kommunicate/src/main/java/io/kommunicate/devkit/database/MobiComDatabaseHelper.java b/kommunicate/src/main/java/io/kommunicate/devkit/database/MobiComDatabaseHelper.java
@@ -1,8 +1,8 @@
 package io.kommunicate.devkit.database;
 
 import android.content.Context;
-import net.sqlcipher.database.SQLiteDatabase;
-import net.sqlcipher.database.SQLiteOpenHelper;
+import net.zetetic.database.sqlcipher.SQLiteDatabase;
+import net.zetetic.database.sqlcipher.SQLiteOpenHelper;
 import android.text.TextUtils;
 
 import io.kommunicate.commons.AppSpecificSettings;
@@ -257,8 +257,7 @@ private MobiComDatabaseHelper(Context context) {
     }
 
     public MobiComDatabaseHelper(Context context, String name, SQLiteDatabase.CursorFactory factory, int version) {
-        super(context, name, factory, version);
-        SQLiteDatabase.loadLibs(context);
+        super(context, name, MobiComKitClientService.getApplicationKey(context), factory, version, 0, null, null, false);        System.loadLibrary("sqlcipher");
         AppSpecificSettings appSpecificSettings = AppSpecificSettings.getInstance(context);
         int currentRetryCount = appSpecificSettings.getCurrentDatabaseMigrationRetryCount();
         if (!DBUtils.isDatabaseEncrypted(context, name) && currentRetryCount < MAX_DATABASE_MIGRATION_RETRY_COUNT) {
@@ -284,15 +283,15 @@ public static MobiComDatabaseHelper getInstance(Context context) {
     }
 
     public SQLiteDatabase getReadableDatabase() {
-        String appId = MobiComKitClientService.getApplicationKey(AppContextService.getContext(context));
-        SQLiteDatabase database = super.getReadableDatabase(appId);
+        // The password is now handled by the constructor.
+        SQLiteDatabase database = super.getReadableDatabase();
         database.enableWriteAheadLogging();
         return database;
     }
 
     public SQLiteDatabase getWritableDatabase() {
-        String appId = MobiComKitClientService.getApplicationKey(AppContextService.getContext(context));
-        SQLiteDatabase database = super.getWritableDatabase(appId);
+        // The password is now handled by the constructor.
+        SQLiteDatabase database = super.getWritableDatabase();
         database.enableWriteAheadLogging();
         return database;
     }
diff --git a/kommunicate/src/main/java/io/kommunicate/services/KmChannelService.java b/kommunicate/src/main/java/io/kommunicate/services/KmChannelService.java
@@ -2,7 +2,7 @@
 
 import android.content.Context;
 import android.database.Cursor;
-import net.sqlcipher.database.SQLiteDatabase;
+import net.zetetic.database.sqlcipher.SQLiteDatabase;
 
 import io.kommunicate.devkit.database.MobiComDatabaseHelper;
 import io.kommunicate.commons.AppContextService;
diff --git a/kommunicate/src/main/java/io/kommunicate/utils/SentryUtils.kt b/kommunicate/src/main/java/io/kommunicate/utils/SentryUtils.kt
@@ -4,7 +4,7 @@ import android.content.Context
 import io.kommunicate.devkit.api.account.user.MobiComUserPreference
 import io.kommunicate.commons.data.PrefSettings
 import io.kommunicate.BuildConfig
-import io.sentry.Scope
+import io.sentry.IScope
 import io.sentry.Sentry
 import io.sentry.protocol.User
 
@@ -21,7 +21,7 @@ object SentryUtils {
         }
 
         val appId = PrefSettings.getInstance(context).applicationKey
-        Sentry.configureScope { scope: Scope ->
+        Sentry.configureScope { scope: IScope ->
             // Setup Tags
             scope.setTag(KmUtils.SENTRY_SDK_ENVIRONMENT, BuildConfig.DEBUG.toString())
             scope.setTag(KmUtils.SENTRY_KOMMUNICATE_VERSION, BuildConfig.KOMMUNICATE_VERSION)
diff --git a/kommunicateui/build.gradle b/kommunicateui/build.gradle
@@ -16,7 +16,7 @@ android {
         targetSdkVersion 35
         minSdkVersion 21
         versionCode 1
-        versionName "2.14.2"
+        versionName "2.14.3"
         buildToolsVersion = '34.0.0'
         consumerProguardFiles 'proguard-rules.txt'
         vectorDrawables.useSupportLibrary = true
diff --git a/kommunicateui/src/main/java/io/kommunicate/ui/kommunicate/views/KmToast.java b/kommunicateui/src/main/java/io/kommunicate/ui/kommunicate/views/KmToast.java
@@ -21,14 +21,26 @@
 public class KmToast {
 
     public static Toast makeText(Context context, String text, int duration) {
-        LayoutInflater inflater = ((Activity) context).getLayoutInflater();
-        View layout = inflater.inflate(R.layout.km_recorder_message_layout,
-                (ViewGroup) ((Activity) context).findViewById(R.id.custom_toast_container));
+        if (context == null) {
+            return null;
+        }
+
+        Context appContext = context.getApplicationContext();
+        View layout;
+
+        if (context instanceof Activity) {
+            LayoutInflater inflater = ((Activity) context).getLayoutInflater();
+            layout = inflater.inflate(R.layout.km_recorder_message_layout,
+                    (ViewGroup) ((Activity) context).findViewById(R.id.custom_toast_container));
+        } else {
+            LayoutInflater inflater = LayoutInflater.from(context);
+            layout = inflater.inflate(R.layout.km_recorder_message_layout, null);
+        }
 
-        TextView textView = (TextView) layout.findViewById(R.id.toastText);
+        TextView textView = layout.findViewById(R.id.toastText);
         textView.setText(text);
 
-        Toast toast = new Toast(context.getApplicationContext());
+        Toast toast = new Toast(appContext);
         toast.setGravity(Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM, 0, Utils.dpToPx(89));
         toast.setDuration(duration);
         toast.setView(layout);
@@ -37,7 +49,11 @@ public static Toast makeText(Context context, String text, int duration) {
     }
 
     public static Toast makeText(Context context, View view, int duration) {
-        Toast toast = new Toast(context.getApplicationContext());
+        if (context == null) {
+            return null;
+        }
+        Context appContext = context.getApplicationContext();
+        Toast toast = new Toast(appContext);
         toast.setGravity(Gravity.CENTER_HORIZONTAL, 0, 0);
         toast.setDuration(duration);
         toast.setView(view);
diff --git a/kommunicateui/src/main/java/io/kommunicate/ui/usecase/BusinessHoursDetailUseCase.kt b/kommunicateui/src/main/java/io/kommunicate/ui/usecase/BusinessHoursDetailUseCase.kt
@@ -81,10 +81,13 @@ class BusinessHoursDetailUseCase(
         @JvmStatic
         fun executeWithExecutor(
             context: Context,
-            teamId: String,
+            teamId: String?,
             callback: TaskListener<BusinessSettingsResponse>
-        ): UseCaseExecutor<BusinessHoursDetailUseCase, APIResult<BusinessSettingsResponse>> {
-
+        ): UseCaseExecutor<BusinessHoursDetailUseCase, APIResult<BusinessSettingsResponse>>? {
+            if (teamId == null) {
+                callback.onFailure(IllegalArgumentException("teamId cannot be null"))
+                return null
+            }
             val kmUserDetailUseCase = BusinessHoursDetailUseCase(context, teamId)
             val executor = UseCaseExecutor(
                 kmUserDetailUseCase,
diff --git a/kommunicateui/src/main/java/io/kommunicate/ui/utils/SentryUtils.kt b/kommunicateui/src/main/java/io/kommunicate/ui/utils/SentryUtils.kt
@@ -5,7 +5,7 @@ import io.kommunicate.devkit.api.account.user.MobiComUserPreference
 import io.kommunicate.commons.data.PrefSettings
 import io.kommunicate.ui.BuildConfig
 import io.kommunicate.utils.KmUtils
-import io.sentry.Scope
+import io.sentry.IScope
 import io.sentry.Sentry
 import io.sentry.protocol.User
 
@@ -22,7 +22,7 @@ object SentryUtils {
 //        }
 
         val appId = PrefSettings.getInstance(context).applicationKey
-        Sentry.configureScope { scope: Scope ->
+        Sentry.configureScope { scope: IScope ->
             // Setup Tags
             scope.setTag(KmUtils.SENTRY_SDK_ENVIRONMENT, BuildConfig.DEBUG.toString())
             scope.setTag(KmUtils.SENTRY_KOMMUNICATE_VERSION, io.kommunicate.BuildConfig.KOMMUNICATE_VERSION)

Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ public void setAttDownloadInProgress(boolean attDownloadInProgress) {`
`208`	`208`	`}`
`209`	`209`
`210`	`210`	`public Boolean isRead() {`
`211`		`- return read \|\| isTypeOutbox() \|\| getScheduledAt() != null;`
	`211`	`+ return (read != null && read) \|\| isTypeOutbox() \|\| getScheduledAt() != null;`
`212`	`212`	`}`
`213`	`213`
`214`	`214`	`public void setRead(Boolean read) {`