Skip to content

Commit cdc3320

Browse files
authored
android: use a coroutine for loadfiles (#555)
* android: use a coroutine for loadfiles contentResolver.query is attempting to perform a network query on the main thread. Move this to a coroutine to prevent blocking. Fixes tailscale/corp#24293 Signed-off-by: kari-ts <[email protected]> (cherry picked from commit 0b01eb1) * android: bumping OSS OSS and Version updated to 1.77.75-td4222fae9-gc543614f10a Signed-off-by: kari-ts <[email protected]> --------- Signed-off-by: kari-ts <[email protected]>
1 parent 2740433 commit cdc3320

File tree

4 files changed

+9
-11
lines changed

4 files changed

+9
-11
lines changed

android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ android {
3838
minSdkVersion 26
3939
targetSdkVersion 34
4040
versionCode 310
41-
versionName "1.76.2-t088d78591-gfafffd2aeba"
41+
versionName "1.77.75-td4222fae9-gc543614f10a"
4242

4343
// This setting, which defaults to 'true', will cause Tailscale to fall
4444
// back to the Google DNS servers if it cannot determine what the

android/src/main/java/com/tailscale/ipn/ShareActivity.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,18 @@ import androidx.activity.compose.setContent
1414
import androidx.compose.material3.MaterialTheme
1515
import androidx.compose.material3.Surface
1616
import androidx.compose.ui.Modifier
17+
import androidx.lifecycle.lifecycleScope
1718
import com.tailscale.ipn.ui.model.Ipn
1819
import com.tailscale.ipn.ui.theme.AppTheme
1920
import com.tailscale.ipn.ui.util.set
2021
import com.tailscale.ipn.ui.util.universalFit
2122
import com.tailscale.ipn.ui.view.TaildropView
2223
import com.tailscale.ipn.util.TSLog
24+
import kotlinx.coroutines.Dispatchers
2325
import kotlinx.coroutines.flow.MutableStateFlow
2426
import kotlinx.coroutines.flow.StateFlow
27+
import kotlinx.coroutines.launch
28+
import kotlinx.coroutines.withContext
2529
import kotlin.random.Random
2630

2731
// ShareActivity is the entry point for Taildrop share intents
@@ -47,7 +51,7 @@ class ShareActivity : ComponentActivity() {
4751
super.onStart()
4852
// Ensure our app instance is initialized
4953
App.get()
50-
loadFiles()
54+
lifecycleScope.launch { withContext(Dispatchers.IO) { loadFiles() } }
5155
}
5256

5357
override fun onNewIntent(intent: Intent) {

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
github.com/tailscale/wireguard-go v0.0.0-20240905161824-799c1978fafc
77
golang.org/x/mobile v0.0.0-20240806205939-81131f6468ab
88
inet.af/netaddr v0.0.0-20220617031823-097006376321
9-
tailscale.com v1.76.2-0.20241017163834-088d78591c81
9+
tailscale.com v1.75.0-pre.0.20241103175838-d4222fae95c0
1010
)
1111

1212
require (

go.sum

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -256,11 +256,5 @@ inet.af/netaddr v0.0.0-20220617031823-097006376321 h1:B4dC8ySKTQXasnjDTMsoCMf1sQ
256256
inet.af/netaddr v0.0.0-20220617031823-097006376321/go.mod h1:OIezDfdzOgFhuw4HuWapWq2e9l0H9tK4F1j+ETRtF3k=
257257
software.sslmate.com/src/go-pkcs12 v0.4.0 h1:H2g08FrTvSFKUj+D309j1DPfk5APnIdAQAB8aEykJ5k=
258258
software.sslmate.com/src/go-pkcs12 v0.4.0/go.mod h1:Qiz0EyvDRJjjxGyUQa2cCNZn/wMyzrRJ/qcDXOQazLI=
259-
tailscale.com v1.75.0-pre.0.20241009122300-f6d4d03355eb h1:Sj+gV1UTEu0C72EI3rSGoSJPE/i+qTKgnUWgtb611y8=
260-
tailscale.com v1.75.0-pre.0.20241009122300-f6d4d03355eb/go.mod h1:myCwmhYBvMCF/5OgBYuIW42zscuEo30bAml7wABVZLk=
261-
tailscale.com v1.76.0 h1:6fS66odV7LySVzS2ZmJebWETeS26grV8iaKZfWgXaPA=
262-
tailscale.com v1.76.0/go.mod h1:myCwmhYBvMCF/5OgBYuIW42zscuEo30bAml7wABVZLk=
263-
tailscale.com v1.76.1-0.20241015182059-24929f6b6111 h1:EfNlWDTa4Togeo0XIIvmn41A/8hfD4vEBxw3PDeT88o=
264-
tailscale.com v1.76.1-0.20241015182059-24929f6b6111/go.mod h1:myCwmhYBvMCF/5OgBYuIW42zscuEo30bAml7wABVZLk=
265-
tailscale.com v1.76.2-0.20241017163834-088d78591c81 h1:AI7VyXSymn58THiEAYPhcze6LpiqzjY9WFdT9PmJXtU=
266-
tailscale.com v1.76.2-0.20241017163834-088d78591c81/go.mod h1:myCwmhYBvMCF/5OgBYuIW42zscuEo30bAml7wABVZLk=
259+
tailscale.com v1.75.0-pre.0.20241103175838-d4222fae95c0 h1:WildwJotNyCEDvdjPZVmR1RHuX09jF31LrAvL0IpILE=
260+
tailscale.com v1.75.0-pre.0.20241103175838-d4222fae95c0/go.mod h1:myCwmhYBvMCF/5OgBYuIW42zscuEo30bAml7wABVZLk=

0 commit comments

Comments
 (0)