Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
The Tor Project
Applications
fenix
Commits
f4a7b4c0
Commit
f4a7b4c0
authored
Feb 03, 2021
by
Sebastian Kaspari
Committed by
Christian Sadilek
Feb 03, 2021
Browse files
Remove TabsUseCases methods that take a Session object.
parent
3ce9bf93
Changes
5
Hide whitespace changes
Inline
Side-by-side
app/src/geckoRelease/java/org/mozilla/fenix/engine/GeckoProvider.kt
View file @
f4a7b4c0
...
...
@@ -13,6 +13,7 @@ import mozilla.components.lib.crash.handler.CrashHandlerService
import
mozilla.components.service.sync.logins.GeckoLoginStorageDelegate
import
org.mozilla.fenix.Config
import
org.mozilla.fenix.ext.components
import
org.mozilla.geckoview.ContentBlocking
import
org.mozilla.geckoview.GeckoRuntime
import
org.mozilla.geckoview.GeckoRuntimeSettings
import
org.mozilla.geckoview.ContentBlocking.SafeBrowsingProvider
...
...
app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
View file @
f4a7b4c0
...
...
@@ -1070,7 +1070,7 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Activit
getSessionById
()
?.
let
{
session
->
return
if
(
session
.
source
==
SessionState
.
Source
.
ACTION_VIEW
)
{
activity
?.
finish
()
requireComponents
.
useCases
.
tabsUseCases
.
removeTab
(
session
)
requireComponents
.
useCases
.
tabsUseCases
.
removeTab
(
session
.
id
)
true
}
else
{
if
(
session
.
hasParentSession
)
{
...
...
app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt
View file @
f4a7b4c0
...
...
@@ -10,7 +10,6 @@ import androidx.core.graphics.BlendModeCompat.SRC_IN
import
androidx.core.graphics.drawable.toBitmap
import
mozilla.components.browser.awesomebar.BrowserAwesomeBar
import
mozilla.components.browser.search.DefaultSearchEngineProvider
import
mozilla.components.browser.session.Session
import
mozilla.components.browser.state.search.SearchEngine
import
mozilla.components.concept.awesomebar.AwesomeBar
import
mozilla.components.concept.engine.EngineSession
...
...
@@ -86,10 +85,6 @@ class AwesomeBarView(
}
private
val
selectTabUseCase
=
object
:
TabsUseCases
.
SelectTabUseCase
{
override
fun
invoke
(
session
:
Session
)
{
interactor
.
onExistingSessionSelected
(
session
.
id
)
}
override
fun
invoke
(
tabId
:
String
)
{
interactor
.
onExistingSessionSelected
(
tabId
)
}
...
...
app/src/main/java/org/mozilla/fenix/tabtray/TabTrayDialogFragment.kt
View file @
f4a7b4c0
...
...
@@ -32,7 +32,6 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
import
kotlinx.coroutines.launch
import
kotlinx.coroutines.plus
import
mozilla.appservices.places.BookmarkRoot
import
mozilla.components.browser.session.Session
import
mozilla.components.browser.state.selector.findTab
import
mozilla.components.browser.state.selector.getNormalOrPrivateTabs
import
mozilla.components.browser.state.selector.normalTabs
...
...
@@ -105,12 +104,6 @@ class TabTrayDialogFragment : AppCompatDialogFragment(), UserInteractionHandler
requireComponents
.
useCases
.
tabsUseCases
.
selectTab
(
tabId
)
navigateToBrowser
()
}
override
fun
invoke
(
session
:
Session
)
{
requireContext
().
components
.
analytics
.
metrics
.
track
(
Event
.
OpenedExistingTab
)
requireComponents
.
useCases
.
tabsUseCases
.
selectTab
(
session
)
navigateToBrowser
()
}
}
override
fun
onCreateDialog
(
savedInstanceState
:
Bundle
?):
Dialog
{
...
...
@@ -127,12 +120,6 @@ class TabTrayDialogFragment : AppCompatDialogFragment(), UserInteractionHandler
showUndoSnackbarForTab
(
sessionId
)
removeIfNotLastTab
(
sessionId
)
}
override
fun
invoke
(
session
:
Session
)
{
requireContext
().
components
.
analytics
.
metrics
.
track
(
Event
.
ClosedExistingTab
)
showUndoSnackbarForTab
(
session
.
id
)
removeIfNotLastTab
(
session
.
id
)
}
}
private
fun
removeIfNotLastTab
(
sessionId
:
String
)
{
...
...
buildSrc/src/main/java/AndroidComponents.kt
View file @
f4a7b4c0
...
...
@@ -3,5 +3,5 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
object
AndroidComponents
{
const
val
VERSION
=
"73.0.2021020
2194906
"
const
val
VERSION
=
"73.0.2021020
3143122
"
}
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment