From eca83fef93b5c8021cde2338d41e302fe18b33c0 Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Thu, 9 Jan 2020 15:09:05 +0100 Subject: [PATCH] Fix the icon issues Signed-off-by: Mario Danic --- .../main/java/com/nextcloud/talk/controllers/ChatController.kt | 1 + .../java/com/nextcloud/talk/controllers/base/BaseController.kt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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 e9431cacf..22cf22c69 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt @@ -644,6 +644,7 @@ class ChatController(args: Bundle) : BaseController(), MessagesListAdapter override fun onAttach(view: View) { super.onAttach(view) + setTitle() eventBus.register(this) if (conversationUser?.userId != "?" && conversationUser?.hasSpreedFeatureCapability( diff --git a/app/src/main/java/com/nextcloud/talk/controllers/base/BaseController.kt b/app/src/main/java/com/nextcloud/talk/controllers/base/BaseController.kt index f30eacaf8..3bd75f302 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/base/BaseController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/base/BaseController.kt @@ -99,6 +99,7 @@ abstract class BaseController : ButterKnifeController(), ComponentCallbacks { } override fun onChangeStarted(changeHandler: ControllerChangeHandler, changeType: ControllerChangeType) { + actionBar?.setIcon(null) setOptionsMenuHidden(true) super.onChangeStarted(changeHandler, changeType) } @@ -129,7 +130,6 @@ abstract class BaseController : ButterKnifeController(), ComponentCallbacks { } it.container.layoutParams = layoutParamsForContainer it.toolbar.layoutParams = layoutParams - it.toolbar.forceLayout() } }