Merge pull request #557 from Kommunicate-io/patch/2.10.2-sdk-2.10.3-ui

Patch 2.10.2 SDK and 2.10.3 UI

app/src/main/assets/applozic-settings.json

@@ -65,6 +65,7 @@
   "restrictedWordMessage": " Please don't use restricted word",
   "restrictedWordRegex": "",
   "hideAttachmentButton": false,
+  "hideChatBarWithBots": false,
   "groupUsersOnlineStatus": false,
   "launchChatFromProfilePicOrName": false,
   "enableShareConversation": false,

kommunicate/build.gradle

@@ -18,7 +18,7 @@ android {
         minSdkVersion 17
         targetSdkVersion 34
         versionCode 1
-        versionName "2.10.1"
+        versionName "2.10.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         buildConfigField "String", "CHAT_SERVER_URL", '"https://chat.kommunicate.io"'
         buildConfigField "String", "API_SERVER_URL", '"https://api.kommunicate.io"'

kommunicate/src/main/java/com/applozic/mobicomkit/Applozic.java

@@ -1,6 +1,6 @@
 package com.applozic.mobicomkit;
 
-import static io.kommunicate.utils.KmConstants.KM_USER_LANGUAGE_CODE;
+import static io.kommunicate.utils.KmConstants.KM_USER_LOCALE;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
@@ -74,7 +74,7 @@ public static void setDefaultLanguage(Context context){
         }
         AlPrefSettings.getInstance(context).setDeviceDefaultLanguageToBot(deviceLanguage);
         Map<String, String> localeMetadata = new HashMap<>();
-        localeMetadata.put(KM_USER_LANGUAGE_CODE,deviceLanguage);
+        localeMetadata.put(KM_USER_LOCALE,deviceLanguage);
         KmSettings.updateChatContext(context,localeMetadata);
     }
 

kommunicate/src/main/java/com/applozic/mobicomkit/api/account/user/User.java

