Merge pull request #909 from RocketChat/guggy-gifs

Show Guggy GIFs attachments

app/src/main/java/chat/rocket/android/chatroom/adapter/ImageAttachmentViewHolder.kt

@@ -2,6 +2,8 @@ package chat.rocket.android.chatroom.adapter
 
 import android.view.View
 import chat.rocket.android.chatroom.viewmodel.ImageAttachmentViewModel
+import com.facebook.drawee.backends.pipeline.Fresco
+import com.facebook.drawee.interfaces.DraweeController
 import chat.rocket.android.widget.emoji.EmojiReactionListener
 import com.stfalcon.frescoimageviewer.ImageViewer
 import kotlinx.android.synthetic.main.message_attachment.view.*
@@ -20,12 +22,21 @@ class ImageAttachmentViewHolder(itemView: View,
 
     override fun bindViews(data: ImageAttachmentViewModel) {
         with(itemView) {
-            image_attachment.setImageURI(data.attachmentUrl)
+            val controller = Fresco.newDraweeControllerBuilder().apply {
+                setUri(data.attachmentUrl)
+                autoPlayAnimations = true
+                oldController = image_attachment.controller
+            }.build()
+            image_attachment.controller = controller
             file_name.text = data.attachmentTitle
             image_attachment.setOnClickListener { view ->
                 // TODO - implement a proper image viewer with a proper Transition
+                val builder = ImageViewer.createPipelineDraweeControllerBuilder()
+                        .setAutoPlayAnimations(true)
                 ImageViewer.Builder(view.context, listOf(data.attachmentUrl))
                         .setStartPosition(0)
+                        .hideStatusBar(false)
+                        .setCustomDraweeControllerBuilder(builder)
                         .show()
             }
         }

app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt

@@ -200,25 +200,27 @@ class ChatRoomPresenter @Inject constructor(private val view: ChatRoomView,
         launch(parent = strategy.jobs) {
             if (chatRoomId != null && chatRoomType != null) {
                 val roomType = roomTypeOf(chatRoomType!!)
-                val lastMessage = messagesRepository.getByRoomId(chatRoomId!!).sortedByDescending { it.timestamp }.first()
-                val instant = Instant.ofEpochMilli(lastMessage.timestamp)
-                val messages = client.history(chatRoomId!!, roomType, count = 50,
-                        oldest = instant.toString())
-                Timber.d("History: $messages")
-
-                if (messages.result.isNotEmpty()) {
-                    val models = mapper.map(messages.result)
-                    messagesRepository.saveAll(messages.result)
-
-                    launchUI(strategy) {
-                        view.showNewMessage(models)
-                    }
-
-                    if (messages.result.size == 50) {
-                        // we loade at least count messages, try one more to fetch more messages
-                        loadMissingMessages()
-                    }
-                }
+                messagesRepository.getByRoomId(chatRoomId!!)
+                        .sortedByDescending { it.timestamp }.firstOrNull()?.let { lastMessage ->
+                            val instant = Instant.ofEpochMilli(lastMessage.timestamp)
+                            val messages = client.history(chatRoomId!!, roomType, count = 50,
+                                    oldest = instant.toString())
+                            Timber.d("History: $messages")
+
+                            if (messages.result.isNotEmpty()) {
+                                val models = mapper.map(messages.result)
+                                messagesRepository.saveAll(messages.result)
+
+                                launchUI(strategy) {
+                                    view.showNewMessage(models)
+                                }
+
+                                if (messages.result.size == 50) {
+                                    // we loade at least count messages, try one more to fetch more messages
+                                    loadMissingMessages()
+                                }
+                            }
+                        }
             }
         }
     }

app/src/main/java/chat/rocket/android/chatroom/viewmodel/ViewModelMapper.kt

@@ -96,31 +96,53 @@ class ViewModelMapper @Inject constructor(private val context: Context,
     }
 
     private fun mapFileAttachment(message: Message, attachment: FileAttachment): BaseViewModel<*>? {
-        val attachmentUrl = attachmentUrl("$baseUrl${attachment.url}")
-        val attachmentTitle = attachment.title
-        val id = "${message.id}_${attachment.titleLink}".hashCode().toLong()
+        val attachmentUrl = attachmentUrl(attachment)
+        val attachmentTitle = attachmentTitle(attachment)
+        val id = attachmentId(message, attachment)
         return when (attachment) {
             is ImageAttachment -> ImageAttachmentViewModel(message, attachment, message.id,
-                    attachmentUrl, attachmentTitle ?: "", id, getReactions(message))
+                    attachmentUrl, attachmentTitle, id, getReactions(message))
             is VideoAttachment -> VideoAttachmentViewModel(message, attachment, message.id,
-                    attachmentUrl, attachmentTitle ?: "", id, getReactions(message))
+                    attachmentUrl, attachmentTitle, id, getReactions(message))
             is AudioAttachment -> AudioAttachmentViewModel(message, attachment, message.id,
-                    attachmentUrl, attachmentTitle ?: "", id, getReactions(message))
+                    attachmentUrl, attachmentTitle, id, getReactions(message))
             else -> null
         }
     }
 
