Merge pull request #623 from Kommunicate-io/patch/2.13.3

Patch/2.13.3

Author: prateek-kommunicate

gradle/libs.versions.toml

@@ -2,6 +2,7 @@
 androidDatabaseSqlcipher = "4.5.0"
 androidGradlePlugin = '8.5.2'
 appcompat = "1.7.0"
+browser = "1.8.0"
 circleimageview = "2.2.0"
 cardview = "1.0.0"
 constraintlayout = "2.0.4"
@@ -42,6 +43,7 @@ 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" }
 constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayout" }

kommunicate/build.gradle

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

kommunicateui/build.gradle

@@ -16,7 +16,7 @@ android {
         targetSdkVersion 35
         minSdkVersion 21
         versionCode 1
-        versionName "2.13.2"
+        versionName "2.13.3"
         buildToolsVersion = '34.0.0'
         consumerProguardFiles 'proguard-rules.txt'
         vectorDrawables.useSupportLibrary = true
@@ -53,6 +53,7 @@ dependencies {
     api libs.glide
     api libs.cardview
     api libs.material
+    implementation libs.browser
     api libs.swiperefreshlayout
     implementation libs.media3.exoplayer
     implementation libs.media3.ui

kommunicateui/src/main/java/com/applozic/mobicomkit/uiwidgets/conversation/fragment/MobiComConversationFragment.java

@@ -1502,6 +1502,13 @@ public void sendMessage(String message, Map<String, String> messageMetaData, Fil
         MobiComUserPreference userPreferences = MobiComUserPreference.getInstance(getActivity());
         Message messageToSend = new Message();
 
+        // check for conversation closed or not.
+        if (channel.getKmStatus() == Channel.CLOSED_CONVERSATIONS
+                && !alCustomizationSettings.isRestartConversationButtonVisibility()
+        ) {
+            return;
+        }
+
         if (channel != null) {
             messageToSend.setGroupId(channel.getKey());
             if (!TextUtils.isEmpty(channel.getClientGroupId())) {
@@ -4170,7 +4177,6 @@ public void onDestroyView() {
         if (KommunicateAudioManager.getInstance(getContext()) != null) {
             KommunicateAudioManager.getInstance(getContext()).audiostop();
         }
-        KmFormStateHelper.clearInstance();
     }
 
     public ViewGroup.LayoutParams getImageLayoutParam(boolean outBoxType) {

kommunicateui/src/main/java/com/applozic/mobicomkit/uiwidgets/conversation/richmessaging/RichMessageActionProcessor.java

@@ -329,7 +329,7 @@ public void handleKmSubmitButton(final Context context, final Message message, f
         Utils.printLog(context, TAG, "Submitting data : " + GsonUtils.getJsonFromObject(formStateModel != null ? dataMap : submitButtonModel.getFormData(), Map.class));
 
         if (submitButtonModel.getPostBackToKommunicate() != null && submitButtonModel.getPostBackToKommunicate().equalsIgnoreCase("true")) {
-            sendFormDataAsMessage(message, metadata, dataMap, "", "");
+            sendFormDataAsMessage(message, metadata, dataMap, submitButtonModel.getMessage(), submitButtonModel.getAddFormLabelInMessage());
 
             if (richMessageListener != null) {
                 richMessageListener.onAction(context, NOTIFY_ITEM_CHANGE, message, dataMap, submitButtonModel.getReplyMetadata());

kommunicateui/src/main/java/com/applozic/mobicomkit/uiwidgets/conversation/richmessaging/adapters/KmFormItemAdapter.java

@@ -96,8 +96,6 @@ public KmFormItemAdapter(Context context, List<KmFormPayloadModel> payloadList,
         this.formStateModel = KmFormStateHelper.getFormState(messageKey);
         this.alCustomizationSettings = alCustomizationSettings;
 
-        KmFormStateHelper.initFormState();
-
         if (formStateModel == null) {
             formStateModel = new KmFormStateModel();
         }
@@ -404,11 +402,12 @@ public void onGlobalLayout() {
 
                                 formItemViewHolder.formDropdownList.setAdapter(dropdownItemAdapter);
                                 dropdownItemAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-                                formItemViewHolder.formDropdownList.setSelection(filterDropdownList(dropdownList.getOptions()));
                                 formItemViewHolder.formDropdownList.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
                                     @Override
                                     public void onItemSelected(AdapterView<?> parent, View view, int dropdownItemPosition, long id) {
-                                        dropdownFieldArray.put(position, dropdownList.getOptions().get(dropdownItemPosition));
+                                        KmFormPayloadModel.Options options = dropdownList.getOptions().get(dropdownItemPosition);
+                                        options.setSelected(true);
+                                        dropdownFieldArray.put(position, options);
                                         formStateModel.setDropdownFieldArray(dropdownFieldArray);
                                         KmFormStateHelper.addFormState(messageKey, formStateModel);
                                     }
@@ -417,6 +416,7 @@ public void onItemSelected(AdapterView<?> parent, View view, int dropdownItemPos
                                     public void onNothingSelected(AdapterView<?> parent) {
                                     }
                                 });
+                                formItemViewHolder.formDropdownList.setSelection(filterDropdownList(dropdownList.getOptions(), dropdownFieldArray.valueAt(position)));
                             }
                         }
                     }
@@ -444,10 +444,10 @@ private void processCheckBoxSelectedState(boolean isChecked, int index, int posi
     }
 
     //Returns the position of the item to be selected by default
-    private int filterDropdownList(List<KmFormPayloadModel.Options> dropdownList) {
+    private int filterDropdownList(List<KmFormPayloadModel.Options> dropdownList, KmFormPayloadModel.Options dropdownFieldArray) {
         int selectedIndex = 0;
         for (int i = 0; i < dropdownList.size(); i++) {
-            if (dropdownList.get(i).isSelected()) {
+            if (dropdownList.get(i).isSelected() || dropdownList.get(i).getLabel().equals(dropdownFieldArray.getLabel())) {
                 selectedIndex = i;
                 break;
             }

kommunicateui/src/main/java/com/applozic/mobicomkit/uiwidgets/conversation/richmessaging/helpers/KmFormStateHelper.java

@@ -7,6 +7,7 @@
 import com.applozic.mobicommons.json.GsonUtils;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
+import com.applozic.mobicomkit.uiwidgets.utils.RichMessageSharedPreference;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -18,35 +19,12 @@
 
 public class KmFormStateHelper {
 
-    private static Map<String, KmFormStateModel> formStateModelMap;
-
-    public static void initFormState() {
-        if (formStateModelMap == null) {
-            formStateModelMap = new HashMap<>();
-        }
-    }
-
     public static void addFormState(String messageKey, KmFormStateModel formStateModel) {
-        initFormState();
-
-        formStateModelMap.put(messageKey, formStateModel);
+        RichMessageSharedPreference.setFormData(messageKey, formStateModel);
     }
 
     public static KmFormStateModel getFormState(String messageKey) {
-        if (formStateModelMap != null) {
-            return formStateModelMap.get(messageKey);
-        }
-        return null;
-    }
-
-    public static void removeFormState(String messageKey) {
-        if (formStateModelMap != null) {
-            formStateModelMap.remove(messageKey);
-        }
-    }
-
-    public static void clearInstance() {
-        formStateModelMap = null;
+        return RichMessageSharedPreference.getFormData(messageKey);
     }
 
     public static Map<String, Object> getKmFormMap(Message message, KmFormStateModel formStateModel) {

kommunicateui/src/main/java/com/applozic/mobicomkit/uiwidgets/conversation/richmessaging/models/KmFormStateModel.java

@@ -5,7 +5,22 @@
 
 import com.applozic.mobicomkit.uiwidgets.conversation.richmessaging.models.v2.KmFormPayloadModel;
 import com.applozic.mobicommons.json.JsonMarker;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+import com.google.gson.reflect.TypeToken;
 
+import com.applozic.mobicommons.json.GsonUtils;
+
+
+import java.lang.reflect.Type;
 import java.util.HashSet;
 import java.util.Map;
 
@@ -19,7 +34,7 @@ public class KmFormStateModel extends JsonMarker {
     private Map<String, String> hiddenFields;
     private SparseIntArray validationArray;
     private SparseArray<Long> dateFieldArray;
-    private SparseArray<KmFormPayloadModel.Options> dropdownFieldArray;
+    private SparseArray<String> dropdownFieldArray;
 
     public SparseArray<String> getTextFields() {
         return textFields;
@@ -86,10 +101,172 @@ public void setDateFieldArray(SparseArray<Long> dateFieldArray) {
     }
 
     public SparseArray<KmFormPayloadModel.Options> getDropdownFieldArray() {
-        return dropdownFieldArray;
+        if (dropdownFieldArray == null) {
+            return null;
+        }
+        SparseArray<KmFormPayloadModel.Options> result = new SparseArray<>();
+        for (int i=0; i<dropdownFieldArray.size(); i++) {
+            result.put(dropdownFieldArray.keyAt(i), GsonUtils.getObjectFromJson(dropdownFieldArray.get(i), KmFormPayloadModel.Options.class));
+        }
+        return result;
     }
 
     public void setDropdownFieldArray(SparseArray<KmFormPayloadModel.Options> dropdownFieldArray) {
-        this.dropdownFieldArray = dropdownFieldArray;
+        SparseArray<String> result = new SparseArray<>();
+        for (int i=0; i<dropdownFieldArray.size(); i++) {
+            result.put(dropdownFieldArray.keyAt(i), GsonUtils.getJsonFromObject(dropdownFieldArray.get(i), KmFormPayloadModel.Options.class));
+        }
+        this.dropdownFieldArray = result;
+    }
+
+    public static class SparseArrayStringAdapter implements JsonSerializer<SparseArray<String>>, JsonDeserializer<SparseArray<String>> {
+        @Override
+        public JsonElement serialize(SparseArray<String> src, Type typeOfSrc, JsonSerializationContext context) {
+            JsonObject jsonObject = new JsonObject();
+            for (int i = 0; i < src.size(); i++) {
+                int key = src.keyAt(i);
+                String value = src.valueAt(i);
+                jsonObject.addProperty(String.valueOf(key), value);
+            }
+            return jsonObject;
+        }
+
+        @Override
+        public SparseArray<String> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+            SparseArray<String> result = new SparseArray<>();
+            JsonObject jsonObject = json.getAsJsonObject();
+            for (Map.Entry<String, JsonElement> entry : jsonObject.entrySet()) {
+                int key = Integer.parseInt(entry.getKey());
+                String value = entry.getValue().getAsString();
+                result.put(key, value);
+            }
+            return result;
+        }
+    }
+
+    public static class SparseIntArrayAdapter implements JsonSerializer<SparseIntArray>, JsonDeserializer<SparseIntArray> {
+        @Override
+        public JsonElement serialize(SparseIntArray src, Type typeOfSrc, JsonSerializationContext context) {
+            JsonObject jsonObject = new JsonObject();
+            for (int i = 0; i < src.size(); i++) {
+                int key = src.keyAt(i);
+                int value = src.valueAt(i);
+                jsonObject.addProperty(String.valueOf(key), value);
+            }
+            return jsonObject;
+        }
+
+        @Override
+        public SparseIntArray deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+            SparseIntArray result = new SparseIntArray();
+            JsonObject jsonObject = json.getAsJsonObject();
+            for (Map.Entry<String, JsonElement> entry : jsonObject.entrySet()) {
+                int key = Integer.parseInt(entry.getKey());
+                int value = entry.getValue().getAsInt();
+                result.put(key, value);
+            }
+            return result;
+        }
+    }
+
+    public static class SparseArrayHashSetAdapter implements JsonSerializer<SparseArray<HashSet<Integer>>>, JsonDeserializer<SparseArray<HashSet<Integer>>> {
+        @Override
+        public JsonElement serialize(SparseArray<HashSet<Integer>> src, Type typeOfSrc, JsonSerializationContext context) {
+            JsonObject jsonObject = new JsonObject();
+            for (int i = 0; i < src.size(); i++) {
+                int key = src.keyAt(i);
+                HashSet<Integer> value = src.valueAt(i);
+                JsonArray jsonArray = new JsonArray();
+                for (Integer item : value) {
+                    jsonArray.add(item);
+                }
+                jsonObject.add(String.valueOf(key), jsonArray);
+            }
+            return jsonObject;
+        }
+
+        @Override
+        public SparseArray<HashSet<Integer>> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+            SparseArray<HashSet<Integer>> result = new SparseArray<>();
+            JsonObject jsonObject = json.getAsJsonObject();
+            for (Map.Entry<String, JsonElement> entry : jsonObject.entrySet()) {
+                int key = Integer.parseInt(entry.getKey());
+                JsonArray jsonArray = entry.getValue().getAsJsonArray();
+                HashSet<Integer> hashSet = new HashSet<>();
+                for (JsonElement element : jsonArray) {
+                    hashSet.add(element.getAsInt());
+                }
+                result.put(key, hashSet);
+            }
+            return result;
+        }
+    }
+
+    public static class SparseArrayLongAdapter implements JsonSerializer<SparseArray<Long>>, JsonDeserializer<SparseArray<Long>> {
+        @Override
+        public JsonElement serialize(SparseArray<Long> src, Type typeOfSrc, JsonSerializationContext context) {
+            JsonObject jsonObject = new JsonObject();
+            for (int i = 0; i < src.size(); i++) {
+                int key = src.keyAt(i);
+                Long value = src.valueAt(i);
+                jsonObject.addProperty(String.valueOf(key), value);
+            }
+            return jsonObject;
+        }
+
+        @Override
+        public SparseArray<Long> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+            SparseArray<Long> result = new SparseArray<>();
+            JsonObject jsonObject = json.getAsJsonObject();
+            for (Map.Entry<String, JsonElement> entry : jsonObject.entrySet()) {
+                int key = Integer.parseInt(entry.getKey());
+                Long value = entry.getValue().getAsLong();
+                result.put(key, value);
+            }
+            return result;
+        }
+    }
+
+    public static class SparseArrayOptionsAdapter implements JsonSerializer<SparseArray<KmFormPayloadModel.Options>>, JsonDeserializer<SparseArray<KmFormPayloadModel.Options>> {
+        @Override
+        public JsonElement serialize(SparseArray<KmFormPayloadModel.Options> src, Type typeOfSrc, JsonSerializationContext context) {
+            JsonObject jsonObject = new JsonObject();
+            for (int i = 0; i < src.size(); i++) {
+                int key = src.keyAt(i);
+                KmFormPayloadModel.Options value = src.valueAt(i);
+                jsonObject.add(String.valueOf(key), context.serialize(value));
+            }
+            return jsonObject;
+        }
+
+        @Override
+        public SparseArray<KmFormPayloadModel.Options> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+            SparseArray<KmFormPayloadModel.Options> result = new SparseArray<>();
+            JsonObject jsonObject = json.getAsJsonObject();
+            for (Map.Entry<String, JsonElement> entry : jsonObject.entrySet()) {
+                int key = Integer.parseInt(entry.getKey());
+                KmFormPayloadModel.Options value = context.deserialize(entry.getValue(), KmFormPayloadModel.Options.class);
+                result.put(key, value);
+            }
+            return result;
+        }
+    }
+
+    public static Gson getGson() {
+        return new GsonBuilder()
+                .registerTypeAdapter(new TypeToken<SparseArray<String>>() {}.getType(), new SparseArrayStringAdapter())
+                .registerTypeAdapter(new TypeToken<SparseIntArray>() {}.getType(), new SparseIntArrayAdapter())
+                .registerTypeAdapter(new TypeToken<SparseArray<HashSet<Integer>>>() {}.getType(), new SparseArrayHashSetAdapter())
+                .registerTypeAdapter(new TypeToken<SparseArray<Long>>() {}.getType(), new SparseArrayLongAdapter())
+                .registerTypeAdapter(new TypeToken<SparseArray<KmFormPayloadModel.Options>>() {}.getType(), new SparseArrayOptionsAdapter())
+                .create();
+    }
+
+    public String toJson() {
+        return getGson().toJson(this);
+    }
+
+    public static KmFormStateModel fromJson(String json) {
+        return getGson().fromJson(json, KmFormStateModel.class);
     }
-}
+}