Merge branch 'add-navigationfalse-to-all-mullvadnet-links-droid-175'

5 files changed, 22 insertions, 5 deletions

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/NotificationWithUrl.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/NotificationWithUrl.kt
index c73ccd2a6b..cd0b0564ec 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/NotificationWithUrl.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/NotificationWithUrl.kt
@@ -5,9 +5,9 @@ import android.content.Intent
 import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
 import android.net.Uri
 
-abstract class NotificationWithUrl(protected val context: Context, urlId: Int) :
+abstract class NotificationWithUrl(protected val context: Context, urlString: String) :
     InAppNotification() {
-    private val url = Uri.parse(context.getString(urlId))
+    private val url = Uri.parse(urlString)
 
     protected val openUrl: suspend () -> Unit = {
         val intent = Intent(Intent.ACTION_VIEW, url).apply { flags = FLAG_ACTIVITY_NEW_TASK }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/VersionInfoNotification.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/VersionInfoNotification.kt
index 3407684831..862c59400d 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/VersionInfoNotification.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/VersionInfoNotification.kt
@@ -3,9 +3,13 @@ package net.mullvad.mullvadvpn.ui.notification
 import android.content.Context
 import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.ui.VersionInfo
+import net.mullvad.mullvadvpn.util.appendHideNavOnReleaseBuild
 
 class VersionInfoNotification(val isEnabled: Boolean, context: Context) :
-    NotificationWithUrl(context, R.string.download_url) {
+    NotificationWithUrl(
+        context,
+        context.getString(R.string.download_url).appendHideNavOnReleaseBuild()
+    ) {
     private val unsupportedVersion = context.getString(R.string.unsupported_version)
     private val updateAvailable = context.getString(R.string.update_available)
 
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AppVersionCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AppVersionCell.kt
index cb646a5e26..9c656f2471 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AppVersionCell.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AppVersionCell.kt
@@ -10,6 +10,7 @@ import android.widget.ImageView
 import android.widget.TextView
 import kotlin.properties.Delegates.observable
 import net.mullvad.mullvadvpn.R
+import net.mullvad.mullvadvpn.util.appendHideNavOnReleaseBuild
 
 class AppVersionCell : UrlCell {
     private val warningIcon =
@@ -67,7 +68,7 @@ class AppVersionCell : UrlCell {
         cell.addView(versionLabel, cell.getChildCount() - 1)
 
         if (url == null) {
-            url = Uri.parse(context.getString(R.string.download_url))
+            url = Uri.parse(context.getString(R.string.download_url).appendHideNavOnReleaseBuild())
         }
     }
 }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/UrlCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/UrlCell.kt
index 1d263901b5..d562e1dc79 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/UrlCell.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/UrlCell.kt
@@ -6,6 +6,7 @@ import android.net.Uri
 import android.util.AttributeSet
 import android.widget.ImageView
 import net.mullvad.mullvadvpn.R
+import net.mullvad.mullvadvpn.util.appendHideNavOnReleaseBuild
 
 open class UrlCell : Cell {
     private val externalLinkIcon =
@@ -35,7 +36,9 @@ open class UrlCell : Cell {
     private fun loadAttributes(attributes: AttributeSet?) {
         context.theme.obtainStyledAttributes(attributes, R.styleable.Url, 0, 0).apply {
             try {
-                getString(R.styleable.Url_url)?.let { urlString -> url = Uri.parse(urlString) }
+                getString(R.styleable.Url_url)?.let { urlString ->
+                    url = Uri.parse(urlString.appendHideNavOnReleaseBuild())
+                }
             } finally {
                 recycle()
             }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/StringExtensions.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/StringExtensions.kt
index c0139d9d2c..4fe7da3a8b 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/StringExtensions.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/StringExtensions.kt
@@ -1,5 +1,7 @@
 package net.mullvad.mullvadvpn.util
 
+import net.mullvad.mullvadvpn.BuildConfig
+import net.mullvad.mullvadvpn.constant.BuildTypes
 import org.joda.time.DateTime
 import org.joda.time.format.DateTimeFormat
 
@@ -18,3 +20,10 @@ fun String.parseAsDateTime(): DateTime? {
         null
     }
 }
+
+fun String.appendHideNavOnReleaseBuild(): String =
+    if (BuildTypes.RELEASE == BuildConfig.BUILD_TYPE) {
+        "$this?hide_nav"
+    } else {
+        this
+    }