From 1297ccd45c66a16c5ddcb60e0a3c29c20d192980 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 1 Jul 2022 11:58:01 +0200 Subject: [PATCH] Fix first compilation errors --- .../java/im/vector/app/core/platform/VectorBaseActivity.kt | 2 +- .../im/vector/app/features/devtools/RoomDevToolActivity.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt index 571d2d38c0..66b613d292 100644 --- a/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt +++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt @@ -417,7 +417,7 @@ abstract class VectorBaseActivity : AppCompatActivity(), Maver } } - override fun onMultiWindowModeChanged(isInMultiWindowMode: Boolean, newConfig: Configuration?) { + override fun onMultiWindowModeChanged(isInMultiWindowMode: Boolean, newConfig: Configuration) { super.onMultiWindowModeChanged(isInMultiWindowMode, newConfig) Timber.w("onMultiWindowModeChanged. isInMultiWindowMode: $isInMultiWindowMode") diff --git a/vector/src/main/java/im/vector/app/features/devtools/RoomDevToolActivity.kt b/vector/src/main/java/im/vector/app/features/devtools/RoomDevToolActivity.kt index 6f661c5164..6225741310 100644 --- a/vector/src/main/java/im/vector/app/features/devtools/RoomDevToolActivity.kt +++ b/vector/src/main/java/im/vector/app/features/devtools/RoomDevToolActivity.kt @@ -174,8 +174,8 @@ class RoomDevToolActivity : SimpleFragmentActivity(), FragmentManager.OnBackStac super.onDestroy() } - override fun onPrepareOptionsMenu(menu: Menu?): Boolean = withState(viewModel) { state -> - menu?.forEach { + override fun onPrepareOptionsMenu(menu: Menu): Boolean = withState(viewModel) { state -> + menu.forEach { val isVisible = when (it.itemId) { R.id.menuItemEdit -> { state.displayMode is RoomDevToolViewState.Mode.StateEventDetail