[stable-20.1] Feature/4378/add temporary messages while sending

app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingTextMessageViewHolder.kt

@@ -23,6 +23,7 @@ import com.nextcloud.talk.application.NextcloudTalkApplication
 import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.sharedApplication
 import com.nextcloud.talk.chat.ChatActivity
 import com.nextcloud.talk.chat.data.model.ChatMessage
+import com.nextcloud.talk.data.network.NetworkMonitor
 import com.nextcloud.talk.databinding.ItemCustomOutcomingTextMessageBinding
 import com.nextcloud.talk.models.json.chat.ReadStatus
 import com.nextcloud.talk.ui.theme.ViewThemeUtils
@@ -58,8 +59,12 @@ class OutcomingTextMessageViewHolder(itemView: View) :
     @Inject
     lateinit var dateUtils: DateUtils
 
+    @Inject
+    lateinit var networkMonitor: NetworkMonitor
+
     lateinit var commonMessageInterface: CommonMessageInterface
 
+    @Suppress("Detekt.LongMethod")
     override fun onBind(message: ChatMessage) {
         super.onBind(message)
         sharedApplication!!.componentApplication.inject(this)
@@ -68,6 +73,7 @@ class OutcomingTextMessageViewHolder(itemView: View) :
         layoutParams.isWrapBefore = false
         var textSize = context.resources.getDimension(R.dimen.chat_text_size)
         viewThemeUtils.platform.colorTextView(binding.messageTime, ColorRole.ON_SURFACE_VARIANT)
+
         var processedMessageText = messageUtils.enrichChatMessageText(
             binding.messageText.context,
             message,
@@ -114,7 +120,28 @@ class OutcomingTextMessageViewHolder(itemView: View) :
             binding.messageQuote.quotedChatMessageView.visibility = View.GONE
         }
 
-        setReadStatus(message.readStatus)
+        CoroutineScope(Dispatchers.Main).launch {
+            if (message.isTemporary && !networkMonitor.isOnline.first()) {
+                updateStatus(
+                    R.drawable.ic_signal_wifi_off_white_24dp,
+                    "offline"
+                )
+            } else if (message.sendingFailed) {
+                updateStatus(
+                    R.drawable.baseline_report_problem_24,
+                    "failed"
+                )
+                binding.bubble.setOnClickListener {
+                    commonMessageInterface.onOpenMessageActionsDialog(message)
+                }
+            } else if (message.isTemporary) {
+                showSendingSpinner()
+            } else if (message.readStatus == ReadStatus.READ) {
+                updateStatus(R.drawable.ic_check_all, context.resources?.getString(R.string.nc_message_read))
+            } else if (message.readStatus == ReadStatus.SENT) {
+                updateStatus(R.drawable.ic_check, context.resources?.getString(R.string.nc_message_sent))
+            }
+        }
 
         itemView.setTag(R.string.replyable_message_view_tag, message.replyable)
 
@@ -129,27 +156,23 @@ class OutcomingTextMessageViewHolder(itemView: View) :
         )
     }
 
