Align internal and external notification expiry

[kl]

---

This change is 

[linear]

DROID-1347 Align notification threshold InApp & Android notification

[Rawa]

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

[Pururun]

Reviewed all commit messages.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @kl)

---

android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/accountexpiry/AccountExpiryNotificationProvider.kt line 62 at r1 (raw file):

    companion object {
        private val REMAINING_TIME_FOR_REMINDERS = Duration.standardDays(3)

I think that we either should reference the other constant or use the same since otherwise it is quite easy to forget that they should be the same.

[kl]

Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @Pururun)

---

android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/accountexpiry/AccountExpiryNotificationProvider.kt line 62 at r1 (raw file):

Previously, Pururun (Jonatan Rhodin) wrote…

I think that we either should reference the other constant or use the same since otherwise it is quite easy to forget that they should be the same.

I agree but ACCOUNT\_EXPIRY\_CLOSE\_TO\_EXPIRY\_THRESHOLD is defined in the main module file AccountExpiryConstant.kt and REMAINING_TIME_FOR_REMINDERS is defined in the service module. So we cannot use the ACCOUNT\_EXPIRY\_CLOSE\_TO\_EXPIRY\_THRESHOLD constant in the AccountExpiryNotificationProvider file. Should we move the AccountExpiryConstant.kt file to the service module and have the use case reference the constants from there?

[Pururun]

Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @kl)

---

android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/accountexpiry/AccountExpiryNotificationProvider.kt line 62 at r1 (raw file):

Previously, kl (Kalle Lindström) wrote…

I agree but ACCOUNT\_EXPIRY\_CLOSE\_TO\_EXPIRY\_THRESHOLD is defined in the main module file AccountExpiryConstant.kt and REMAINING_TIME_FOR_REMINDERS is defined in the service module. So we cannot use the ACCOUNT\_EXPIRY\_CLOSE\_TO\_EXPIRY\_THRESHOLD constant in the AccountExpiryNotificationProvider file. Should we move the AccountExpiryConstant.kt file to the service module and have the use case reference the constants from there?

I think that is fine. Ideally we should have some common constant module similar to the model module, but that is beyond the scope of this PR.

[kl]

Reviewable status: 0 of 5 files reviewed, 1 unresolved discussion (waiting on @Pururun and @Rawa)

---

android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/accountexpiry/AccountExpiryNotificationProvider.kt line 62 at r1 (raw file):

Previously, Pururun (Jonatan Rhodin) wrote…

I think that is fine. Ideally we should have some common constant module similar to the model module, but that is beyond the scope of this PR.

Done.

[Pururun]

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