ishan
/
fenix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Close #26072: Don't show sync menu item until account manager is available

This commit is contained in:
Roger Yang 2022-08-18 15:27:33 -04:00 committed by mergify[bot]
parent a9b2f1c6a7
commit ad1fd57b8f
2 changed files with 42 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
View File

@ -349,17 +349,28 @@ open class DefaultToolbarMenu(
onItemTapped.invoke(ToolbarMenu.Item.Quit)
}
private fun getSyncItemTitle() =
accountManager.accountProfileEmail ?: context.getString(R.string.sync_menu_sign_in)
private fun syncMenuItem(): BrowserMenuImageText? {
val syncItemTitle =
if (context.components.backgroundServices.accountManagerAvailableQueue.isReady()) {
accountManager.accountProfileEmail ?: context.getString(R.string.sync_menu_sign_in)
} else {
null
}
private val syncMenuItem = BrowserMenuImageText(
getSyncItemTitle(),
R.drawable.ic_signed_out,
primaryTextColor()
) {
onItemTapped.invoke(
ToolbarMenu.Item.SyncAccount(accountManager.accountState)
)
return when (syncItemTitle) {
null -> null
else -> {
BrowserMenuImageText(
syncItemTitle,
R.drawable.ic_signed_out,
primaryTextColor()
) {
onItemTapped.invoke(
ToolbarMenu.Item.SyncAccount(accountManager.accountState)
)
}
}
}
}
@VisibleForTesting(otherwise = PRIVATE)
@ -373,7 +384,7 @@ open class DefaultToolbarMenu(
historyItem,
downloadsItem,
extensionsItem,
syncMenuItem,
syncMenuItem(),
BrowserMenuDivider(),
findInPageItem,
desktopSiteItem,

29
app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt
View File

@ -96,15 +96,26 @@ class HomeMenu(
}
}
private fun getSyncItemTitle(): String =
accountManager.accountProfileEmail ?: context.getString(R.string.sync_menu_sign_in)
private fun syncSignInMenuItem(): BrowserMenuImageText? {
val syncItemTitle =
if (context.components.backgroundServices.accountManagerAvailableQueue.isReady()) {
accountManager.accountProfileEmail ?: context.getString(R.string.sync_menu_sign_in)
} else {
null
}
private val syncSignInMenuItem = BrowserMenuImageText(
getSyncItemTitle(),
R.drawable.ic_synced_tabs,
primaryTextColor
) {
onItemTapped.invoke(Item.SyncAccount(accountManager.accountState))
return when (syncItemTitle) {
null -> null
else -> {
BrowserMenuImageText(
syncItemTitle,
R.drawable.ic_signed_out,
primaryTextColor
) {
onItemTapped.invoke(Item.SyncAccount(accountManager.accountState))
}
}
}
}
val desktopItem = BrowserMenuImageSwitch(
@ -212,7 +223,7 @@ class HomeMenu(
historyItem,
downloadsItem,
extensionsItem,
syncSignInMenuItem,
syncSignInMenuItem(),
accountAuthItem,
if (Config.channel.isMozillaOnline) manageAccountAndDevicesItem else null,
BrowserMenuDivider(),