-    private fun setReadStatus(readStatus: Enum<ReadStatus>) {
-        val readStatusDrawableInt = when (readStatus) {
-            ReadStatus.READ -> R.drawable.ic_check_all
-            ReadStatus.SENT -> R.drawable.ic_check
-            else -> null
-        }
-
-        val readStatusContentDescriptionString = when (readStatus) {
-            ReadStatus.READ -> context.resources?.getString(R.string.nc_message_read)
-            ReadStatus.SENT -> context.resources?.getString(R.string.nc_message_sent)
-            else -> null
-        }
-
-        readStatusDrawableInt?.let { drawableInt ->
+    private fun updateStatus(readStatusDrawableInt: Int, description: String?) {
+        binding.sendingProgress.visibility = View.GONE
+        binding.checkMark.visibility = View.VISIBLE
+        readStatusDrawableInt.let { drawableInt ->
             ResourcesCompat.getDrawable(context.resources, drawableInt, null)?.let {
                 binding.checkMark.setImageDrawable(it)
                 viewThemeUtils.talk.themeMessageCheckMark(binding.checkMark)
             }
         }
+        binding.checkMark.contentDescription = description
+    }
+
+    private fun showSendingSpinner() {
+        binding.sendingProgress.visibility = View.VISIBLE
+        binding.checkMark.visibility = View.GONE
 
-        binding.checkMark.contentDescription = readStatusContentDescriptionString
+        viewThemeUtils.material.colorProgressBar(binding.sendingProgress)
     }
 
     private fun longClickOnReaction(chatMessage: ChatMessage) {

app/src/main/java/com/nextcloud/talk/adapters/messages/TalkMessagesListAdapter.java

@@ -68,9 +68,6 @@ public void onBindViewHolder(ViewHolder holder, int position) {
         } else if (holder instanceof SystemMessageViewHolder holderInstance) {
             holderInstance.assignSystemMessageInterface(chatActivity);
 
-        } else if (holder instanceof TemporaryMessageViewHolder holderInstance) {
-            holderInstance.assignTemporaryMessageInterface(chatActivity);
-
         } else if (holder instanceof IncomingDeckCardViewHolder holderInstance) {
             holderInstance.assignCommonMessageInterface(chatActivity);
         } else if (holder instanceof OutcomingDeckCardViewHolder holderInstance) {

app/src/main/java/com/nextcloud/talk/api/NcApi.java

@@ -344,18 +344,14 @@ Observable<Response<ChatOverall>> pullChatMessages(@Header("Authorization") Stri
 
     @FormUrlEncoded
     @POST
-    Observable<GenericOverall> sendChatMessage(@Header("Authorization") String authorization,
+    Observable<ChatOverallSingleMessage> sendChatMessage(@Header("Authorization") String authorization,
                                                @Url String url,
                                                @Field("message") CharSequence message,
                                                @Field("actorDisplayName") String actorDisplayName,
                                                @Field("replyTo") Integer replyTo,
-                                               @Field("silent") Boolean sendWithoutNotification);
-
-    @FormUrlEncoded
-    @PUT
-    Observable<ChatOverallSingleMessage> editChatMessage(@Header("Authorization") String authorization,
-                                                         @Url String url,
-                                                         @Field("message") String message);
+                                               @Field("silent") Boolean sendWithoutNotification,
+                                               @Field("referenceId") String referenceId
+                                               );
 
     @GET
     Observable<Response<ChatShareOverall>> getSharedItems(

app/src/main/java/com/nextcloud/talk/api/NcApiCoroutines.kt

@@ -8,6 +8,7 @@
 package com.nextcloud.talk.api
 
 import com.nextcloud.talk.models.json.autocomplete.AutocompleteOverall
+import com.nextcloud.talk.models.json.chat.ChatOverallSingleMessage
 import com.nextcloud.talk.models.json.conversations.RoomOverall
 import com.nextcloud.talk.models.json.generic.GenericOverall
 import com.nextcloud.talk.models.json.participants.AddParticipantOverall
@@ -29,6 +30,7 @@ import retrofit2.http.Query
 import retrofit2.http.QueryMap
 import retrofit2.http.Url
 
+@Suppress("TooManyFunctions")
 interface NcApiCoroutines {
     @GET
     @JvmSuppressWildcards
@@ -121,6 +123,27 @@ interface NcApiCoroutines {
     @DELETE
     suspend fun unarchiveConversation(@Header("Authorization") authorization: String, @Url url: String): GenericOverall
 
+    @Suppress("LongParameterList")
+    @FormUrlEncoded
+    @POST
+    suspend fun sendChatMessage(
+        @Header("Authorization") authorization: String,
+        @Url url: String,
+        @Field("message") message: String,
+        @Field("actorDisplayName") actorDisplayName: String,
+        @Field("replyTo") replyTo: Int,
+        @Field("silent") sendWithoutNotification: Boolean,
+        @Field("referenceId") referenceId: String
+    ): ChatOverallSingleMessage
+
+    @FormUrlEncoded
+    @PUT
+    suspend fun editChatMessage(
+        @Header("Authorization") authorization: String,
+        @Url url: String,
+        @Field("message") message: String
+    ): ChatOverallSingleMessage
+
     @FormUrlEncoded
     @POST
     suspend fun banActor(