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

Remove update available message #6428

Merged

Conversation

albin-mullvad
Copy link
Collaborator

@albin-mullvad albin-mullvad commented Jul 1, 2024

This PR aims to remove the update available message from the in-app notification and settings. Instead of showing it in settings we'll instead just show the unsupported message.


This change is Reviewable

Copy link

linear bot commented Jul 1, 2024

@albin-mullvad albin-mullvad added the Android Issues related to Android label Jul 1, 2024
@albin-mullvad albin-mullvad self-assigned this Jul 1, 2024
Copy link
Contributor

@Rawa Rawa left a comment

Choose a reason for hiding this comment

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

Reviewed 29 of 32 files at r1, 3 of 3 files at r2, all commit messages.
Reviewable status: all files reviewed, 3 unresolved discussions (waiting on @albin-mullvad)


android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreenTest.kt line 34 at r2 (raw file):

                            appVersion = "",
                            isLoggedIn = true,
                            isUnsupportedVersion = false,

Personally I think it is nicer to say isSupportedVersion instead of isUnsupportedVersion but I understand that we do actually care about if it is Unsupported, not the other way around.


android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/NavigationComposeCell.kt line 97 at r2 (raw file):

            painter = painterResource(id = R.drawable.icon_alert),
            modifier = Modifier.padding(end = Dimens.smallPadding),
            contentDescription = ""

Should be null if it is empty string.

Not sure why we use Image here, sure it is very similar to Icon but Icon is more intuitive. Created a ticket for us to fix uses of Image.


android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceListScreen.kt line 165 at r2 (raw file):

            dropUnlessResumed<Device> {
                // Logger.i("DeviceList: remove device: $it")
                Log.d("mullvad", "DeviceList: remove device: $it")

Remove? bad log?

@albin-mullvad albin-mullvad force-pushed the only-show-unsupported-version-in-settings-droid-1103 branch from d5403ad to 1c568e2 Compare July 2, 2024 19:08
@albin-mullvad albin-mullvad requested a review from Rawa July 2, 2024 19:42
Copy link
Collaborator Author

@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.

Reviewable status: 24 of 37 files reviewed, 2 unresolved discussions (waiting on @Rawa)


android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreenTest.kt line 34 at r2 (raw file):

Previously, Rawa (David Göransson) wrote…

Personally I think it is nicer to say isSupportedVersion instead of isUnsupportedVersion but I understand that we do actually care about if it is Unsupported, not the other way around.

Yeah, I agree. Fixed!


android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/NavigationComposeCell.kt line 97 at r2 (raw file):

Previously, Rawa (David Göransson) wrote…

Should be null if it is empty string.

Not sure why we use Image here, sure it is very similar to Icon but Icon is more intuitive. Created a ticket for us to fix uses of Image.

Fixed for now 👍 Let's improve as part of the new ticket


android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceListScreen.kt line 165 at r2 (raw file):

Previously, Rawa (David Göransson) wrote…

Remove? bad log?

Yeah, removed! 😄 committed by mistake when debugging the other issue I found

@albin-mullvad albin-mullvad force-pushed the only-show-unsupported-version-in-settings-droid-1103 branch from 0301242 to b5fa015 Compare July 2, 2024 19:46
Copy link
Contributor

@Rawa Rawa left a comment

Choose a reason for hiding this comment

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

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

@albin-mullvad albin-mullvad force-pushed the only-show-unsupported-version-in-settings-droid-1103 branch from b5fa015 to a6d23d4 Compare July 4, 2024 09:48
@albin-mullvad albin-mullvad merged commit 73bba2c into main Jul 4, 2024
27 checks passed
@albin-mullvad albin-mullvad deleted the only-show-unsupported-version-in-settings-droid-1103 branch July 4, 2024 09:49
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