From 153a002ffa1d542527d20733e8425b21ac87ece6 Mon Sep 17 00:00:00 2001 From: Konrad Pozniak Date: Wed, 27 Feb 2019 20:03:38 +0100 Subject: [PATCH] fix crash in account activity (#1085) --- .../main/java/com/keylesspalace/tusky/AccountActivity.kt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt b/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt index ab5e1508..38061818 100644 --- a/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt @@ -463,10 +463,7 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasSupportF override fun onCreateOptionsMenu(menu: Menu): Boolean { menuInflater.inflate(R.menu.account_toolbar, menu) - return super.onCreateOptionsMenu(menu) - } - override fun onPrepareOptionsMenu(menu: Menu): Boolean { if (!isSelf) { val follow = menu.findItem(R.id.action_follow) follow.title = if (followState == FollowState.NOT_FOLLOWING) { @@ -510,7 +507,8 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasSupportF menu.removeItem(R.id.action_mute) menu.removeItem(R.id.action_show_reblogs) } - return super.onPrepareOptionsMenu(menu) + + return super.onCreateOptionsMenu(menu) } private fun showFollowRequestPendingDialog() {