Matthew Finkel pushed to branch tor-browser-81.1.1-10.0-1 at The Tor Project / Applications / fenix
Commits: ab9ca18c by Alex Catarineu at 2020-10-01T17:55:47+02:00 Bug 40061: Do not show "Send to device" in sharing menu
- - - - - f22fa2b5 by Matthew Finkel at 2020-10-01T16:24:50+00:00 Merge remote-tracking branch 'acatgl/40061' into tor-browser-81.1.1-10.0-1
- - - - -
1 changed file:
- app/src/main/java/org/mozilla/fenix/share/ShareFragment.kt
Changes:
===================================== app/src/main/java/org/mozilla/fenix/share/ShareFragment.kt ===================================== @@ -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) }
View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/1087d1efd8780...