987f968 · opencode-android

app/src/main/java/soy/iko/opencode/data/network/EventStreamClient.kt+2−1

compare with master

unifiedsplit

@@ -25,6 +25,7 @@ import kotlinx.coroutines.isActive

25import kotlinx.coroutines.selects.onTimeout

26import kotlinx.coroutines.selects.select

27import java.io.IOException

28+import kotlin.random.Random

28

29

29/**

30/**

30 * Owns the single long-lived `GET /event` SSE subscription and exposes it as a hot

31 * Owns the single long-lived `GET /event` SSE subscription and exposes it as a hot

@@ -131,7 +132,7 @@ class EventStreamClient(

131 if (!isActive) break

132 if (!isActive) break

132 // Wait for the backoff, but allow a reconnect signal to cut it short.

133 // Wait for the backoff, but allow a reconnect signal to cut it short.

133 var signaled = false

134 var signaled = false

134− val jitter = (backoffMs * 0.2 * Math.random()).toLong()

135+ val jitter = (backoffMs * 0.2 * Random.nextDouble()).toLong()

135 select {

136 select {

136 reconnectSignal.onReceive { signaled = true }

137 reconnectSignal.onReceive { signaled = true }

137 onTimeout(backoffMs + jitter) { /* normal backoff elapsed */ }

138 onTimeout(backoffMs + jitter) { /* normal backoff elapsed */ }

app/src/main/java/soy/iko/opencode/data/network/OpencodeApiClient.kt+2−1

@@ -28,6 +28,7 @@ import io.ktor.client.request.setBody

28import io.ktor.http.ContentType

29import io.ktor.http.contentType

30import kotlinx.coroutines.delay

31+import kotlin.random.Random

31

32

32/**

33/**

33 * Request/response wrapper over the opencode REST endpoints. The long-lived `/event`

34 * Request/response wrapper over the opencode REST endpoints. The long-lived `/event`

@@ -171,7 +172,7 @@ internal suspend fun <T> withRetryInternal(

171 if (t is ClientRequestException) throw t

172 if (t is ClientRequestException) throw t

172 if (attempt < maxAttempts) {

173 if (attempt < maxAttempts) {

173 val baseDelay = initialDelayMs * (1 shl (attempt - 1))

174 val baseDelay = initialDelayMs * (1 shl (attempt - 1))

174− val jitter = (baseDelay * jitterFactor * Math.random()).toLong()

175+ val jitter = (baseDelay * jitterFactor * Random.nextDouble()).toLong()

175 delay(baseDelay + jitter)

176 delay(baseDelay + jitter)

176 }

177 }

178 }

app/src/main/java/soy/iko/opencode/data/repo/CrashLogger.kt+1−1

@@ -76,7 +76,7 @@ class CrashLogger private constructor(private val appContext: Context) {

76 }

77

78 fun clearAll() {

79− crashDir.listFiles()?.forEach { it.delete() }

79+ crashDir.listFiles { f -> f.isFile && f.name.endsWith(".txt") }?.forEach { it.delete() }

80 refresh()

81 }

82

app/src/main/java/soy/iko/opencode/ui/components/MarkdownText.kt+1−1

@@ -54,7 +54,7 @@ fun MarkdownText(

54 Markdown(

55 content = markdown,

56 modifier = modifier.combinedClickable(

57− onClick = { copyToClipboard(context, markdown) },

57+ onClick = {},

58 onLongClick = { copyToClipboard(context, markdown) },

59 ),

60 components = markdownComponents(

app/src/main/java/soy/iko/opencode/ui/file/FileBrowserViewModel.kt+4

@@ -55,6 +55,10 @@ class FileBrowserViewModel(private val container: AppContainer) : ViewModel() {

55 container.activeConnection.collectLatest { conn ->

56 if (conn == null) return@collectLatest

57 loadStatus()

58+ // Re-open the current directory when a connection becomes available

59+ // so the initial open("") (which may have run before auto-reconnect

60+ // finished and found no connection) doesn't leave a stale error.

61+ open(_state.value.path)

58 }

62 }

59 }

63 }

60 }

64 }

app/src/main/java/soy/iko/opencode/ui/session/SessionListViewModel.kt+4

@@ -111,6 +111,10 @@ class SessionListViewModel(private val container: AppContainer) : ViewModel() {

111 container.activeConnection.collectLatest { conn ->

112 if (conn == null) return@collectLatest

113 _serverLabel.value = conn.profile.displayLabel

114+ // Reload the session list when a connection becomes available so the

115+ // initial load (which may have run before auto-reconnect finished and

116+ // found no connection) doesn't leave a stale "not connected" error.

117+ refresh()

114 conn.events.events.collect { event ->

118 conn.events.events.collect { event ->

115 when (event) {

119 when (event) {

116 is SessionUpdated -> {

120 is SessionUpdated -> {