Skip to content
Snippets Groups Projects
Unverified Commit f22fa2b5 authored by Matthew Finkel's avatar Matthew Finkel
Browse files

Merge remote-tracking branch 'acatgl/40061' into tor-browser-81.1.1-10.0-1

parents 1087d1ef ab9ca18c
Branches
Tags
1 merge request!33Bug 40061: Do not show "Send to device" in sharing menu
......@@ -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)
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment