Fix dispatcher

flipperdevices · Oct 6, 2021 · 7f8e3fb · 7f8e3fb
1 parent 783daad
commit 7f8e3fb
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 20 deletions.
diff --git a/...ents/pair/impl/src/main/java/com/flipper/pair/impl/findcompanion/CompanionFindFragment.kt b/...ents/pair/impl/src/main/java/com/flipper/pair/impl/findcompanion/CompanionFindFragment.kt
@@ -9,7 +9,6 @@ import android.content.Context
 import android.content.IntentSender
 import android.os.Build
 import android.os.Bundle
-import android.view.View
 import androidx.activity.result.ActivityResult
 import androidx.activity.result.IntentSenderRequest
 import androidx.activity.result.contract.ActivityResultContracts
@@ -80,8 +79,8 @@ class CompanionFindFragment : ComposeFragment() {
         }
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
+    override fun onResume() {
+        super.onResume()
         openFindDeviceDialog()
     }
 

diff --git a/.../pair/impl/src/main/java/com/flipper/pair/impl/findcompanion/compose/ComposeFindDevice.kt b/.../pair/impl/src/main/java/com/flipper/pair/impl/findcompanion/compose/ComposeFindDevice.kt
@@ -59,22 +59,18 @@ fun ComposeFindDevice(
             TextButton(onClick = onClickBackButton) {
                 Text(stringResource(R.string.pair_companion_back_button))
             }
-            if (connectionState == null ||
-                connectionState is ConnectionState.Disconnecting ||
-                connectionState is ConnectionState.Disconnected
-            ) {
-                IconButton(onClick = onClickRefreshButton) {
-                    Icon(
-                        painter = painterResource(
-                            if (errorText != null) {
-                                R.drawable.ic_sync_problem
-                            } else {
-                                R.drawable.ic_sync
-                            }
-                        ),
-                        contentDescription = stringResource(R.string.pair_companion_pic_update)
-                    )
-                }
+
+            IconButton(onClick = onClickRefreshButton) {
+                Icon(
+                    painter = painterResource(
+                        if (errorText != null) {
+                            R.drawable.ic_sync_problem
+                        } else {
+                            R.drawable.ic_sync
+                        }
+                    ),
+                    contentDescription = stringResource(R.string.pair_companion_pic_update)
+                )
             }
         }
     }

diff --git a/...l/src/main/java/com/flipper/pair/impl/navigation/machine/PairScreenStateDispatcherImpl.kt b/...l/src/main/java/com/flipper/pair/impl/navigation/machine/PairScreenStateDispatcherImpl.kt
@@ -57,6 +57,7 @@ class PairScreenStateDispatcherImpl @Inject constructor(
         val prevState = stateStack.pop()
         val screen = getScreenForStateUnsafe(prevState) ?: error("Call back on finish state")
         router.replaceScreen(screen)
+        currentState = prevState
     }
 
     /**

diff --git a/.../pair/impl/src/main/java/com/flipper/pair/impl/navigation/storage/PairStateStorageImpl.kt b/.../pair/impl/src/main/java/com/flipper/pair/impl/navigation/storage/PairStateStorageImpl.kt
@@ -29,7 +29,7 @@ class PairStateStorageImpl @Inject constructor(
             tosAccepted = tosAccepted,
             devicePaired = devicePaired,
             permissionGranted = permissionGranted,
-            guidePassed = true // Temporary disabled
+            guidePassed = devicePaired
         )
     }