Updated shouldAutoplayGif to not have more than 2 return statements.

Removed unused import statements

Signed-off-by: Jens Zalzala <jens@shakingearthdigital.com>

Author: anakin78z

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

@@ -17,7 +17,6 @@ import android.os.Handler
 import android.util.Base64
 import android.util.Log
 import android.view.View
-import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.ProgressBar
 import android.widget.TextView
@@ -50,7 +49,6 @@ import com.nextcloud.talk.utils.message.MessageUtils
 import com.stfalcon.chatkit.messages.MessageHolders.IncomingImageMessageViewHolder
 import coil.load
 import com.nextcloud.talk.utils.ApiUtils
-import com.nextcloud.talk.utils.MimetypeUtils
 import io.reactivex.Single
 import io.reactivex.SingleObserver
 import io.reactivex.disposables.Disposable
@@ -109,7 +107,6 @@ abstract class PreviewMessageViewHolder(itemView: View?, payload: Any?) :
         messageText.visibility = View.VISIBLE
 
         // Check if image is GIF and load animated image
-        val mimetype = message.selectedIndividualHashMap?.get(KEY_MIMETYPE)
         if (message.imageUrl != null && message.shouldAutoplayGif()) {
             image.adjustViewBounds = true
             image.load(message.imageUrl) {

app/src/main/java/com/nextcloud/talk/chat/data/model/ChatMessage.kt

@@ -242,12 +242,15 @@ data class ChatMessage(
      */
     fun shouldAutoplayGif(): Boolean {
         val mimetype = selectedIndividualHashMap?.get("mimetype")
-        if (mimetype != Mimetype.IMAGE_GIF) return false
-        val user = activeUser ?: return false
-        val capabilities = user.capabilities?.spreedCapability ?: return false
-        val maxGifSize = CapabilitiesUtil.getMaxGifSize(capabilities)
-        val fileSize = selectedIndividualHashMap?.get("size")?.toLongOrNull() ?: return true
-        return fileSize in 1..maxGifSize
+        val capabilities = activeUser?.capabilities?.spreedCapability
+        val fileSize = selectedIndividualHashMap?.get("size")?.toLongOrNull()
+
+        return if (mimetype != Mimetype.IMAGE_GIF || activeUser == null || capabilities == null) {
+            false
+        } else {
+            val maxGifSize = CapabilitiesUtil.getMaxGifSize(capabilities)
+            fileSize == null || fileSize in 1..maxGifSize
+        }
     }
 
     @Suppress("Detekt.NestedBlockDepth")

app/src/main/java/com/nextcloud/talk/ui/ComposeChatAdapter.kt

@@ -107,7 +107,6 @@ import com.nextcloud.talk.ui.theme.ViewThemeUtils
 import com.nextcloud.talk.users.UserManager
 import com.nextcloud.talk.utils.ApiUtils
 import com.nextcloud.talk.utils.DateUtils
-import com.nextcloud.talk.utils.Mimetype
 import com.nextcloud.talk.utils.DisplayUtils
 import com.nextcloud.talk.utils.DrawableUtils.getDrawableResourceIdForMimeType
 import com.nextcloud.talk.utils.message.MessageUtils