Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
fenix
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This project is archived. Its data is
read-only
.
Show more breadcrumbs
The Tor Project
Applications
fenix
Commits
f22fa2b5
Unverified
Commit
f22fa2b5
authored
Oct 1, 2020
by
Matthew Finkel
Browse files
Options
Downloads
Plain Diff
Merge remote-tracking branch 'acatgl/40061' into tor-browser-81.1.1-10.0-1
parents
1087d1ef
ab9ca18c
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!33
Bug 40061: Do not show "Send to device" in sharing menu
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
app/src/main/java/org/mozilla/fenix/share/ShareFragment.kt
+0
-7
0 additions, 7 deletions
app/src/main/java/org/mozilla/fenix/share/ShareFragment.kt
with
0 additions
and
7 deletions
app/src/main/java/org/mozilla/fenix/share/ShareFragment.kt
+
0
−
7
View file @
f22fa2b5
...
...
@@ -35,7 +35,6 @@ class ShareFragment : AppCompatDialogFragment() {
}
private
lateinit
var
shareInteractor
:
ShareInteractor
private
lateinit
var
shareCloseView
:
ShareCloseView
private
lateinit
var
shareToAccountDevicesView
:
ShareToAccountDevicesView
private
lateinit
var
shareToAppsView
:
ShareToAppsView
override
fun
onAttach
(
context
:
Context
)
{
...
...
@@ -90,9 +89,6 @@ class ShareFragment : AppCompatDialogFragment() {
)
view
.
shareWrapper
.
setOnClickListener
{
shareInteractor
.
onShareClosed
()
}
shareToAccountDevicesView
=
ShareToAccountDevicesView
(
view
.
devicesShareLayout
,
shareInteractor
)
if
(
args
.
showPage
)
{
// Show the previous fragment underneath the share background scrim
// by making it translucent.
...
...
@@ -111,9 +107,6 @@ class ShareFragment : AppCompatDialogFragment() {
override
fun
onViewCreated
(
view
:
View
,
savedInstanceState
:
Bundle
?)
{
super
.
onViewCreated
(
view
,
savedInstanceState
)
viewModel
.
devicesList
.
observe
(
viewLifecycleOwner
)
{
devicesShareOptions
->
shareToAccountDevicesView
.
setShareTargets
(
devicesShareOptions
)
}
viewModel
.
appsList
.
observe
(
viewLifecycleOwner
)
{
appsToShareTo
->
shareToAppsView
.
setShareTargets
(
appsToShareTo
)
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment