Merge pull request #523 from Kommunicate-io/CM-2110

[CM-2110] Taxbuddy Assignment Message Issue

Author: AbhijeetRanjan308

kommunicate/src/main/java/com/applozic/mobicomkit/api/conversation/Message.java

@@ -751,13 +751,7 @@ public void setGroupStatus(Short groupStatus) {
 
     public boolean isActionMessage() {
         boolean isAgent = MobiComUserPreference.getInstance(getAppContext()).getUserRoleType().equals(User.RoleType.AGENT.getValue());
-        return getMetadata() != null && ((isAgent && getMetadata().containsKey(BOT_ASSIGN)) || getMetadata().containsKey(KM_ASSIGN_TO) || getMetadata().containsKey(KM_ASSIGN_TEAM) || getMetadata().containsKey(BOT_ASSIGN)|| getMetadata().containsKey(CONVERSATION_STATUS) || getMetadata().containsKey(AL_DELETE_MESSAGE_FOR_ALL_KEY));
-    }
-
-    // TODO: This same as above. But have used for Rich Message HidepostCTA. Because no role needed for RMs.
-    public boolean isActionMessageForHidePostCTA() {
-        return getMetadata() != null && getMetadata().containsKey(BOT_ASSIGN) || getMetadata().containsKey(KM_ASSIGN_TO) || getMetadata().containsKey(KM_ASSIGN_TEAM) || getMetadata().containsKey(BOT_ASSIGN)|| getMetadata().containsKey(CONVERSATION_STATUS) || getMetadata().containsKey(AL_DELETE_MESSAGE_FOR_ALL_KEY);
-
+        return getMetadata() != null && ((isAgent && getMetadata().containsKey(BOT_ASSIGN)) || getMetadata().containsKey(KM_ASSIGN_TO) || getMetadata().containsKey(KM_ASSIGN_TEAM) || getMetadata().containsKey(CONVERSATION_STATUS) || getMetadata().containsKey(AL_DELETE_MESSAGE_FOR_ALL_KEY));
     }
 
     public boolean isFeedbackMessage() {

kommunicateui/src/main/java/com/applozic/mobicomkit/uiwidgets/conversation/adapter/DetailedConversationAdapter.java

@@ -1313,13 +1313,13 @@ protected Pair<Integer, Integer> getReceivedMessageBgColors(Contact contact, Mes
 
     private boolean isMessageProcessed(Message message) {
         if (themeHelper.isHidePostCTA() || themeHelper.isDisableFormPostSubmit()) {
-            return lastSentMessage != null && lastSentMessage.getCreatedAtTime() > message.getCreatedAtTime() && !lastSentMessage.isActionMessageForHidePostCTA();
+            return lastSentMessage != null && lastSentMessage.getCreatedAtTime() > message.getCreatedAtTime() && !lastSentMessage.isActionMessage();
         }
         return false;
     }
 
     public void updateLastSentMessage(Message message) {
-        if ((themeHelper.isHidePostCTA() || themeHelper.isDisableFormPostSubmit()) && message.isTypeOutbox()) {
+        if ((themeHelper.isHidePostCTA() || themeHelper.isDisableFormPostSubmit()) && message.isTypeOutbox() && message.getContentType() != 10) {
             lastSentMessage = message;
         }
     }

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

@@ -4335,7 +4335,7 @@ private void setupConversationScreen() {
 
                 for (int i = messageList.size() - 1; i >= 0; i--) {
                     Message message = messageList.get(i);
-                    if (lastSentMessage == null && message.isTypeOutbox()) {
+                    if (lastSentMessage == null && message.isTypeOutbox() && message.getContentType() != 10) {
                         lastSentMessage = message;
                     }
                     if (!message.isRead() && !message.isTempDateType() && !message.isCustom()) {