Fix keyboard height using stale orientation on init (#744)

Author: urikdev

app/src/main/java/com/urik/keyboard/service/PostureDetector.kt

@@ -49,6 +49,7 @@ class PostureDetector(private val context: Context, private val scope: Coroutine
 
     fun attachToWindow(windowCtx: Context) {
         windowContext = windowCtx
+        _postureInfo.value = getCurrentPostureInfo()
         try {
             windowInfoTracker = WindowInfoTracker.getOrCreate(windowCtx)
             fallbackJob?.cancel()
@@ -109,7 +110,8 @@ class PostureDetector(private val context: Context, private val scope: Coroutine
     }
 
     private fun updatePostureFromLayoutInfo(layoutInfo: androidx.window.layout.WindowLayoutInfo) {
-        val displayMetrics = context.resources.displayMetrics
+        val effectiveContext = windowContext ?: context
+        val displayMetrics = effectiveContext.resources.displayMetrics
         val widthPx = displayMetrics.widthPixels
         val heightPx = displayMetrics.heightPixels
         val density = displayMetrics.density
@@ -152,12 +154,13 @@ class PostureDetector(private val context: Context, private val scope: Coroutine
                 screenWidthPx = widthPx,
                 screenHeightPx = heightPx,
                 isTablet = isTablet,
-                orientation = context.resources.configuration.orientation
+                orientation = effectiveContext.resources.configuration.orientation
             )
     }
 
     private fun getCurrentPostureInfo(): PostureInfo {
-        val displayMetrics = context.resources.displayMetrics
+        val effectiveContext = windowContext ?: context
+        val displayMetrics = effectiveContext.resources.displayMetrics
         val widthPx = displayMetrics.widthPixels
         val heightPx = displayMetrics.heightPixels
         val density = displayMetrics.density
@@ -182,7 +185,7 @@ class PostureDetector(private val context: Context, private val scope: Coroutine
             screenWidthPx = widthPx,
             screenHeightPx = heightPx,
             isTablet = isTablet,
-            orientation = context.resources.configuration.orientation
+            orientation = effectiveContext.resources.configuration.orientation
         )
     }
 

app/src/test/java/com/urik/keyboard/service/PostureDetectorTest.kt

@@ -0,0 +1,47 @@
+package com.urik.keyboard.service
+
+import android.content.res.Configuration
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+
+@RunWith(RobolectricTestRunner::class)
+class PostureDetectorTest {
+    @Test
+    fun `attachToWindow syncs PostureInfo orientation from window context`() {
+        val app = RuntimeEnvironment.getApplication()
+        val scope = CoroutineScope(Dispatchers.Unconfined + SupervisorJob())
+
+        val landscapeConfig = Configuration(app.resources.configuration).apply {
+            orientation = Configuration.ORIENTATION_LANDSCAPE
+        }
+        val serviceContext = app.createConfigurationContext(landscapeConfig)
+
+        val detector = PostureDetector(serviceContext, scope)
+        detector.start()
+
+        assertEquals(
+            "Initial PostureInfo should reflect the (stale) service context orientation",
+            Configuration.ORIENTATION_LANDSCAPE,
+            detector.postureInfo.value.orientation
+        )
+
+        val portraitConfig = Configuration(app.resources.configuration).apply {
+            orientation = Configuration.ORIENTATION_PORTRAIT
+        }
+        val windowContext = app.createConfigurationContext(portraitConfig)
+
+        detector.attachToWindow(windowContext)
+
+        assertEquals(
+            "PostureInfo must update to window context orientation after attachToWindow",
+            Configuration.ORIENTATION_PORTRAIT,
+            detector.postureInfo.value.orientation
+        )
+    }
+}