feat: Added a resolvable ContextWrapper chain, enhanced dialog display logic, avoided self-referencing cycles, and logged diagnostics.

Author: dsfkjlweuyr

app/src/main/java/io/nekohasekai/sagernet/ktx/Dialogs.kt

@@ -2,6 +2,7 @@ package io.nekohasekai.sagernet.ktx
 
 import android.app.Activity
 import android.content.Context
+import android.content.ContextWrapper
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.Fragment
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
@@ -16,13 +17,53 @@ fun Context.alert(text: String): AlertDialog {
 
 fun Fragment.alert(text: String) = requireContext().alert(text)
 
+internal fun Context.resolveActivity(): WrappedHostResolution<Activity> = resolveWrappedHost(
+    initial = this,
+    hostOrNull = { it as? Activity },
+    baseOrNull = { (it as? ContextWrapper)?.baseContext },
+)
+
 fun AlertDialog.tryToShow() {
+    val initialContext = context
+    val resolution = initialContext.resolveActivity()
+    val activity = resolution.host
+    if (activity == null) {
+        Logs.w(
+            "AlertDialog.tryToShow skipped: no Activity host; " +
+                    "initialContext=${initialContext.javaClass.name}, " +
+                    "wrapperDepth=${resolution.wrapperDepth}, " +
+                    "loopDetected=${resolution.loopDetected}"
+        )
+        return
+    }
+    if (activity.isFinishing) {
+        Logs.w(
+            "AlertDialog.tryToShow skipped: Activity is finishing; " +
+                    "initialContext=${initialContext.javaClass.name}, " +
+                    "wrapperDepth=${resolution.wrapperDepth}, " +
+                    "activity=${activity.javaClass.name}"
+        )
+        return
+    }
+    if (activity.isDestroyed) {
+        Logs.w(
+            "AlertDialog.tryToShow skipped: Activity is destroyed; " +
+                    "initialContext=${initialContext.javaClass.name}, " +
+                    "wrapperDepth=${resolution.wrapperDepth}, " +
+                    "activity=${activity.javaClass.name}"
+        )
+        return
+    }
+
+    Logs.i(
+        "AlertDialog.tryToShow resolved host: " +
+                "initialContext=${initialContext.javaClass.name}, " +
+                "wrapperDepth=${resolution.wrapperDepth}, " +
+                "activity=${activity.javaClass.name}"
+    )
     try {
-        val activity = context as Activity
-        if (!activity.isFinishing) {
-            show()
-        }
+        show()
     } catch (e: Exception) {
-        Logs.e(e)
+        Logs.e("AlertDialog.tryToShow failed while showing on a resolved Activity", e)
     }
 }

app/src/main/java/io/nekohasekai/sagernet/ktx/WrappedHostResolver.kt

@@ -0,0 +1,31 @@
+package io.nekohasekai.sagernet.ktx
+
+import java.util.Collections
+import java.util.IdentityHashMap
+
+internal data class WrappedHostResolution<Host : Any>(
+    val host: Host?,
+    val wrapperDepth: Int,
+    val loopDetected: Boolean,
+)
+
+internal fun <Node : Any, Host : Any> resolveWrappedHost(
+    initial: Node,
+    hostOrNull: (Node) -> Host?,
+    baseOrNull: (Node) -> Node?,
+): WrappedHostResolution<Host> {
+    val visited = Collections.newSetFromMap(IdentityHashMap<Node, Boolean>())
+    var current = initial
+    var wrapperDepth = 0
+
+    while (visited.add(current)) {
+        hostOrNull(current)?.let {
+            return WrappedHostResolution(it, wrapperDepth, loopDetected = false)
+        }
+        current = baseOrNull(current)
+            ?: return WrappedHostResolution(null, wrapperDepth, loopDetected = false)
+        wrapperDepth++
+    }
+
+    return WrappedHostResolution(null, wrapperDepth, loopDetected = true)
+}

app/src/test/java/io/nekohasekai/sagernet/ktx/WrappedHostResolverTest.kt

@@ -0,0 +1,56 @@
+package io.nekohasekai.sagernet.ktx
+
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertNull
+import org.junit.Assert.assertSame
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+class WrappedHostResolverTest {
+
+    private open class FakeContext
+
+    private class FakeActivity : FakeContext()
+
+    private class FakeContextWrapper(var base: FakeContext) : FakeContext()
+
+    private fun resolve(context: FakeContext) = resolveWrappedHost(
+        initial = context,
+        hostOrNull = { it as? FakeActivity },
+        baseOrNull = { (it as? FakeContextWrapper)?.base },
+    )
+
+    @Test
+    fun themedContextWrappersResolveActivityHost() {
+        val activity = FakeActivity()
+        val themedContext = FakeContextWrapper(FakeContextWrapper(activity))
+
+        val resolution = resolve(themedContext)
+
+        assertSame(activity, resolution.host)
+        assertEquals(2, resolution.wrapperDepth)
+        assertFalse(resolution.loopDetected)
+    }
+
+    @Test
+    fun contextWithoutActivityReturnsNoHost() {
+        val resolution = resolve(FakeContextWrapper(FakeContext()))
+
+        assertNull(resolution.host)
+        assertEquals(1, resolution.wrapperDepth)
+        assertFalse(resolution.loopDetected)
+    }
+
+    @Test
+    fun selfReferencingWrapperDoesNotLoop() {
+        val wrapper = FakeContextWrapper(FakeContext())
+        wrapper.base = wrapper
+
+        val resolution = resolve(wrapper)
+
+        assertNull(resolution.host)
+        assertEquals(1, resolution.wrapperDepth)
+        assertTrue(resolution.loopDetected)
+    }
+}

openspec/changes/fix-dialog-context-cast/tasks.md

@@ -1,8 +1,8 @@
 ## 1. 共享对话框诊断与修复批次
 
-- [ ] 1.1 在共享对话框工具中加入可测试的 ContextWrapper 链解析，防止自引用 wrapper 循环；为无宿主、finishing、destroyed 与显示异常分别加入不含错误正文的定向日志，以验证主题 wrapper 可解析到页面 Activity 的诊断假设。
-- [ ] 1.2 更新安全显示逻辑，仅在解析到未 finishing/未 destroyed 的 Activity 时显示，并保持现有异常日志作为生命周期竞态的最后防线；不改动规则更新和配置状态调用方的业务流程。
-- [ ] 1.3 补充自动化回归覆盖：主题包装 Context 可解析并显示、无 Activity Context 安全跳过、自引用 wrapper 不循环，以及不可用 Activity 不显示；若现有单元测试环境无法可靠构造 Android 窗口，则保留纯 Context 解析测试，并把显示行为纳入下一真机闸门。
+- [x] 1.1 在共享对话框工具中加入可测试的 ContextWrapper 链解析，防止自引用 wrapper 循环；为无宿主、finishing、destroyed 与显示异常分别加入不含错误正文的定向日志，以验证主题 wrapper 可解析到页面 Activity 的诊断假设。
+- [x] 1.2 更新安全显示逻辑，仅在解析到未 finishing/未 destroyed 的 Activity 时显示，并保持现有异常日志作为生命周期竞态的最后防线；不改动规则更新和配置状态调用方的业务流程。
+- [x] 1.3 补充自动化回归覆盖：主题包装 Context 可解析并显示、无 Activity Context 安全跳过、自引用 wrapper 不循环，以及不可用 Activity 不显示；若现有单元测试环境无法可靠构造 Android 窗口，则保留纯 Context 解析测试，并把显示行为纳入下一真机闸门。
 - [ ] 1.4 提交该最小批次后立即运行 GitHub Actions `CI / Build OSS APK`（执行 `app:testOssDebugUnitTest` 与 `app:assembleOssDebug`）；预期测试及 APK 编译通过，最低回传证据为 workflow/job 链接和失败时的完整 Gradle 错误片段。在结果返回前不继续追加实现改动。
 
 ## 2. 真机行为验证与规范收口