Matthew Finkel pushed to branch tor-browser-90.0.0b6-11.0-1 at The Tor Project / Applications / fenix
Commits:
- 
f4b8b92d
by Matthew Finkel at 2021-07-08T17:43:36+00:00
2 changed files:
- app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
- app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt
Changes:
| ... | ... | @@ -73,7 +73,6 @@ open class DefaultToolbarMenu( | 
| 73 | 73 |      private var isCurrentUrlBookmarked = false
 | 
| 74 | 74 |      private var isBookmarkedJob: Job? = null
 | 
| 75 | 75 |  | 
| 76 | -    private val shouldDeleteDataOnQuit = context.settings().shouldDeleteBrowsingDataOnQuit
 | |
| 77 | 76 |      private val shouldUseBottomToolbar = context.settings().shouldUseBottomToolbar
 | 
| 78 | 77 |      private val accountManager = FenixAccountManager(context)
 | 
| 79 | 78 |  | 
| ... | ... | @@ -578,7 +577,7 @@ open class DefaultToolbarMenu( | 
| 578 | 577 |                  //saveToCollectionItem,
 | 
| 579 | 578 |                  BrowserMenuDivider(),
 | 
| 580 | 579 |                  settingsItem,
 | 
| 581 | -                if (shouldDeleteDataOnQuit) deleteDataOnQuit else null,
 | |
| 580 | +                deleteDataOnQuit,
 | |
| 582 | 581 |                  if (shouldUseBottomToolbar) BrowserMenuDivider() else null,
 | 
| 583 | 582 |                  if (shouldUseBottomToolbar) menuToolbar else null
 | 
| 584 | 583 |              )
 | 
| ... | ... | @@ -229,7 +229,7 @@ class HomeMenu( | 
| 229 | 229 |      @Suppress("ComplexMethod")
 | 
| 230 | 230 |      private fun newCoreMenuItems(): List<BrowserMenuItem> {
 | 
| 231 | 231 |          // val experiments = context.components.analytics.experiments
 | 
| 232 | -        val settings = context.components.settings
 | |
| 232 | +        // val settings = context.components.settings
 | |
| 233 | 233 |  | 
| 234 | 234 |          val bookmarksItem = BrowserMenuImageText(
 | 
| 235 | 235 |              context.getString(R.string.library_bookmarks),
 | 
| ... | ... | @@ -316,7 +316,7 @@ class HomeMenu( | 
| 316 | 316 |              whatsNewItem,
 | 
| 317 | 317 |              helpItem,
 | 
| 318 | 318 |              settingsItem,
 | 
| 319 | -            if (settings.shouldDeleteBrowsingDataOnQuit) quitItem else null
 | |
| 319 | +            quitItem
 | |
| 320 | 320 |          ).also { items ->
 | 
| 321 | 321 |              items.getHighlight()?.let { onHighlightPresent(it) }
 | 
| 322 | 322 |          }
 |