fix: add FLAG_ACTIVITY_NEW_TASK when opening external URLs (v1.0.3)
This commit is contained in:
1 parent
d7a393e9c5
commit
68faad9a62
5 files changed
+32
-16
No files matched your search
@@ -11,8 +11,8 @@ android {
|
||||
applicationId = "com.lzxnone.tailscalemanager"
|
||||
minSdk = 28
|
||||
targetSdk = 36
|
||||
versionCode = 102
|
||||
versionName = "1.0.2"
|
||||
versionCode = 103
|
||||
versionName = "1.0.3"
|
||||
|
||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||
}
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
package com.lzxnone.tailscalemanager.core.util
|
||||
|
||||
import android.content.Context
|
||||
import android.content.Intent
|
||||
import android.net.Uri
|
||||
import android.widget.Toast
|
||||
|
||||
/**
|
||||
* Safely opens an external URL in the browser even when called from a wrapped
|
||||
* configuration Context rather than a direct Activity Context.
|
||||
*/
|
||||
fun openExternalUrl(context: Context, url: String): Boolean {
|
||||
if (url.isBlank()) return false
|
||||
return runCatching {
|
||||
val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url)).apply {
|
||||
addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
|
||||
}
|
||||
context.startActivity(intent)
|
||||
true
|
||||
}.onFailure { error ->
|
||||
val msg = error.localizedMessage ?: "Unable to open URL"
|
||||
Toast.makeText(context, msg, Toast.LENGTH_SHORT).show()
|
||||
}.getOrDefault(false)
|
||||
}
|
||||
@@ -3,9 +3,8 @@ package com.lzxnone.tailscalemanager.ui.components
|
||||
import android.content.ClipData
|
||||
import android.content.ClipboardManager
|
||||
import android.content.Context
|
||||
import android.content.Intent
|
||||
import android.net.Uri
|
||||
import android.widget.Toast
|
||||
import com.lzxnone.tailscalemanager.core.util.openExternalUrl
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.Column
|
||||
@@ -119,8 +118,7 @@ fun LoginDialog(
|
||||
|
||||
Button(
|
||||
onClick = {
|
||||
val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(loginUrl))
|
||||
context.startActivity(browserIntent)
|
||||
openExternalUrl(context, loginUrl)
|
||||
},
|
||||
modifier = Modifier.weight(1f)
|
||||
) {
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
package com.lzxnone.tailscalemanager.ui.screens
|
||||
|
||||
import android.content.Intent
|
||||
import android.net.Uri
|
||||
import androidx.compose.foundation.BorderStroke
|
||||
import com.lzxnone.tailscalemanager.core.util.openExternalUrl
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.clickable
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
@@ -262,8 +261,7 @@ fun AccountScreen(
|
||||
.fillMaxWidth()
|
||||
.clip(RoundedCornerShape(12.dp))
|
||||
.clickable {
|
||||
val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse("https://login.tailscale.com/admin"))
|
||||
context.startActivity(browserIntent)
|
||||
openExternalUrl(context, "https://login.tailscale.com/admin")
|
||||
}
|
||||
.padding(vertical = 12.dp),
|
||||
verticalAlignment = Alignment.CenterVertically
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
package com.lzxnone.tailscalemanager.ui.screens
|
||||
|
||||
import android.content.Intent
|
||||
import android.net.Uri
|
||||
import androidx.activity.compose.BackHandler
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.foundation.layout.padding
|
||||
@@ -37,6 +35,7 @@ import com.lzxnone.tailscalemanager.ui.components.DeleteConfirmDialog
|
||||
import com.lzxnone.tailscalemanager.ui.components.EditHostnameDialog
|
||||
import com.lzxnone.tailscalemanager.ui.components.ExitNodeBottomSheet
|
||||
import com.lzxnone.tailscalemanager.ui.components.LoginDialog
|
||||
import com.lzxnone.tailscalemanager.core.util.openExternalUrl
|
||||
import com.lzxnone.tailscalemanager.ui.components.LogoutConfirmDialog
|
||||
import com.lzxnone.tailscalemanager.ui.components.ModuleSyncDialog
|
||||
import com.lzxnone.tailscalemanager.ui.components.RootMissingDialog
|
||||
@@ -241,10 +240,7 @@ fun MainScreen(
|
||||
AppUpdateDialog(
|
||||
updateInfo = appUpdateInfo,
|
||||
onDownload = { url ->
|
||||
try {
|
||||
val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
|
||||
context.startActivity(intent)
|
||||
} catch (_: Exception) {}
|
||||
openExternalUrl(context, url)
|
||||
viewModel.dismissAppUpdate()
|
||||
},
|
||||
onDismiss = { viewModel.dismissAppUpdate() },
|
||||
|
||||
Reference in new issue
Block a user