Skip to content

fix(sync): keep pasted connection data out of saved state #1853

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
A-EDev wants to merge 1 commit into
base: main
Choose a base branch
from
+45 −2
Open

fix(sync): keep pasted connection data out of saved state #1853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/nightly-notes/2026-11-07-fix-sync-connection-data-state.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
## Fixed
- Sync: connection data you paste is kept in memory only, so it is cleared if Android closes the app in the background
3 changes: 1 addition & 2 deletions app/src/main/java/io/github/aedev/flow/ui/screens/sync/SyncSetupContent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
Expand Down Expand Up @@ -164,7 +163,7 @@ internal fun SyncManualEntryContent(onSubmit: (String) -> Unit) {
val context = LocalContext.current
val clipboard = LocalClipboard.current
val scope = rememberCoroutineScope()
var connectionData by rememberSaveable { mutableStateOf("") }
var connectionData by remember { mutableStateOf("") }
val trimmedData = connectionData.trim()

SyncStepHeader(
Expand Down
42 changes: 42 additions & 0 deletions app/src/test/java/io/github/aedev/flow/ui/screens/sync/SyncManualEntryTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
package io.github.aedev.flow.ui.screens.sync

import android.app.Application
import android.content.Context
import androidx.compose.ui.test.assertIsEnabled
import androidx.compose.ui.test.assertIsNotEnabled
import androidx.compose.ui.test.junit4.StateRestorationTester
import androidx.compose.ui.test.junit4.v2.createComposeRule
import androidx.compose.ui.test.onNodeWithText
import androidx.compose.ui.test.performTextInput
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
import io.github.aedev.flow.R
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
import org.robolectric.annotation.Config

/** Pasting another device's connection data by hand. */
@RunWith(AndroidJUnit4::class)
@Config(sdk = [34], application = Application::class, qualifiers = "w360dp-h1600dp")
class SyncManualEntryTest {
@get:Rule
val rule = createComposeRule()

private val context: Context get() = ApplicationProvider.getApplicationContext()

private fun text(id: Int) = context.getString(id)

@Test
fun pasted_connection_data_is_not_kept_in_saved_state() {
val restoration = StateRestorationTester(rule)
restoration.setContent { SyncManualEntryContent(onSubmit = {}) }
rule.onNodeWithText(text(R.string.sync_connection_data_label)).performTextInput("typed data")
rule.onNodeWithText(text(R.string.sync_connect)).assertIsEnabled()

restoration.emulateSavedInstanceStateRestore()

rule.onNodeWithText("typed data").assertDoesNotExist()
rule.onNodeWithText(text(R.string.sync_connect)).assertIsNotEnabled()
}
}
Loading