Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add disconnect button to Welcome Screen #6375

Merged

Conversation

Pururun
Copy link
Contributor

@Pururun Pururun commented Jun 18, 2024


This change is Reviewable

@Pururun Pururun added the Android Issues related to Android label Jun 18, 2024
@Pururun Pururun requested a review from albin-mullvad June 18, 2024 16:14
Copy link

linear bot commented Jun 18, 2024

Copy link
Collaborator

@albin-mullvad albin-mullvad left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 6 of 6 files at r1, all commit messages.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @Pururun)


android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/TunnelState.kt line 36 at r1 (raw file):

    }

    fun showDisconnectButton(): Boolean =

The only difference from isSecured seem to be actionAfterDisconnect, right? Are we sure these two functions should be the same (in other words skip this one)?

Also, I'm not sure this function in it's current state belongs in the model since the usage is UI specific (in comparison to the other convenience functions).

Copy link
Contributor Author

@Pururun Pururun left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @albin-mullvad)


android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/TunnelState.kt line 36 at r1 (raw file):

Previously, albin-mullvad wrote…

The only difference from isSecured seem to be actionAfterDisconnect, right? Are we sure these two functions should be the same (in other words skip this one)?

Also, I'm not sure this function in it's current state belongs in the model since the usage is UI specific (in comparison to the other convenience functions).

I checked the desktop app and they do not seems to care about actionAfterDisconnect so I will just use isSecuredinstead.

@Pururun Pururun force-pushed the welcome-screen-does-not-display-disconnect-button-when-droid-884 branch from 786bcd1 to 6dfa486 Compare June 19, 2024 11:28
Copy link
Contributor Author

@Pururun Pururun left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: 1 of 6 files reviewed, 1 unresolved discussion (waiting on @albin-mullvad)


android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/TunnelState.kt line 36 at r1 (raw file):

Previously, Pururun (Jonatan Rhodin) wrote…

I checked the desktop app and they do not seems to care about actionAfterDisconnect so I will just use isSecuredinstead.

Done

Copy link
Collaborator

@albin-mullvad albin-mullvad left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

Reviewed 5 of 5 files at r2, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved


android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/TunnelState.kt line 36 at r1 (raw file):

Previously, Pururun (Jonatan Rhodin) wrote…

Done

Great! 👍

@Pururun Pururun force-pushed the welcome-screen-does-not-display-disconnect-button-when-droid-884 branch from 6dfa486 to 00511a0 Compare June 19, 2024 12:53
@Pururun Pururun force-pushed the welcome-screen-does-not-display-disconnect-button-when-droid-884 branch from 00511a0 to 15d3767 Compare June 19, 2024 15:54
@Pururun Pururun merged commit 52efdbe into main Jun 19, 2024
26 checks passed
@Pururun Pururun deleted the welcome-screen-does-not-display-disconnect-button-when-droid-884 branch June 19, 2024 20:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Android Issues related to Android
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants