Merge branch 'hide-account-page-links-in-release-droid-144'

3 files changed, 26 insertions, 6 deletions

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/AccountExpiryNotification.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/AccountExpiryNotification.kt
index ac3fbcb139..5db266ee66 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/AccountExpiryNotification.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/AccountExpiryNotification.kt
@@ -9,10 +9,13 @@ import android.net.Uri
 import androidx.core.app.NotificationCompat
 import kotlin.properties.Delegates.observable
 import kotlinx.coroutines.delay
+import net.mullvad.mullvadvpn.BuildConfig
 import net.mullvad.mullvadvpn.R
+import net.mullvad.mullvadvpn.constant.BuildTypes
 import net.mullvad.mullvadvpn.model.AccountExpiry
 import net.mullvad.mullvadvpn.service.MullvadDaemon
 import net.mullvad.mullvadvpn.service.endpoint.AccountCache
+import net.mullvad.mullvadvpn.ui.MainActivity
 import net.mullvad.mullvadvpn.util.Intermittent
 import net.mullvad.mullvadvpn.util.JobTracker
 import net.mullvad.mullvadvpn.util.SdkUtils
@@ -97,7 +100,14 @@ class AccountExpiryNotification(
             jobTracker.runOnBackground {
                 Uri.parse("$buyMoreTimeUrl?token=${daemon.await().getWwwAuthToken()}")
             }
-        val intent = Intent(Intent.ACTION_VIEW, url)
+        val intent =
+            if (BuildTypes.RELEASE == BuildConfig.BUILD_TYPE) {
+                Intent(context, MainActivity::class.java)
+                    .setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP)
+                    .setAction(Intent.ACTION_MAIN)
+            } else {
+                Intent(Intent.ACTION_VIEW, url)
+            }
         val pendingIntent =
             PendingIntent.getActivity(context, 1, intent, SdkUtils.getSupportedPendingIntentFlags())
 
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/AccountFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/AccountFragment.kt
index 80a8e0c184..09accbc826 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/AccountFragment.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/AccountFragment.kt
@@ -5,6 +5,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.view.isVisible
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
@@ -16,7 +17,9 @@ import kotlinx.coroutines.flow.emptyFlow
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
+import net.mullvad.mullvadvpn.BuildConfig
 import net.mullvad.mullvadvpn.R
+import net.mullvad.mullvadvpn.constant.BuildTypes
 import net.mullvad.mullvadvpn.model.TunnelState
 import net.mullvad.mullvadvpn.repository.AccountRepository
 import net.mullvad.mullvadvpn.repository.DeviceRepository
@@ -129,6 +132,7 @@ class AccountFragment : BaseFragment() {
                     checkForAddedTime()
                 }
             }
+        accountManagementButton.isVisible = BuildTypes.RELEASE != BuildConfig.BUILD_TYPE
 
         redeemVoucherButton =
             view.findViewById<RedeemVoucherButton>(R.id.redeem_voucher).apply {
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/ConnectFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/ConnectFragment.kt
index 803638caa8..86cbd3b49b 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/ConnectFragment.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/ConnectFragment.kt
@@ -12,7 +12,9 @@ import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
+import net.mullvad.mullvadvpn.BuildConfig
 import net.mullvad.mullvadvpn.R
+import net.mullvad.mullvadvpn.constant.BuildTypes
 import net.mullvad.mullvadvpn.model.TunnelState
 import net.mullvad.mullvadvpn.repository.AccountRepository
 import net.mullvad.mullvadvpn.ui.ConnectActionButton
@@ -72,11 +74,15 @@ class ConnectFragment : BaseFragment(), NavigationBarPainter {
                 tunnelState = connectViewModel.uiState.value.tunnelUiState
             }
 
-        accountExpiryNotification.onClick = {
-            serviceConnectionManager.authTokenCache()?.fetchAuthToken()?.let { token ->
-                val url = getString(R.string.account_url)
-                val ready = Uri.parse("$url?token=$token")
-                requireContext().startActivity(Intent(Intent.ACTION_VIEW, ready))
+        if (BuildTypes.RELEASE == BuildConfig.BUILD_TYPE) {
+            accountExpiryNotification.onClick = null
+        } else {
+            accountExpiryNotification.onClick = {
+                serviceConnectionManager.authTokenCache()?.fetchAuthToken()?.let { token ->
+                    val url = getString(R.string.account_url)
+                    val ready = Uri.parse("$url?token=$token")
+                    requireContext().startActivity(Intent(Intent.ACTION_VIEW, ready))
+                }
             }
         }