Mastodon
/
Yuito-app-android
mirror of https://github.com/accelforce/Yuito
1
0
Fork 0
Code Issues Releases Wiki Activity

fix crash in account activity (#1085)

This commit is contained in:
Konrad Pozniak 2019-02-27 20:03:38 +01:00 committed by GitHub
parent ffcc294107
commit d5fcbea5ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt
View File

@ -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() {