summaryrefslogtreecommitdiffhomepage
path: root/android
diff options
context:
space:
mode:
authorAlbin <albin@mullvad.net>2023-05-22 16:02:25 +0200
committerAlbin <albin@mullvad.net>2023-05-22 16:02:25 +0200
commit520d35245f59fe36463d0170645bde8832d8ccf5 (patch)
tree419e3d26970a7fb41d06262c5f88a4a68d0517e3 /android
parent19ecc5e09d112b5a3486fc027f23b3f3a03b986e (diff)
parent5f920a156bb1dbae4513df2fca01134ffd369ba4 (diff)
downloadmullvadvpn-520d35245f59fe36463d0170645bde8832d8ccf5.tar.xz
mullvadvpn-520d35245f59fe36463d0170645bde8832d8ccf5.zip
Merge branch 'remove-purchasing-information-in-release-builds-droid-145'
Diffstat (limited to 'android')
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/OutOfTimeFragment.kt6
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/WelcomeFragment.kt6
2 files changed, 8 insertions, 4 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/OutOfTimeFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/OutOfTimeFragment.kt
index a4fc57b29b..18ac784f4b 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/OutOfTimeFragment.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/OutOfTimeFragment.kt
@@ -77,8 +77,10 @@ class OutOfTimeFragment : BaseFragment() {
view.findViewById<TextView>(R.id.account_credit_has_expired).text = buildString {
append(requireActivity().getString(R.string.account_credit_has_expired))
- append(" ")
- append(requireActivity().getString(R.string.add_time_to_account))
+ if (BuildConfig.BUILD_TYPE != BuildTypes.RELEASE) {
+ append(" ")
+ append(requireActivity().getString(R.string.add_time_to_account))
+ }
}
disconnectButton =
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/WelcomeFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/WelcomeFragment.kt
index b29fdc3d74..6aa4f45968 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/WelcomeFragment.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/WelcomeFragment.kt
@@ -78,8 +78,10 @@ class WelcomeFragment : BaseFragment() {
view.findViewById<TextView>(R.id.pay_to_start_using).text = buildString {
append(requireActivity().getString(R.string.pay_to_start_using))
- append(" ")
- append(requireActivity().getString(R.string.add_time_to_account))
+ if (BuildConfig.BUILD_TYPE != BuildTypes.RELEASE) {
+ append(" ")
+ append(requireActivity().getString(R.string.add_time_to_account))
+ }
}
sitePaymentButton =