diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt index e8c1e0c31..a5ec23a8b 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt @@ -112,6 +112,7 @@ import com.nextcloud.talk.presenters.MentionAutocompletePresenter import com.nextcloud.talk.ui.dialog.AttachmentDialog import com.nextcloud.talk.utils.ApiUtils import com.nextcloud.talk.utils.ConductorRemapping +import com.nextcloud.talk.utils.ConductorRemapping.remapChatController import com.nextcloud.talk.utils.DateUtils import com.nextcloud.talk.utils.DisplayUtils import com.nextcloud.talk.utils.KeyboardUtils @@ -119,6 +120,10 @@ import com.nextcloud.talk.utils.MagicCharPolicy import com.nextcloud.talk.utils.NotificationUtils import com.nextcloud.talk.utils.UriUtils import com.nextcloud.talk.utils.bundle.BundleKeys +import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ACTIVE_CONVERSATION +import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ROOM_ID +import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ROOM_TOKEN +import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_USER_ENTITY import com.nextcloud.talk.utils.database.user.UserUtils import com.nextcloud.talk.utils.preferences.AppPreferences import com.nextcloud.talk.utils.singletons.ApplicationWideCurrentRoomHolder @@ -542,8 +547,7 @@ class ChatController(args: Bundle) : override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) { if (s.length >= lengthFilter) { messageInput?.error = String.format( - Objects.requireNonNull - (resources).getString(R.string.nc_limit_hit), + Objects.requireNonNull (resources).getString(R.string.nc_limit_hit), Integer.toString(lengthFilter) ) } else { @@ -619,8 +623,7 @@ class ChatController(args: Bundle) : conversationVideoMenuItem?.icon?.alpha = 255 } - if (currentConversation != null && currentConversation!!.shouldShowLobby - (conversationUser) + if (currentConversation != null && currentConversation!!.shouldShowLobby(conversationUser) ) { messageInputView?.visibility = View.GONE } else { @@ -1557,7 +1560,7 @@ class ChatController(args: Bundle) : PopupMenu( ContextThemeWrapper(view?.context, R.style.appActionBarPopupMenu), view, - if (message?.user?.id == conversationUser?.userId) Gravity.END else Gravity.START + if (message?.user?.id == currentConversation?.actorType + "/" + currentConversation?.actorId) Gravity.END else Gravity.START ).apply { setOnMenuItemClickListener { item -> when (item?.itemId) { @@ -1616,6 +1619,66 @@ class ChatController(args: Bundle) : } true } + R.id.action_reply_privately -> { + val apiVersion = ApiUtils.getConversationApiVersion(conversationUser, intArrayOf(ApiUtils.APIv4, 1)) + val retrofitBucket = ApiUtils.getRetrofitBucketForCreateRoom( + apiVersion, + conversationUser?.baseUrl, + "1", + message?.user?.id?.substring(6), + null + ) + ncApi!!.createRoom( + credentials, + retrofitBucket.getUrl(), retrofitBucket.getQueryMap() + ) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(object : Observer { + override fun onSubscribe(d: Disposable) {} + override fun onNext(roomOverall: RoomOverall) { + val bundle = Bundle() + bundle.putParcelable(KEY_USER_ENTITY, conversationUser) + bundle.putString(KEY_ROOM_TOKEN, roomOverall.getOcs().getData().getToken()) + bundle.putString(KEY_ROOM_ID, roomOverall.getOcs().getData().getRoomId()) + + // FIXME once APIv2 or later is used only, the createRoom already returns all the data + ncApi!!.getRoom( + credentials, + ApiUtils.getUrlForRoom( + apiVersion, conversationUser?.baseUrl, + roomOverall.getOcs().getData().getToken() + ) + ) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(object : Observer { + override fun onSubscribe(d: Disposable) {} + override fun onNext(roomOverall: RoomOverall) { + bundle.putParcelable( + KEY_ACTIVE_CONVERSATION, + Parcels.wrap(roomOverall.getOcs().getData()) + ) + remapChatController( + router, conversationUser!!.id, + roomOverall.getOcs().getData().getToken(), bundle, true + ) + } + + override fun onError(e: Throwable) { + Log.e(TAG, e.message, e) + } + override fun onComplete() {} + }) + } + + override fun onError(e: Throwable) { + Log.e(TAG, e.message, e) + } + override fun onComplete() {} + }) + true + } R.id.action_delete_message -> { var apiVersion = 1 // FIXME Fix API checking with guests? @@ -1667,8 +1730,16 @@ class ChatController(args: Bundle) : inflate(R.menu.chat_message_menu) menu.findItem(R.id.action_copy_message).isVisible = !(message as ChatMessage).isDeleted menu.findItem(R.id.action_reply_to_message).isVisible = (message as ChatMessage).replyable + menu.findItem(R.id.action_reply_privately).isVisible = (message as ChatMessage).replyable && + conversationUser?.userId?.isNotEmpty() == true && conversationUser.userId != "?" && + (message as ChatMessage).user.id.startsWith("users/") && + (message as ChatMessage).user.id.substring(6) != currentConversation?.actorId && + currentConversation?.type != Conversation.ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL menu.findItem(R.id.action_delete_message).isVisible = isShowMessageDeletionButton(message) if (menu.hasVisibleItems()) { + if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) { + setForceShowIcon(true) + } show() } } diff --git a/app/src/main/res/drawable/ic_content_copy_white_24dp.xml b/app/src/main/res/drawable/ic_content_copy.xml similarity index 84% rename from app/src/main/res/drawable/ic_content_copy_white_24dp.xml rename to app/src/main/res/drawable/ic_content_copy.xml index c211821b4..0ce661cd4 100644 --- a/app/src/main/res/drawable/ic_content_copy_white_24dp.xml +++ b/app/src/main/res/drawable/ic_content_copy.xml @@ -1,5 +1,5 @@ diff --git a/app/src/main/res/drawable/ic_delete_white_24dp.xml b/app/src/main/res/drawable/ic_delete.xml similarity index 86% rename from app/src/main/res/drawable/ic_delete_white_24dp.xml rename to app/src/main/res/drawable/ic_delete.xml index 4c3a52e84..f862bed6b 100644 --- a/app/src/main/res/drawable/ic_delete_white_24dp.xml +++ b/app/src/main/res/drawable/ic_delete.xml @@ -21,5 +21,5 @@ - + diff --git a/app/src/main/res/drawable/ic_reply_white_24dp.xml b/app/src/main/res/drawable/ic_reply.xml similarity index 79% rename from app/src/main/res/drawable/ic_reply_white_24dp.xml rename to app/src/main/res/drawable/ic_reply.xml index bfe58aa51..c1078cd8b 100644 --- a/app/src/main/res/drawable/ic_reply_white_24dp.xml +++ b/app/src/main/res/drawable/ic_reply.xml @@ -1,5 +1,5 @@ diff --git a/app/src/main/res/menu/chat_message_menu.xml b/app/src/main/res/menu/chat_message_menu.xml index b5652a002..02036213e 100644 --- a/app/src/main/res/menu/chat_message_menu.xml +++ b/app/src/main/res/menu/chat_message_menu.xml @@ -4,19 +4,25 @@ + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6602b46f0..9d93e797c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -355,6 +355,7 @@ 99+ Copy Reply + Reply privately Delete Message deleted successfully, but it might have been leaked to other services