diff --git a/vector/src/main/java/im/vector/riotx/features/settings/devtools/GossipingEventsPaperTrailFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/devtools/GossipingEventsPaperTrailFragment.kt index 48e48c125c..d7ffd8adfa 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/devtools/GossipingEventsPaperTrailFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/settings/devtools/GossipingEventsPaperTrailFragment.kt @@ -17,7 +17,6 @@ package im.vector.riotx.features.settings.devtools import android.os.Bundle -import android.view.MenuItem import android.view.View import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.withState @@ -40,8 +39,6 @@ class GossipingEventsPaperTrailFragment @Inject constructor( override fun getLayoutResId() = R.layout.fragment_generic_recycler - override fun getMenuRes(): Int = R.menu.menu_common_gossiping - private val viewModel: GossipingEventsPaperTrailViewModel by fragmentViewModel(GossipingEventsPaperTrailViewModel::class) override fun invalidate() = withState(viewModel) { state -> @@ -60,15 +57,6 @@ class GossipingEventsPaperTrailFragment @Inject constructor( epoxyController.interactionListener = null } - override fun onOptionsItemSelected(item: MenuItem): Boolean { - if (item.itemId == R.id.refresh) { - viewModel.refresh() - return true - } else { - return super.onOptionsItemSelected(item) - } - } - override fun didTap(event: Event) { if (event.isEncrypted()) { event.toClearContentStringWithIndent() diff --git a/vector/src/main/java/im/vector/riotx/features/settings/devtools/IncomingKeyRequestListFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/devtools/IncomingKeyRequestListFragment.kt index 653fbe36af..7a5b08752e 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/devtools/IncomingKeyRequestListFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/settings/devtools/IncomingKeyRequestListFragment.kt @@ -46,12 +46,10 @@ class IncomingKeyRequestListFragment @Inject constructor( override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) recyclerView.configureWith(epoxyController, showDivider = true) -// epoxyController.interactionListener = this } override fun onDestroyView() { super.onDestroyView() recyclerView.cleanup() -// epoxyController.interactionListener = null } } diff --git a/vector/src/main/java/im/vector/riotx/features/settings/devtools/KeyRequestsFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/devtools/KeyRequestsFragment.kt index 4331c70078..76174558b5 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/devtools/KeyRequestsFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/settings/devtools/KeyRequestsFragment.kt @@ -32,7 +32,6 @@ import javax.inject.Inject class KeyRequestsFragment @Inject constructor() : VectorBaseFragment() { override fun getLayoutResId(): Int = R.layout.fragment_devtool_keyrequests - override fun getMenuRes(): Int = R.menu.menu_common_gossiping override fun onResume() { super.onResume() diff --git a/vector/src/main/res/menu/menu_common_gossiping.xml b/vector/src/main/res/menu/menu_common_gossiping.xml deleted file mode 100644 index 08b23c760c..0000000000 --- a/vector/src/main/res/menu/menu_common_gossiping.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - -