Merge pull request #4422 from nextcloud/feature/4378/addTemporaryMess…

…agesWhileSending Feature/4378/add temporary messages while sending
nextcloud · Jan 10, 2025 · 88bb5d5 · 88bb5d5
2 parents ca9b3c9 + 4f4ac5e
commit 88bb5d5
Show file tree

Hide file tree

Showing 40 changed files with 2,038 additions and 953 deletions.
diff --git a/app/schemas/com.nextcloud.talk.data.source.local.TalkDatabase/13.json b/app/schemas/com.nextcloud.talk.data.source.local.TalkDatabase/13.json
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingTextMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingTextMessageViewHolder.kt
@@ -218,7 +218,6 @@ class IncomingTextMessageViewHolder(itemView: View, payload: Any) :
                     )
 
                     binding.messageQuote.quotedChatMessageView.setOnClickListener {
-                        val chatActivity = commonMessageInterface as ChatActivity
                         chatActivity.jumpToQuotedMessage(parentChatMessage)
                     }
                 } catch (e: Exception) {

diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingTextMessageViewHolder.kt b/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,27 @@ class OutcomingTextMessageViewHolder(itemView: View) :
             binding.messageQuote.quotedChatMessageView.visibility = View.GONE
         }
 
-        setReadStatus(message.readStatus)
+        binding.checkMark.visibility = View.INVISIBLE
+        binding.sendingProgress.visibility = View.GONE
+
+        if (message.sendingFailed) {
+            updateStatus(R.drawable.baseline_error_outline_24, context.resources?.getString(R.string.nc_message_failed))
+        } else if (message.isTemporary) {
+            updateStatus(R.drawable.baseline_schedule_24, context.resources?.getString(R.string.nc_message_sending))
+        } 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))
+        }
+
+        CoroutineScope(Dispatchers.Main).launch {
+            if (message.isTemporary && !networkMonitor.isOnline.first()) {
+                updateStatus(
+                    R.drawable.ic_signal_wifi_off_white_24dp,
+                    context.resources?.getString(R.string.nc_message_offline)
+                )
+            }
+        }
 
         itemView.setTag(R.string.replyable_message_view_tag, message.replyable)
 
@@ -129,27 +155,16 @@ 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 = readStatusContentDescriptionString
+        binding.checkMark.contentDescription = description
     }
 
     private fun longClickOnReaction(chatMessage: ChatMessage) {
@@ -180,7 +195,7 @@ class OutcomingTextMessageViewHolder(itemView: View) :
                         ).first()
                     }
 
-                    parentChatMessage!!.activeUser = message.activeUser
+                    parentChatMessage.activeUser = message.activeUser
                     parentChatMessage.imageUrl?.let {
                         binding.messageQuote.quotedMessageImage.visibility = View.VISIBLE
                         binding.messageQuote.quotedMessageImage.load(it) {
@@ -207,7 +222,6 @@ class OutcomingTextMessageViewHolder(itemView: View) :
                     viewThemeUtils.talk.colorOutgoingQuoteBackground(binding.messageQuote.quoteColoredView)
 
                     binding.messageQuote.quotedChatMessageView.setOnClickListener {
-                        val chatActivity = commonMessageInterface as ChatActivity
                         chatActivity.jumpToQuotedMessage(parentChatMessage)
                     }
                 } catch (e: Exception) {

diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/TalkMessagesListAdapter.java b/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) {

diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/TemporaryMessageInterface.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/TemporaryMessageInterface.kt
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/TemporaryMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/TemporaryMessageViewHolder.kt
diff --git a/app/src/main/java/com/nextcloud/talk/api/NcApi.java b/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(