Merge pull request #1552 from RocketChat/beta

[RELEASE] merge 2.5.1 to master

Author: rafaelks

app/build.gradle

@@ -12,8 +12,8 @@ android {
         applicationId "chat.rocket.android"
         minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk
-        versionCode 2034
-        versionName "2.5.0"
+        versionCode 2035
+        versionName "2.5.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
 

app/src/main/java/chat/rocket/android/authentication/domain/model/LoginDeepLinkInfo.kt

@@ -11,8 +11,8 @@ import timber.log.Timber
 @Parcelize
 data class LoginDeepLinkInfo(
     val url: String,
-    val userId: String,
-    val token: String
+    val userId: String?,
+    val token: String?
 ) : Parcelable
 
 fun Intent.getLoginDeepLinkInfo(): LoginDeepLinkInfo? {

app/src/main/java/chat/rocket/android/authentication/login/presentation/LoginPresenter.kt

@@ -190,6 +190,21 @@ interface LoginView : LoadingView, MessageView {
      */
     fun setupGitlabButtonListener(gitlabUrl: String, state: String)
 
+    /**
+     * Shows the "login by WordPress" view if it is enable by the server settings.
+     *
+     * REMARK: We must set up the Gitlab button listener before enabling it [setupWordpressButtonListener].
+     */
+    fun enableLoginByWordpress()
+
+    /**
+     * Setups the WordPress button when tapped.
+     *
+     * @param wordpressUrl The WordPress OAuth URL to authenticate with.
+     * @param state A random string generated by the app, which you'll verify later (to protect against forgery attacks).
+     */
+    fun setupWordpressButtonListener(wordpressUrl: String, state: String)
+
     /**
      * Adds a custom OAuth button in the oauth view.
      *

app/src/main/java/chat/rocket/android/authentication/login/presentation/LoginView.kt

@@ -443,6 +443,24 @@ class LoginFragment : Fragment(), LoginView {
         }
     }
 
+    override fun enableLoginByWordpress() {
+        ui {
+            button_wordpress.isClickable = true
+        }
+    }
+
+    override fun setupWordpressButtonListener(wordpressUrl: String, state: String) {
+        ui { activity ->
+            button_wordpress.setOnClickListener {
+                startActivityForResult(
+                    activity.oauthWebViewIntent(wordpressUrl, state),
+                    REQUEST_CODE_FOR_OAUTH
+                )
+                activity.overridePendingTransition(R.anim.slide_up, R.anim.hold)
+            }
+        }
+    }
+
     override fun addCustomOauthServiceButton(
         customOauthUrl: String,
         state: String,
@@ -488,11 +506,11 @@ class LoginFragment : Fragment(), LoginView {
     override fun setupFabListener() {
         ui {
             button_fab.isVisible = true
-            button_fab.setOnClickListener({
+            button_fab.setOnClickListener {
                 button_fab.hide()
                 showRemainingSocialAccountsView()
                 scrollToBottom()
-            })
+            }
         }
     }
 

app/src/main/java/chat/rocket/android/authentication/login/ui/LoginFragment.kt

@@ -104,6 +104,8 @@ class ServerFragment : Fragment(), ServerView {
 
     override fun onDestroyView() {
         super.onDestroyView()
+        // reset deep link info, so user can come back and log to another server...
+        deepLinkInfo = null
         relative_layout.viewTreeObserver.removeOnGlobalLayoutListener(layoutListener)
     }
 
@@ -144,9 +146,9 @@ class ServerFragment : Fragment(), ServerView {
             hideLoading()
             AlertDialog.Builder(it)
                 .setMessage(getString(R.string.msg_ver_not_recommended, BuildConfig.RECOMMENDED_SERVER_VERSION))
-                .setPositiveButton(R.string.msg_ok, { _, _ ->
+                .setPositiveButton(R.string.msg_ok) { _, _ ->
                     performConnect()
-                })
+                }
                 .create()
                 .show()
         }

app/src/main/java/chat/rocket/android/authentication/server/ui/ServerFragment.kt

@@ -56,9 +56,7 @@ class AuthenticationActivity : AppCompatActivity(), HasSupportFragmentInjector {
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         val currentFragment = supportFragmentManager.findFragmentById(R.id.fragment_container)
-        if (currentFragment != null) {
-            currentFragment.onActivityResult(requestCode, resultCode, data)
-        }
+        currentFragment?.onActivityResult(requestCode, resultCode, data)
     }
 
     override fun supportFragmentInjector(): AndroidInjector<Fragment> {

app/src/main/java/chat/rocket/android/authentication/ui/AuthenticationActivity.kt

@@ -6,6 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.children
+import androidx.lifecycle.Lifecycle
 import androidx.recyclerview.widget.RecyclerView
 import chat.rocket.android.R
 import chat.rocket.android.chatroom.ui.bottomsheet.MessageActionsBottomSheet
@@ -94,9 +95,11 @@ abstract class BaseViewHolder<T : BaseUiModel<*>>(
                     view.context?.let {
                         if (it is ContextThemeWrapper && it.baseContext is AppCompatActivity) {
                             with(it.baseContext as AppCompatActivity) {
-                                val actionsBottomSheet = MessageActionsBottomSheet()
-                                actionsBottomSheet.addItems(menuItems, this@BaseViewHolder)
-                                actionsBottomSheet.show(supportFragmentManager, null)
+                                if (this.lifecycle.currentState.isAtLeast(Lifecycle.State.RESUMED)) {
+                                    val actionsBottomSheet = MessageActionsBottomSheet()
+                                    actionsBottomSheet.addItems(menuItems, this@BaseViewHolder)
+                                    actionsBottomSheet.show(supportFragmentManager, null)
+                                }
                             }
                         }
                     }

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

@@ -18,10 +18,9 @@ import java.security.InvalidParameterException
 class ChatRoomAdapter(
     private val roomType: String? = null,
     private val roomName: String? = null,
-    private val presenter: ChatRoomPresenter? = null,
+    private val actionSelectListener: OnActionSelected? = null,
     private val enableActions: Boolean = true,
-    private val reactionListener: EmojiReactionListener? = null,
-    private val context: Context? = null
+    private val reactionListener: EmojiReactionListener? = null
 ) : RecyclerView.Adapter<BaseViewHolder<*>>() {
     private val dataSet = ArrayList<BaseUiModel<*>>()
 
@@ -70,7 +69,7 @@ class ChatRoomAdapter(
             BaseUiModel.ViewType.MESSAGE_REPLY -> {
                 val view = parent.inflate(R.layout.item_message_reply)
                 MessageReplyViewHolder(view, actionsListener, reactionListener) { roomName, permalink ->
-                    presenter?.openDirectMessage(roomName, permalink)
+                    actionSelectListener?.openDirectMessage(roomName, permalink)
                 }
             }
             else -> {
@@ -212,52 +211,53 @@ class ChatRoomAdapter(
             message.apply {
                 when (item.itemId) {
                     R.id.action_message_info -> {
-                        presenter?.messageInfo(id)
+                        actionSelectListener?.showMessageInfo(id)
                     }
                     R.id.action_message_reply -> {
                         if (roomName != null && roomType != null) {
-                            presenter?.citeMessage(roomName, roomType, id, true)
+                            actionSelectListener?.citeMessage(roomName, roomType, id, true)
                         }
                     }
                     R.id.action_message_quote -> {
                         if (roomName != null && roomType != null) {
-                            presenter?.citeMessage(roomName, roomType, id, false)
+                            actionSelectListener?.citeMessage(roomName, roomType, id, false)
                         }
                     }
                     R.id.action_message_copy -> {
-                        presenter?.copyMessage(id)
+                        actionSelectListener?.copyMessage(id)
                     }
                     R.id.action_message_edit -> {
-                        presenter?.editMessage(roomId, id, message.message)
+                        actionSelectListener?.editMessage(roomId, id, message.message)
                     }
                     R.id.action_message_star -> {
-                        if (!item.isChecked) {
-                            presenter?.starMessage(id)
-                        } else {
-                            presenter?.unstarMessage(id)
-                        }
+                        actionSelectListener?.toogleStar(id, !item.isChecked)
                     }
                     R.id.action_message_unpin -> {
-                        if (!item.isChecked) {
-                            presenter?.pinMessage(id)
-                        } else {
-                            presenter?.unpinMessage(id)
-                        }
+                        actionSelectListener?.tooglePin(id, !item.isChecked)
                     }
                     R.id.action_message_delete -> {
-                        context?.let {
-                            val builder = AlertDialog.Builder(it)
-                            builder.setTitle(it.getString(R.string.msg_delete_message))
-                                    .setMessage(it.getString(R.string.msg_delete_description))
-                                    .setPositiveButton(it.getString(R.string.msg_ok)) { _, _ -> presenter?.deleteMessage(roomId, id) }
-                                    .setNegativeButton(it.getString(R.string.msg_cancel)) { _, _ ->  }
-                                    .show()
-                        }
+                        actionSelectListener?.deleteMessage(roomId, id)
+                    }
+                    R.id.action_menu_msg_react -> {
+                        actionSelectListener?.showReactions(id)
+                    }
+                    else -> {
+                        TODO("Not implemented")
                     }
-                    R.id.action_menu_msg_react -> presenter?.showReactions(id)
-                    else -> TODO("Not implemented")
                 }
             }
         }
     }
+
+    interface OnActionSelected {
+        fun showMessageInfo(id: String)
+        fun citeMessage(roomName: String, roomType: String, messageId: String, mentionAuthor: Boolean)
+        fun copyMessage(id: String)
+        fun editMessage(roomId: String, messageId: String, text: String)
+        fun toogleStar(id: String, star: Boolean)
+        fun tooglePin(id: String, pin: Boolean)
+        fun deleteMessage(roomId: String, id: String)
+        fun showReactions(id: String)
+        fun openDirectMessage(roomName: String, message: String)
+    }
 }

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

@@ -1,12 +1,11 @@
 package chat.rocket.android.chatroom.adapter
 
-import android.net.Uri
 import android.view.View
 import androidx.core.view.isVisible
 import chat.rocket.android.chatroom.uimodel.UrlPreviewUiModel
-import chat.rocket.android.util.extensions.openTabbedUrl
 import chat.rocket.android.emoji.EmojiReactionListener
 import chat.rocket.android.util.extensions.content
+import chat.rocket.android.util.extensions.openTabbedUrl
 import kotlinx.android.synthetic.main.message_url_preview.view.*
 
 class UrlPreviewViewHolder(itemView: View,
@@ -42,7 +41,7 @@ class UrlPreviewViewHolder(itemView: View,
 
     private val onClickListener = { view: View ->
         if (data != null) {
-            view.openTabbedUrl(Uri.parse(data!!.rawData.url))
+            view.openTabbedUrl(data!!.rawData.url)
         }
     }
 }