archive
/
tailscale-android
mirror of https://github.com/tailscale/tailscale-android
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge cef7bae00b into d2c005f714

Browse Source
pull/690/merge
Doug Melton 3 months ago committed by GitHub
parent d2c005f714 cef7bae00b
commit 0d80010592
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 111 additions and 17 deletions
Show Stats Download Patch File Download Diff File

10
android/src/main/AndroidManifest.xml
Unescape Escape View File

@ -131,6 +131,16 @@
android:value="true" />
</service>
<provider
android:name="androidx.core.content.FileProvider"
android:authorities="com.tailscale.ipn.fileprovider"
android:exported="false"
android:grantUriPermissions="true">
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/file_paths" />
</provider>
<meta-data
android:name="android.content.APP_RESTRICTIONS"
android:resource="@xml/app_restrictions" />

18
android/src/main/java/com/tailscale/ipn/App.kt
Unescape Escape View File

@ -45,6 +45,7 @@ import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import kotlinx.serialization.encodeToString
import kotlinx.serialization.json.Json
import libtailscale.Libtailscale
@ -52,6 +53,8 @@ import java.io.IOException
import java.net.NetworkInterface
import java.security.GeneralSecurityException
import java.util.Locale
import kotlin.time.Duration.Companion.hours
class App : UninitializedApp(), libtailscale.AppContext, ViewModelStoreOwner {
val applicationScope = CoroutineScope(SupervisorJob() + Dispatchers.Default)
companion object {
@ -178,6 +181,9 @@ class App : UninitializedApp(), libtailscale.AppContext, ViewModelStoreOwner {
applicationScope.launch {
val hideDisconnectAction = MDMSettings.forceEnabled.flow.first()
}
applicationScope.launch {
cleanupOldCacheFiles()
}
TSLog.init(this)
FeatureFlags.initialize(mapOf("enable_new_search" to true))
}
@ -335,6 +341,18 @@ class App : UninitializedApp(), libtailscale.AppContext, ViewModelStoreOwner {
fun notifyPolicyChanged() {
app.notifyPolicyChanged()
}
suspend fun cleanupOldCacheFiles() {
val maxAgeMs = 1.hours.inWholeMilliseconds
val cutoffTime = System.currentTimeMillis() - maxAgeMs
withContext(Dispatchers.IO) {
cacheDir.listFiles()?.forEach { file ->
if (file.name.startsWith("shared_text_") && file.lastModified() < cutoffTime) {
file.delete()
}
}
}
}
}
/**
* UninitializedApp contains all of the methods of App that can be used without having to initialize

96
android/src/main/java/com/tailscale/ipn/ShareActivity.kt
Unescape Escape View File

@ -3,6 +3,7 @@
package com.tailscale.ipn
import android.content.Context
import android.content.Intent
import android.net.Uri
import android.os.Build
@ -14,6 +15,7 @@ import androidx.activity.compose.setContent
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
import androidx.compose.ui.Modifier
import androidx.core.content.FileProvider
import androidx.lifecycle.lifecycleScope
import com.tailscale.ipn.ui.model.Ipn
import com.tailscale.ipn.ui.theme.AppTheme
@ -27,6 +29,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import java.io.File
// ShareActivity is the entry point for Taildrop share intents
class ShareActivity : ComponentActivity() {
@ -57,11 +60,13 @@ class ShareActivity : ComponentActivity() {
override fun onNewIntent(intent: Intent) {
super.onNewIntent(intent)
setIntent(intent)
loadFiles()
lifecycleScope.launch {
loadFiles()
}
}
// Loads the files from the intent.
fun loadFiles() {
suspend fun loadFiles() {
if (intent == null) {
TSLog.e(TAG, "Share failure - No intent found")
return
@ -69,31 +74,37 @@ class ShareActivity : ComponentActivity() {
val act = intent.action
val uris: List<Uri?>? =
val uris: List<Uri> =
when (act) {
Intent.ACTION_SEND -> {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
listOf(intent.getParcelableExtra(Intent.EXTRA_STREAM, Uri::class.java))
} else {
@Suppress("DEPRECATION")
listOf(intent.getParcelableExtra(Intent.EXTRA_STREAM) as? Uri)
if (intent.extras?.containsKey(Intent.EXTRA_STREAM) == true) {
// If EXTRA_STREAM is present, get the single URI for that stream
listOfNotNull(intent.versionSafeGetStreamUri())
}
else if (intent.extras?.containsKey(Intent.EXTRA_TEXT) == true) {
// If EXTRA_TEXT is present, create a temporary file with the text content.
// This could be any shared text, like a URL or plain text from the clipboard.
val text = intent.getStringExtra(Intent.EXTRA_TEXT) ?: ""
val uri = createTemporaryFile(text)
listOf(uri)
}
else {
TSLog.e(TAG, "No extras found in intent - nothing to share")
emptyList()
}
}
Intent.ACTION_SEND_MULTIPLE -> {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
intent.getParcelableArrayListExtra<Uri?>(Intent.EXTRA_STREAM, Uri::class.java)
} else {
@Suppress("DEPRECATION") intent.getParcelableArrayListExtra<Uri?>(Intent.EXTRA_STREAM)
}
// If ACTION_SEND_MULTIPLE, assume this is a list of files to share
intent.versionSafeGetStreamUris()
}
else -> {
TSLog.e(TAG, "No extras found in intent - nothing to share")
null
TSLog.e(TAG, "Unexpected intent action: $act. Expected ACTION_SEND or ACTION_SEND_MULTIPLE")
emptyList()
}
}
val pendingFiles: List<Ipn.OutgoingFile> =
uris?.filterNotNull()?.mapNotNull { uri ->
uris.mapNotNull { uri ->
contentResolver?.query(uri, null, null, null, null)?.use { cursor ->
val nameCol = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME)
val sizeCol = cursor.getColumnIndex(OpenableColumns.SIZE)
@ -107,7 +118,7 @@ class ShareActivity : ComponentActivity() {
null
}
}
} ?: emptyList()
}
if (pendingFiles.isEmpty()) {
TSLog.e(TAG, "Share failure - no files extracted from intent")
@ -123,3 +134,54 @@ class ShareActivity : ComponentActivity() {
return if (extension != null) "$randomId.$extension" else randomId.toString()
}
}
private fun Intent.versionSafeGetStreamUri(): Uri? =
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
getParcelableExtra(Intent.EXTRA_STREAM, Uri::class.java)
}
else {
@Suppress("DEPRECATION")
getParcelableExtra(Intent.EXTRA_STREAM) as? Uri
}
private fun Intent.versionSafeGetStreamUris(): List<Uri> =
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
getParcelableArrayListExtra<Uri?>(Intent.EXTRA_STREAM, Uri::class.java)
} else {
@Suppress("DEPRECATION")
getParcelableArrayListExtra<Uri?>(Intent.EXTRA_STREAM)
}
?.filterNotNull()
?: emptyList()
/**
* Creates a temporary txt file in the app's cache directory with the given content.
* Then grants temporary read permission to the file using FileProvider and returns its URI.
*/
private suspend fun Context.createTemporaryFile(
content: String,
dir: File = cacheDir,
fileName: String = "shared_text_${System.currentTimeMillis()}.txt",
): Uri {
// Create temporary file in cache directory
val tempFile = File(dir, fileName)
withContext(Dispatchers.IO) {
tempFile.writeText(content)
}
// Get content URI using FileProvider
val uri = FileProvider.getUriForFile(
this,
"${applicationContext.packageName}.fileprovider",
tempFile
)
// Grant temporary read permission
grantUriPermission(
packageName,
uri,
Intent.FLAG_GRANT_READ_URI_PERMISSION
)
return uri
}

4
android/src/main/res/xml/file_paths.xml
Unescape Escape View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<paths xmlns:android="http://schemas.android.com/apk/res/android">
<cache-path name="shared" path="/" />
</paths>
Write Preview
Loading…
Cancel
Save