Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
68faad9a62 |
No files matched your search
@@ -11,8 +11,8 @@ android {
|
|||||||
applicationId = "com.lzxnone.tailscalemanager"
|
applicationId = "com.lzxnone.tailscalemanager"
|
||||||
minSdk = 28
|
minSdk = 28
|
||||||
targetSdk = 36
|
targetSdk = 36
|
||||||
versionCode = 102
|
versionCode = 103
|
||||||
versionName = "1.0.2"
|
versionName = "1.0.3"
|
||||||
|
|
||||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
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.ClipData
|
||||||
import android.content.ClipboardManager
|
import android.content.ClipboardManager
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.content.Intent
|
|
||||||
import android.net.Uri
|
|
||||||
import android.widget.Toast
|
import android.widget.Toast
|
||||||
|
import com.lzxnone.tailscalemanager.core.util.openExternalUrl
|
||||||
import androidx.compose.foundation.background
|
import androidx.compose.foundation.background
|
||||||
import androidx.compose.foundation.layout.Box
|
import androidx.compose.foundation.layout.Box
|
||||||
import androidx.compose.foundation.layout.Column
|
import androidx.compose.foundation.layout.Column
|
||||||
@@ -119,8 +118,7 @@ fun LoginDialog(
|
|||||||
|
|
||||||
Button(
|
Button(
|
||||||
onClick = {
|
onClick = {
|
||||||
val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(loginUrl))
|
openExternalUrl(context, loginUrl)
|
||||||
context.startActivity(browserIntent)
|
|
||||||
},
|
},
|
||||||
modifier = Modifier.weight(1f)
|
modifier = Modifier.weight(1f)
|
||||||
) {
|
) {
|
||||||
|
|||||||
@@ -1,8 +1,7 @@
|
|||||||
package com.lzxnone.tailscalemanager.ui.screens
|
package com.lzxnone.tailscalemanager.ui.screens
|
||||||
|
|
||||||
import android.content.Intent
|
|
||||||
import android.net.Uri
|
|
||||||
import androidx.compose.foundation.BorderStroke
|
import androidx.compose.foundation.BorderStroke
|
||||||
|
import com.lzxnone.tailscalemanager.core.util.openExternalUrl
|
||||||
import androidx.compose.foundation.background
|
import androidx.compose.foundation.background
|
||||||
import androidx.compose.foundation.clickable
|
import androidx.compose.foundation.clickable
|
||||||
import androidx.compose.foundation.layout.Arrangement
|
import androidx.compose.foundation.layout.Arrangement
|
||||||
@@ -262,8 +261,7 @@ fun AccountScreen(
|
|||||||
.fillMaxWidth()
|
.fillMaxWidth()
|
||||||
.clip(RoundedCornerShape(12.dp))
|
.clip(RoundedCornerShape(12.dp))
|
||||||
.clickable {
|
.clickable {
|
||||||
val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse("https://login.tailscale.com/admin"))
|
openExternalUrl(context, "https://login.tailscale.com/admin")
|
||||||
context.startActivity(browserIntent)
|
|
||||||
}
|
}
|
||||||
.padding(vertical = 12.dp),
|
.padding(vertical = 12.dp),
|
||||||
verticalAlignment = Alignment.CenterVertically
|
verticalAlignment = Alignment.CenterVertically
|
||||||
|
|||||||
@@ -1,7 +1,5 @@
|
|||||||
package com.lzxnone.tailscalemanager.ui.screens
|
package com.lzxnone.tailscalemanager.ui.screens
|
||||||
|
|
||||||
import android.content.Intent
|
|
||||||
import android.net.Uri
|
|
||||||
import androidx.activity.compose.BackHandler
|
import androidx.activity.compose.BackHandler
|
||||||
import androidx.compose.foundation.layout.fillMaxSize
|
import androidx.compose.foundation.layout.fillMaxSize
|
||||||
import androidx.compose.foundation.layout.padding
|
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.EditHostnameDialog
|
||||||
import com.lzxnone.tailscalemanager.ui.components.ExitNodeBottomSheet
|
import com.lzxnone.tailscalemanager.ui.components.ExitNodeBottomSheet
|
||||||
import com.lzxnone.tailscalemanager.ui.components.LoginDialog
|
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.LogoutConfirmDialog
|
||||||
import com.lzxnone.tailscalemanager.ui.components.ModuleSyncDialog
|
import com.lzxnone.tailscalemanager.ui.components.ModuleSyncDialog
|
||||||
import com.lzxnone.tailscalemanager.ui.components.RootMissingDialog
|
import com.lzxnone.tailscalemanager.ui.components.RootMissingDialog
|
||||||
@@ -241,10 +240,7 @@ fun MainScreen(
|
|||||||
AppUpdateDialog(
|
AppUpdateDialog(
|
||||||
updateInfo = appUpdateInfo,
|
updateInfo = appUpdateInfo,
|
||||||
onDownload = { url ->
|
onDownload = { url ->
|
||||||
try {
|
openExternalUrl(context, url)
|
||||||
val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
|
|
||||||
context.startActivity(intent)
|
|
||||||
} catch (_: Exception) {}
|
|
||||||
viewModel.dismissAppUpdate()
|
viewModel.dismissAppUpdate()
|
||||||
},
|
},
|
||||||
onDismiss = { viewModel.dismissAppUpdate() },
|
onDismiss = { viewModel.dismissAppUpdate() },
|
||||||
|
|||||||
Reference in new issue
Block a user