-    private fun attachmentUrl(url: String): String {
-        var response = url
-        val httpUrl = HttpUrl.parse(url)
-        httpUrl?.let {
-            response = it.newBuilder().apply {
-                addQueryParameter("rc_uid", token?.userId)
-                addQueryParameter("rc_token", token?.authToken)
-            }.build().toString()
+    private fun attachmentId(message: Message, attachment: FileAttachment): Long {
+        return "${message.id}_${attachment.url}".hashCode().toLong()
+    }
+
+    private fun attachmentTitle(attachment: FileAttachment): CharSequence {
+        return with(attachment) {
+            title?.let { return@with it }
+
+            val fileUrl = HttpUrl.parse(url)
+            fileUrl?.let {
+                return@with it.pathSegments().last()
+            }
+
+            return@with ""
         }
+    }
+
+    private fun attachmentUrl(attachment: FileAttachment): String {
+        return with(attachment) {
+            if (url.startsWith("http")) return@with url
+
+            val fullUrl = "$baseUrl$url"
+            val httpUrl = HttpUrl.parse(fullUrl)
+            httpUrl?.let {
+                return@with it.newBuilder().apply {
+                    addQueryParameter("rc_uid", token?.userId)
+                    addQueryParameter("rc_token", token?.authToken)
+                }.build().toString()
+            }
 
-        return response
+            // Fallback to baseUrl + url
+            return@with fullUrl
+        }
     }
 
     private suspend fun mapMessage(message: Message): MessageViewModel = withContext(CommonPool) {

app/src/main/res/layout/fragment_authentication_server.xml

@@ -14,19 +14,11 @@
         android:layout_centerHorizontal="true"
         android:text="@string/title_sign_in_your_server" />
 
-    <TextView
-        android:id="@+id/text_server_protocol"
-        style="@style/Authentication.TextView"
-        android:layout_below="@id/text_headline"
-        android:layout_marginTop="32dp"
-        android:gravity="center_vertical"
-        android:text="@string/default_protocol" />
-
     <EditText
         android:id="@+id/text_server_url"
         style="@style/Authentication.EditText"
         android:layout_below="@id/text_headline"
-        android:layout_marginStart="0dp"
+        android:layout_marginStart="-4dp"
         android:layout_marginTop="32dp"
         android:layout_toEndOf="@id/text_server_protocol"
         android:cursorVisible="false"
@@ -35,7 +27,15 @@
         android:digits="0123456789abcdefghijklmnopqrstuvwxyz.-/:"
         android:inputType="textUri"
         android:paddingEnd="0dp"
-        android:paddingStart="0dp" />
+        android:paddingStart="2dp" />
+
+    <TextView
+        android:id="@+id/text_server_protocol"
+        style="@style/Authentication.TextView"
+        android:layout_below="@id/text_headline"
+        android:layout_marginTop="32dp"
+        android:gravity="center_vertical"
+        android:text="@string/default_protocol" />
 
     <com.wang.avi.AVLoadingIndicatorView
         android:id="@+id/view_loading"

dependencies.gradle

@@ -25,7 +25,7 @@ ext {
         rxBinding              : '2.0.0',
         fresco                 : '1.8.1',
         kotshi                 : '0.3.0',
-        frescoImageViewer      : '0.5.0',
+        frescoImageViewer      : '0.5.1',
         androidSvg             : 'master-SNAPSHOT',
         markwon                : '1.0.3',
         sheetMenu              : '1.3.3',
@@ -86,7 +86,7 @@ ext {
         kotshiApi              : "se.ansman.kotshi:api:${versions.kotshi}",
         kotshiCompiler         : "se.ansman.kotshi:compiler:${versions.kotshi}",
 
-        frescoImageViewer      : "com.github.stfalcon:frescoimageviewer:${versions.frescoImageViewer}",
+        frescoImageViewer      : "com.github.luciofm:FrescoImageViewer:${versions.frescoImageViewer}",
         androidSvg             : "com.github.BigBadaboom:androidsvg:${versions.androidSvg}",
 
         markwon                : "ru.noties:markwon:${versions.markwon}",