@@ -391,6 +391,15 @@ public enum RoleType {
         public Short getValue() {
             return value;
         }
+
+        public static RoleType fromValue(Short value) {
+            for (RoleType roleType : RoleType.values()) {
+                if (roleType.getValue().equals(value)) {
+                    return roleType;
+                }
+            }
+            return null;
+        }
     }
 
     public enum PushNotificationFormat {

kommunicate/src/main/java/com/applozic/mobicomkit/api/conversation/database/MessageDatabaseService.java

@@ -56,6 +56,7 @@ public class MessageDatabaseService {
     private static final String channelKey_AND= "channelKey = ? AND ";
     private static final String contactNumbers_AND = "contactNumbers = ? AND ";
     private static final String createdAt_AND = "createdAt >= ? AND ";
+    private static final String createdAt_AND_No_null = "createdAt < ? AND ";
     private static final String conversationID_AND = "conversationId = ? AND ";
     private static final String deleted_AND = "deleted = ? AND ";
     private static final String reply_AND = "replyMessage != ? AND ";
@@ -262,7 +263,7 @@ public List<Message> getMessages(Long startTime, Long endTime, Contact contact,
             structuredNameParamsList.add(String.valueOf(startTime));
         }
         if (endTime != null) {
-            structuredNameWhere += createdAt_AND;
+            structuredNameWhere += createdAt_AND_No_null;
             structuredNameParamsList.add(String.valueOf(endTime));
         }
         if (BroadcastService.isContextBasedChatEnabled() && conversationId != null && conversationId != 0) {

kommunicateui/build.gradle

@@ -18,7 +18,7 @@ android {
         minSdkVersion 17
         targetSdkVersion 34
         versionCode 1
-        versionName "2.10.2"
+        versionName "2.10.3"
         consumerProguardFiles 'proguard-rules.txt'
         vectorDrawables.useSupportLibrary = true
     }

kommunicateui/src/main/java/com/applozic/mobicomkit/uiwidgets/AlCustomizationSettings.java

@@ -158,13 +158,13 @@ public class AlCustomizationSettings extends JsonMarker {
     private int minimumCompressionThresholdForImagesInMB = 5;
     private boolean isVideoCompressionEnabled = false;
     private int minimumCompressionThresholdForVideosInMB = 5;
-
+    private boolean hideAttachmentOptionsWithBots = false;
+    private boolean hideChatBarWithBots = false;
 
     public boolean getUseDarkMode() {
         return useDarkMode;
     }
 
-    private boolean hideAttachmentOptionsWithBots = false;
 
     public String getStaticTopMessage() {
         return staticTopMessage;
@@ -832,10 +832,14 @@ public int getMinimumCompressionThresholdForVideosInMB() {
         return minimumCompressionThresholdForVideosInMB;
     }
 
-    public boolean getHideAttachmentOptionsWithBots() {
+    public boolean isHideAttachmentOptionsWithBots() {
         return hideAttachmentOptionsWithBots;
     }
 
+    public boolean isHideChatBarWithBots() {
+        return hideChatBarWithBots;
+    }
+
     @Override
     public String toString() {
         return "AlCustomizationSettings{" +
@@ -901,6 +905,7 @@ public String toString() {
                 ", toolbarSubtitleColor=" + toolbarSubtitleColor +
                 ", useDeviceDefaultLanguage=" + useDeviceDefaultLanguage +
                 ", showTypingIndicatorWhileFetchingResponse=" + showTypingIndicatorWhileFetchingResponse +
+                ", hideChatBarWithBots=" + hideChatBarWithBots +
                 '}';
     }
 }

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

@@ -272,6 +272,7 @@ public abstract class MobiComConversationFragment extends Fragment implements Vi
     protected Spinner sendType;
     protected LinearLayout individualMessageSendLayout, mainEditTextLinearLayout;
     protected LinearLayout extendedSendingOptionLayout, attachmentIconLayout;
+    protected LinearLayout kmMessageLinearLayout;
     protected RelativeLayout attachmentLayout;
     protected ProgressBar mediaUploadProgressBar;
     protected View spinnerLayout;
@@ -600,6 +601,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         messageList = new ArrayList<Message>();
         multimediaPopupGrid = (GridView) list.findViewById(R.id.mobicom_multimedia_options1);
         textViewCharLimitMessage = list.findViewById(R.id.botCharLimitTextView);
+        kmMessageLinearLayout = list.findViewById(R.id.km_message_linear_layout);
         loggedInUserRole = MobiComUserPreference.getInstance(ApplozicService.getContext(getContext())).getUserRoleType();
 
         getActivity().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
@@ -1108,10 +1110,11 @@ public void onFailure(Context context, String error) {
 
         emoticonsBtn.setVisibility(View.GONE);
 
-        boolean hideAttachmentOptionsWithBots = alCustomizationSettings.getHideAttachmentOptionsWithBots();
+        boolean hideAttachmentOptionsWithBots = alCustomizationSettings.isHideAttachmentOptionsWithBots();
         if (hideAttachmentOptionsWithBots) {
             attachmentIconLayout.setVisibility(GONE);
         }
+        toggleHideChatBarWithBots();
 
         if (alCustomizationSettings.getAttachmentOptions() != null && !alCustomizationSettings.getAttachmentOptions().isEmpty()) {
             Map<String, Boolean> attachmentOptions = alCustomizationSettings.getAttachmentOptions();
@@ -2140,6 +2143,7 @@ public void loadConversation(final Contact contact, final Channel channel, final
             } else {
                 userNotAbleToChatLayout.setVisibility(View.GONE);
                 toggleMessageSendLayoutVisibility();
+                toggleHideChatBarWithBots();
                 toggleAttachmentLayoutVisibility();
             }
         }
@@ -4562,12 +4566,26 @@ private void checkForCustomInput() {
     }
 
     private void toggleAttachmentLayoutVisibility() {
-        if (alCustomizationSettings.getHideAttachmentOptionsWithBots() && attachmentIconLayout != null) {
-            Contact assigneeContact = appContactService.getContactById(channel.getConversationAssignee());
-            boolean isBotAssignee = User.RoleType.BOT.getValue().equals(assigneeContact.getRoleType());
+        if (alCustomizationSettings.isHideAttachmentOptionsWithBots() && attachmentIconLayout != null) {
+            attachmentIconLayout.setVisibility(
+                    getCurrentConversationAssignee() == User.RoleType.BOT
+                            ? GONE : VISIBLE
+            );
+        }
+    }
 
-            attachmentIconLayout.setVisibility(isBotAssignee ? GONE : VISIBLE);
+    private void toggleHideChatBarWithBots() {
+        if (!alCustomizationSettings.isHideChatBarWithBots() || kmMessageLinearLayout == null) {
+            return;
         }
+        kmMessageLinearLayout.setVisibility(
+                getCurrentConversationAssignee() == User.RoleType.BOT ? GONE : VISIBLE
+        );
+    }
+
+    private User.RoleType getCurrentConversationAssignee() {
+        Contact assigneeContact = appContactService.getContactById(channel.getConversationAssignee());
+        return User.RoleType.fromValue(assigneeContact.getRoleType());
     }
 
     private void updateUserFromCustomInput(String message) {
@@ -5070,6 +5088,7 @@ public void onFailure(Context context, Exception e, String response) {
             } else {
                 kmFeedbackView.setVisibility(View.GONE);
                 toggleMessageSendLayoutVisibility();
+                toggleHideChatBarWithBots();
                 toggleAttachmentLayoutVisibility();
                 mainDivider.setVisibility(VISIBLE);
             }
@@ -5547,6 +5566,7 @@ public void onFailure(Context context, Exception e, String response) {
         }
 
         toggleMessageSendLayoutVisibility();
+        toggleHideChatBarWithBots();
         toggleAttachmentLayoutVisibility();
     }