[1.213.*] Pre-release merge (#681)

msfjarvis · Oct 11, 2024 · 424b888 · 424b888
2 parents e84d08a + b2c2784
commit 424b888
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 13 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -36,7 +36,7 @@ jobs:
 
     - name: (Fail-only) Upload test report
       if: failure()
-      uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 # v4.4.1
+      uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
       with:
           name: Test report
           path: '**/build/reports/tests/**'

diff --git a/.github/workflows/tramline-release.yml b/.github/workflows/tramline-release.yml
@@ -35,7 +35,7 @@ jobs:
           ORG_GRADLE_PROJECT_VERSION_CODE: ${{ github.event.inputs.versionCode }}
 
       - name: Upload app bundle
-        uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 # v4.4.1
+        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
         with:
           name: release-aab
           path: android/build/outputs/bundle/release/android-release.aab
diff --git a/android/src/main/kotlin/dev/msfjarvis/claw/android/plugins/SentryAndroidPlugin.kt b/android/src/main/kotlin/dev/msfjarvis/claw/android/plugins/SentryAndroidPlugin.kt
@@ -17,7 +17,7 @@ import javax.inject.Inject
 class SentryAndroidPlugin @Inject constructor() : AppPlugin {
   override fun apply(application: Application) {
     SentryAndroid.init(application) { options ->
-      options.experimental.sessionReplay.errorSampleRate = 1.0
+      options.experimental.sessionReplay.onErrorSampleRate = 1.0
       options.experimental.sessionReplay.sessionSampleRate = 0.1
     }
   }

diff --git a/common/src/main/kotlin/dev/msfjarvis/claw/common/comments/CommentsHandler.kt b/common/src/main/kotlin/dev/msfjarvis/claw/common/comments/CommentsHandler.kt
@@ -47,14 +47,22 @@ internal class CommentsHandler {
   }
 
   fun updateListNode(shortId: String, isExpanded: Boolean) {
-    val listNode = _listItems.value.toMutableList()
-    val index = listNode.indexOfFirst { it.comment.shortId == shortId }
-
-    if (index != -1) {
-      val commentNode = listNode[index].copy(isExpanded = isExpanded)
-      listNode[index] = commentNode
+    fun updateNode(node: CommentNode): CommentNode {
+      if (node.comment.shortId == shortId) {
+        return node.copy(isExpanded = isExpanded)
+      }
+      val updatedChildren = node.children.map { updateNode(it) }.toMutableList()
+      return node.copy(children = updatedChildren)
+    }
 
-      _listItems.value = listNode.toList()
+    val listNode = _listItems.value.toMutableList()
+    for (i in listNode.indices) {
+      val node = listNode[i]
+      if (node.comment.shortId == shortId || node.children.any { it.comment.shortId == shortId }) {
+        listNode[i] = updateNode(node)
+        _listItems.value = listNode.toList()
+        return
+      }
     }
   }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -10,14 +10,14 @@ glance = "1.0.0"
 haze = "0.9.0-beta03"
 junit = "5.11.2"
 konvert = "3.2.2"
-kotlin = "2.0.20"
+kotlin = "2.0.21"
 kotlinResult = "2.0.0"
 leakcanary = "3.0-alpha-8"
 lifecycle = "2.8.6"
 navigation = "2.8.2"
 retrofit = "2.11.0"
 richtext = "1.0.0-alpha01"
-sentry-sdk = "7.14.0"
+sentry-sdk = "7.15.0"
 serialization = "1.7.3"
 store = "5.1.0-alpha04"
 sqldelight = "2.0.2"
@@ -125,7 +125,7 @@ dependencyAnalysis = "com.autonomousapps.dependency-analysis:2.1.4"
 invert = "com.squareup.invert:0.0.1-dev"
 kotlin-composeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
-ksp = "com.google.devtools.ksp:2.0.20-1.0.25"
+ksp = "com.google.devtools.ksp:2.0.21-1.0.25"
 licensee = "app.cash.licensee:1.11.0"
 modulegraphassert = "com.jraska.module.graph.assertion:2.7.1"
 navigation-safeargs = { id = "androidx.navigation.safeargs.kotlin", version.ref = "navigation" }