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

Merge pull request #1865 from nextcloud/bugfix/1861/search-bar-in-chat

Browse Source 
Conversation view shows search bar when opened from notification
This commit is contained in:
Tim Krueger 2022-03-15 14:45:51 +01:00 committed by GitHub
commit 600780ee13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -349,7 +349,7 @@ class MainActivity : BaseActivity(), ActionBarProvider {
} else { } else {
remapChatController( remapChatController(
router!!, intent.getParcelableExtra<UserEntity>(KEY_USER_ENTITY)!!.id, router!!, intent.getParcelableExtra<UserEntity>(KEY_USER_ENTITY)!!.id,
intent.getStringExtra(KEY_ROOM_TOKEN)!!, intent.extras!!, false intent.getStringExtra(KEY_ROOM_TOKEN)!!, intent.extras!!, false, true
) )
} }
} }

22
app/src/main/java/com/nextcloud/talk/utils/ConductorRemapping.kt
View File

@ -24,15 +24,28 @@ import android.os.Bundle
import com.bluelinelabs.conductor.Router import com.bluelinelabs.conductor.Router
import com.bluelinelabs.conductor.RouterTransaction import com.bluelinelabs.conductor.RouterTransaction
import com.bluelinelabs.conductor.changehandler.HorizontalChangeHandler import com.bluelinelabs.conductor.changehandler.HorizontalChangeHandler
import com.bluelinelabs.conductor.changehandler.SimpleSwapChangeHandler
import com.nextcloud.talk.controllers.ChatController import com.nextcloud.talk.controllers.ChatController
object ConductorRemapping { object ConductorRemapping {
fun remapChatController( fun remapChatController(
router: Router, router: Router,
internalUserId: Long, internalUserId: Long,
roomTokenOrId: String, roomTokenOrId: String,
bundle: Bundle, bundle: Bundle,
replaceTop: Boolean replaceTop: Boolean
) {
remapChatController(router, internalUserId, roomTokenOrId, bundle, replaceTop, false)
}
fun remapChatController(
router: Router,
internalUserId: Long,
roomTokenOrId: String,
bundle: Bundle,
replaceTop: Boolean,
pushImmediately: Boolean
) { ) {
val tag = "$internalUserId@$roomTokenOrId" val tag = "$internalUserId@$roomTokenOrId"
if (router.getControllerWithTag(tag) != null) { if (router.getControllerWithTag(tag) != null) {
@ -49,16 +62,21 @@ object ConductorRemapping {
backstack.add(routerTransaction) backstack.add(routerTransaction)
router.setBackstack(backstack, HorizontalChangeHandler()) router.setBackstack(backstack, HorizontalChangeHandler())
} else { } else {
val pushChangeHandler = if (pushImmediately) {
SimpleSwapChangeHandler()
} else {
HorizontalChangeHandler()
}
if (!replaceTop) { if (!replaceTop) {
router.pushController( router.pushController(
RouterTransaction.with(ChatController(bundle)) RouterTransaction.with(ChatController(bundle))
.pushChangeHandler(HorizontalChangeHandler()) .pushChangeHandler(pushChangeHandler)
.popChangeHandler(HorizontalChangeHandler()).tag(tag) .popChangeHandler(HorizontalChangeHandler()).tag(tag)
) )
} else { } else {
router.replaceTopController( router.replaceTopController(
RouterTransaction.with(ChatController(bundle)) RouterTransaction.with(ChatController(bundle))
.pushChangeHandler(HorizontalChangeHandler()) .pushChangeHandler(pushChangeHandler)
.popChangeHandler(HorizontalChangeHandler()).tag(tag) .popChangeHandler(HorizontalChangeHandler()).tag(tag)
) )
} }

2
detekt.yml
View File

@ -1,5 +1,5 @@
build: build:
maxIssues: 149 maxIssues: 150
weights: weights:
# complexity: 2 # complexity: 2
# LongParameterList: 1 # LongParameterList: 1