mirror of
https://github.com/nextcloud/talk-android
synced 2025-07-19 10:45:13 +01:00
open federated chat after accepting the invite
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
parent
03d33731fd
commit
4a72735a57
@ -32,6 +32,7 @@ import com.nextcloud.talk.R
|
|||||||
import com.nextcloud.talk.activities.BaseActivity
|
import com.nextcloud.talk.activities.BaseActivity
|
||||||
import com.nextcloud.talk.api.NcApi
|
import com.nextcloud.talk.api.NcApi
|
||||||
import com.nextcloud.talk.application.NextcloudTalkApplication
|
import com.nextcloud.talk.application.NextcloudTalkApplication
|
||||||
|
import com.nextcloud.talk.chat.ChatActivity
|
||||||
import com.nextcloud.talk.conversationlist.ConversationsListActivity
|
import com.nextcloud.talk.conversationlist.ConversationsListActivity
|
||||||
import com.nextcloud.talk.data.user.model.User
|
import com.nextcloud.talk.data.user.model.User
|
||||||
import com.nextcloud.talk.databinding.ActivityInvitationsBinding
|
import com.nextcloud.talk.databinding.ActivityInvitationsBinding
|
||||||
@ -39,6 +40,7 @@ import com.nextcloud.talk.invitation.adapters.InvitationsAdapter
|
|||||||
import com.nextcloud.talk.invitation.data.ActionEnum
|
import com.nextcloud.talk.invitation.data.ActionEnum
|
||||||
import com.nextcloud.talk.invitation.data.Invitation
|
import com.nextcloud.talk.invitation.data.Invitation
|
||||||
import com.nextcloud.talk.invitation.viewmodels.InvitationsViewModel
|
import com.nextcloud.talk.invitation.viewmodels.InvitationsViewModel
|
||||||
|
import com.nextcloud.talk.utils.bundle.BundleKeys
|
||||||
import com.nextcloud.talk.utils.database.user.CurrentUserProviderNew
|
import com.nextcloud.talk.utils.database.user.CurrentUserProviderNew
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
|
|
||||||
@ -151,17 +153,12 @@ class InvitationsActivity : BaseActivity() {
|
|||||||
|
|
||||||
is InvitationsViewModel.InvitationActionSuccessState -> {
|
is InvitationsViewModel.InvitationActionSuccessState -> {
|
||||||
if (state.action == ActionEnum.ACCEPT) {
|
if (state.action == ActionEnum.ACCEPT) {
|
||||||
// val bundle = Bundle()
|
val bundle = Bundle()
|
||||||
// bundle.putString(BundleKeys.KEY_ROOM_TOKEN, ????) // ???
|
bundle.putString(BundleKeys.KEY_ROOM_TOKEN, state.invitation.localToken)
|
||||||
//
|
val chatIntent = Intent(context, ChatActivity::class.java)
|
||||||
// val chatIntent = Intent(context, ChatActivity::class.java)
|
chatIntent.putExtras(bundle)
|
||||||
// chatIntent.putExtras(bundle)
|
chatIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
|
||||||
// chatIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
|
startActivity(chatIntent)
|
||||||
// startActivity(chatIntent)
|
|
||||||
|
|
||||||
val intent = Intent(this, ConversationsListActivity::class.java)
|
|
||||||
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
|
|
||||||
startActivity(intent)
|
|
||||||
} else {
|
} else {
|
||||||
// adapter.currentList.remove(state.invitation)
|
// adapter.currentList.remove(state.invitation)
|
||||||
// adapter.notifyDataSetChanged() // leads to UnsupportedOperationException ?!
|
// adapter.notifyDataSetChanged() // leads to UnsupportedOperationException ?!
|
||||||
|
Loading…
Reference in New Issue
Block a user