UI: remove "No internet connection" (#57)

This has never worked well. I think we'd need to periodically re-check
link state, and possibly hook up a generate_204 function, to make this
really work.

Fixes https://github.com/tailscale/tailscale/issues/5422

Signed-off-by: Denton Gentry <dgentry@tailscale.com>

Signed-off-by: Denton Gentry <dgentry@tailscale.com>
pull/60/head
Denton Gentry 2 years ago committed by GitHub
parent 548fbe21ea
commit bbf31f568f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -495,11 +495,7 @@ func (a *App) runBackend() error {
notifyVPNClosed() notifyVPNClosed()
} }
} }
case connected := <-onConnectivityChange: case <-onConnectivityChange:
if state.LostInternet != !connected {
log.Printf("LostInternet state change: %v -> %v", state.LostInternet, !connected)
}
state.LostInternet = !connected
if b != nil { if b != nil {
go b.LinkChange() go b.LinkChange()
} }

@ -510,15 +510,13 @@ func (ui *UI) layout(gtx layout.Context, sysIns system.Insets, state *clientStat
} }
return ui.layoutSearchbar(gtx, sysIns) return ui.layoutSearchbar(gtx, sysIns)
case 4: case 4:
if !needsLogin || state.backend.LostInternet { if !needsLogin {
return D{} return D{}
} }
return ui.layoutSignIn(gtx, &state.backend) return ui.layoutSignIn(gtx, &state.backend)
case 5: case 5:
if !state.backend.LostInternet { // Formerly "No internet connection", which has been removed.
return D{} return D{}
}
return ui.layoutDisconnected(gtx)
default: default:
if needsLogin { if needsLogin {
return D{} return D{}
@ -800,29 +798,6 @@ func (ui *UI) withLoader(gtx layout.Context, loading bool, w layout.Widget) layo
) )
} }
// layoutDisconnected lays out the "please connect to the internet"
// message.
func (ui *UI) layoutDisconnected(gtx layout.Context) layout.Dimensions {
return layout.UniformInset(unit.Dp(16)).Layout(gtx, func(gtx C) D {
return layout.Flex{Axis: layout.Vertical}.Layout(gtx,
layout.Rigid(func(gtx C) D {
return layout.Inset{Top: unit.Dp(8)}.Layout(gtx, func(gtx C) D {
title := material.H6(ui.theme, "No internet connection")
title.Alignment = text.Middle
return title.Layout(gtx)
})
}),
layout.Rigid(func(gtx C) D {
return layout.Inset{Top: unit.Dp(8)}.Layout(gtx, func(gtx C) D {
msg := material.Body2(ui.theme, "Tailscale is paused while your device is offline. Please reconnect to the internet.")
msg.Alignment = text.Middle
return msg.Layout(gtx)
})
}),
)
})
}
// layoutIntro lays out the intro page with the logo and terms. // layoutIntro lays out the intro page with the logo and terms.
func (ui *UI) layoutIntro(gtx layout.Context, sysIns system.Insets) { func (ui *UI) layoutIntro(gtx layout.Context, sysIns system.Insets) {
fill{rgb(0x232323)}.Layout(gtx, gtx.Constraints.Max) fill{rgb(0x232323)}.Layout(gtx, gtx.Constraints.Max)

Loading…
Cancel
Save