Fix app not showing out of time screen even though time is up.

[Pururun]

---

This change is 

[linear]

DROID-493 App sometimes not redirect to the out-of-time screen

WhatsApp Image 2023-11-15 at 3.50.13 PM.jpeg

Steps for reproduce is not available but it seems if app get expiry update on account screen back button will redirect to connect screen instead of out of time screen

[Rawa]

Reviewed 4 of 8 files at r1, 1 of 2 files at r2, all commit messages.
Reviewable status: 5 of 8 files reviewed, 1 unresolved discussion (waiting on @Pururun)

---

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/TopBar.kt line 324 at r2 (raw file):

                                )
                            } else {
                                stringResource(id = R.string.expired)

Just reminder from daily to use the OutOfTime string resources as suggest by @albin-mullvad

[Pururun]

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

---

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/TopBar.kt line 324 at r2 (raw file):

Previously, Rawa (David Göransson) wrote…

Just reminder from daily to use the OutOfTime string resources as suggest by @albin-mullvad

Done.

[Rawa]

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

[albin-mullvad]

Reviewable status: all files reviewed, 2 unresolved discussions (waiting on @Pururun)

a discussion (no related file):
I'm a bit concerned about bringing this on the release branch due to it changing out we detect expiry/out-of-time scenario and how often we refresh it, so I would like to discuss it before we go ahead and merge it.

---

---

android/lib/resource/src/main/res/values/strings.xml line 246 at r2 (raw file):

    <string name="loading_connecting">Connecting...</string>
    <string name="loading_verifying">Verifying purchase...</string>
    <string name="expired">Expired</string>

We can probably use the "Out of time" string instead since this is just a fallback

[Pururun]

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

a discussion (no related file):

Previously, albin-mullvad wrote…

I'm a bit concerned about bringing this on the release branch due to it changing out we detect expiry/out-of-time scenario and how often we refresh it, so I would like to discuss it before we go ahead and merge it.

Since this is as far as I can tell is behaviour that we have had in the app for quite some time, we could not include the fix.

---

---

android/lib/resource/src/main/res/values/strings.xml line 246 at r2 (raw file):

Previously, albin-mullvad wrote…

We can probably use the "Out of time" string instead since this is just a fallback

Yes that was removed, I think it is just being reviewable showing that it is still there?

[Pururun]

I am closing this one since the change to out of time behaviour will be added in: #5400

If we really want to change this behaviour before we merge that PR, we can open a new PR again from this branch.