Merge pull request #633 from Kommunicate-io/release_2.14.2

Incremented version to 2.14.2 and Improved appID handling in New Function

Author: KommunicateDeveloper

kommunicate/build.gradle

@@ -18,7 +18,7 @@ android {
         compileSdk 34
         targetSdkVersion 35
         versionCode 1
-        versionName "2.14.1"
+        versionName "2.14.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         buildConfigField "String", "KOMMUNICATE_VERSION", "\"" + versionName + "\""
         buildConfigField "String", "CHAT_SERVER_URL", '"https://chat.kommunicate.io"'

kommunicate/src/main/java/io/kommunicate/Kommunicate.java

@@ -324,7 +324,7 @@ public static void launchConversationWithUser(
             return;
         }
 
-        initializeKommunicate(context, resolvedAppId);
+        boolean isAppIdSame = initializeKommunicate(context, resolvedAppId);
 
         final KmConversationBuilder conversationBuilder =
                 (kmConversationBuilder != null) ? kmConversationBuilder : new KmConversationBuilder(context);
@@ -352,7 +352,7 @@ public void onFailure(Object error) {
             String inputUserId = (kmUser != null) ? kmUser.getUserId() : null;
 
             boolean isSameUser = inputUserId != null && inputUserId.equals(loggedInUserId);
-            boolean shouldSkipLogin = KMUser.isLoggedIn(context) && (isSameUser || (isVisitorUser && shouldMaintainSession));
+            boolean shouldSkipLogin = KMUser.isLoggedIn(context) && isAppIdSame && (isSameUser || (isVisitorUser && shouldMaintainSession));
 
             if (shouldSkipLogin) {
                 proceedAfterLogin.run();
@@ -428,20 +428,27 @@ private static String resolveAppId(String appID, KMUser kmUser) {
         return null;
     }
 
-    private static void initializeKommunicate(Context context, String applicationID) {
+    private static boolean initializeKommunicate(Context context, String applicationID) {
         try {
             String currentAppKey = KommunicateSettings.getInstance(context).getApplicationKey();
 
+            boolean isAppIdChanged = !TextUtils.isEmpty(currentAppKey)
+                    && !PLACEHOLDER_APP_ID.equals(currentAppKey)
+                    && !applicationID.equals(currentAppKey);
+
             if (TextUtils.isEmpty(currentAppKey) || PLACEHOLDER_APP_ID.equals(currentAppKey)) {
                 PrefSettings.getInstance(context).setApplicationKey(applicationID);
             }
 
             Kommunicate.init(context, applicationID);
+
+            return !isAppIdChanged;
         } catch (Exception e) {
             Utils.printLog(context, TAG, "Failed to initialize Kommunicate: " + e.getMessage());
+            return true; // Don't block flow even if init fails
         }
     }
-    
+
     /**
      * To Check the Login status & launch the Pre Chat Lead Collection Screen
      *

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

@@ -144,7 +144,15 @@ public Message(Parcel in) {
         topicId = in.readString();
         connected = in.readByte() != 0;
         contentType = (short) in.readInt();
-        metadata = in.readHashMap(String.class.getClassLoader());
+        int metadataSize = in.readInt();
+        metadata = new HashMap<>();
+        for (int i = 0; i < metadataSize; i++) {
+            String key = in.readString();
+            String value = in.readString();
+            if (key != null) {
+                metadata.put(key, value);
+            }
+        }
         status = (short) in.readInt();
         hidden = in.readByte() != 0;
         replyMessage = in.readInt();
@@ -896,7 +904,16 @@ public void writeToParcel(Parcel dest, int flags) {
         dest.writeString(topicId);
         dest.writeByte((byte) (connected ? 1 : 0));
         dest.writeInt(contentType);
-        dest.writeMap(metadata);
+//        dest.writeMap(metadata);
+        if (metadata != null) {
+            dest.writeInt(metadata.size());
+            for (Map.Entry<String, String> entry : metadata.entrySet()) {
+                dest.writeString(entry.getKey());
+                dest.writeString(entry.getValue());
+            }
+        } else {
+            dest.writeInt(0);
+        }
         dest.writeInt(status);
         dest.writeByte((byte) (hidden ? 1 : 0));
         dest.writeInt(replyMessage);

kommunicateui/build.gradle

@@ -16,7 +16,7 @@ android {
         targetSdkVersion 35
         minSdkVersion 21
         versionCode 1
-        versionName "2.14.1"
+        versionName "2.14.2"
         buildToolsVersion = '34.0.0'
         consumerProguardFiles 'proguard-rules.txt'
         vectorDrawables.useSupportLibrary = true