gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-19 10:45:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix launching chat

Browse Source
This commit is contained in:
Mario Danic 2019-12-22 03:19:54 +01:00 committed by Mario Đanić
parent 64f034aea5
commit ed6ab4daf8
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt
View File

@ -43,11 +43,14 @@ import com.nextcloud.talk.controllers.ServerSelectionController
import com.nextcloud.talk.controllers.base.providers.ActionBarProvider
import com.nextcloud.talk.newarch.domain.repository.offline.UsersRepository
import com.nextcloud.talk.newarch.features.conversationsList.ConversationsListView
import com.nextcloud.talk.newarch.local.models.UserNgEntity
import com.nextcloud.talk.utils.ConductorRemapping
import com.nextcloud.talk.utils.SecurityUtils
import com.nextcloud.talk.utils.bundle.BundleKeys
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import org.koin.android.ext.android.inject
class MainActivity : BaseActivity(), ActionBarProvider {
@ -82,6 +85,8 @@ class MainActivity : BaseActivity(), ActionBarProvider {
.popChangeHandler(HorizontalChangeHandler())
)
onNewIntent(intent)
}
} else {
runOnUiThread {
@ -94,10 +99,10 @@ class MainActivity : BaseActivity(), ActionBarProvider {
}
}
}
} else {
onNewIntent(intent)
}
}
override fun onStart() {
super.onStart()
@ -129,9 +134,20 @@ class MainActivity : BaseActivity(), ActionBarProvider {
if (intent.action == BundleKeys.KEY_NEW_CONVERSATION) {
openNewConversationScreen()
} else if (intent.action == BundleKeys.KEY_OPEN_CONVERSATION) {
GlobalScope.launch {
val user: UserNgEntity? = usersRepository.getUserWithId(intent.getLongExtra(BundleKeys.KEY_INTERNAL_USER_ID, -1))
user?.let {
// due to complications with persistablebundle not supporting complex types we do this magic
// remove this once we rewrite chat magic
val extras = intent.extras!!
extras.putParcelable(BundleKeys.KEY_USER_ENTITY, it)
withContext(Dispatchers.Main) {
ConductorRemapping.remapChatController(
router!!, intent.getLongExtra(BundleKeys.KEY_INTERNAL_USER_ID, -1),
intent.getStringExtra(BundleKeys.KEY_ROOM_TOKEN)!!, intent.extras!!, false)
intent.getStringExtra(BundleKeys.KEY_ROOM_TOKEN)!!, extras, false)
}
}
}
} else if (intent.hasExtra(BundleKeys.KEY_FROM_NOTIFICATION_START_CALL)) {
if (intent.getBooleanExtra(BundleKeys.KEY_FROM_NOTIFICATION_START_CALL, false)) {
router!!.pushController(