[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/fenix][tor-browser-82.1.1-10.0-1] 2 commits: fixup! Bug 40015: Modify Home menu



Title: GitLab

Matthew Finkel pushed to branch tor-browser-82.1.1-10.0-1 at The Tor Project / Applications / fenix

Commits:

2 changed files:

Changes:

  • app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
    ... ... @@ -175,16 +175,13 @@ class DefaultToolbarMenu(
    175 175
             // Predicates that are called once, during screen init
    
    176 176
             val shouldShowSaveToCollection = (context.asActivity() as? HomeActivity)
    
    177 177
                 ?.browsingModeManager?.mode == BrowsingMode.Normal
    
    178
    -        val shouldDeleteDataOnQuit = context.components.settings
    
    179
    -            .shouldDeleteBrowsingDataOnQuit &&
    
    180
    -            !context.components.settings.shouldDisableNormalMode
    
    181 178
     
    
    182 179
             val menuItems = listOfNotNull(
    
    183 180
                 downloadsItem,
    
    184 181
                 // historyItem,
    
    185 182
                 bookmarksItem,
    
    186 183
                 settings,
    
    187
    -            if (shouldDeleteDataOnQuit) deleteDataOnQuit else null,
    
    184
    +            deleteDataOnQuit,
    
    188 185
                 BrowserMenuDivider(),
    
    189 186
                 findInPage,
    
    190 187
                 addToTopSites,
    

  • app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt
    ... ... @@ -160,12 +160,10 @@ class HomeMenu(
    160 160
                 null
    
    161 161
             }
    
    162 162
     
    
    163
    -        val settings = context.components.settings
    
    164
    -        val shouldDeleteBrowsingDataOnQuit = settings.shouldDeleteBrowsingDataOnQuit &&
    
    165
    -            !settings.shouldDisableNormalMode
    
    163
    +        // val settings = context.components.settings
    
    166 164
     
    
    167 165
             val menuItems = listOfNotNull(
    
    168
    -            if (shouldDeleteBrowsingDataOnQuit) quitItem else null,
    
    166
    +            quitItem,
    
    169 167
                 settingsItem,
    
    170 168
                 BrowserMenuDivider(),
    
    171 169
                 // if (settings.syncedTabsInTabsTray) null else syncedTabsItem,
    

  • _______________________________________________
    tor-commits mailing list
    tor-commits@xxxxxxxxxxxxxxxxxxxx
    https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits