Skip to content

fix: Restore relay selection after backup import #369

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

Merged
torlando-tech merged 2 commits into from
Jan 28, 2026
Merged

fix: Restore relay selection after backup import #369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d90bc37
Fix backup/restore missing relay (COLUMBA-3)
Jan 27, 2026
a39b255
refactor: move relay DataStore writes outside Room transaction
torlando-tech Jan 28, 2026
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 app/src/main/java/com/lxmf/messenger/migration/MigrationData.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@ data class ContactExport(
val isPinned: Boolean,
/** Contact status: ACTIVE, PENDING_IDENTITY, or UNRESOLVED (nullable for backward compatibility) */
val status: String? = null,
/** Whether this contact is the user's selected propagation node relay (nullable for backward compatibility) */
val isMyRelay: Boolean? = null,
)

/**
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/com/lxmf/messenger/migration/MigrationExporter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ class MigrationExporter
lastInteractionTimestamp = contact.lastInteractionTimestamp,
isPinned = contact.isPinned,
status = contact.status.name,
isMyRelay = contact.isMyRelay,
)
}
}
Expand Down
85 changes: 81 additions & 4 deletions app/src/main/java/com/lxmf/messenger/migration/MigrationImporter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import com.lxmf.messenger.data.db.entity.PeerIdentityEntity
import com.lxmf.messenger.data.model.InterfaceType
import com.lxmf.messenger.repository.SettingsRepository
import com.lxmf.messenger.reticulum.protocol.ReticulumProtocol
import com.lxmf.messenger.service.PropagationNodeManager
import dagger.hilt.android.qualifiers.ApplicationContext
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.first
Expand All @@ -43,6 +44,7 @@ class MigrationImporter
private val interfaceDatabase: InterfaceDatabase,
private val reticulumProtocol: ReticulumProtocol,
private val settingsRepository: SettingsRepository,
private val propagationNodeManager: PropagationNodeManager,
) {
companion object {
private const val TAG = "MigrationImporter"
Expand Down Expand Up @@ -142,6 +144,11 @@ class MigrationImporter
onProgress(0.92f)

importSettings(bundle.settings, txResult.themeIdMap)
onProgress(0.95f)

// Restore relay settings after both the DB transaction and settings import
// so DataStore writes are never inside a Room transaction scope.
restoreRelaySettings(txResult.restoredRelayHash)
onProgress(1.0f)

Log.i(TAG, "Migration import complete")
Expand Down Expand Up @@ -171,6 +178,8 @@ class MigrationImporter
val peerIdentitiesImported: Int,
val customThemesImported: Int,
val themeIdMap: Map<Long, Long>,
/** Destination hash of the relay contact restored from backup, if any. */
val restoredRelayHash: String?,
)

/**
Expand Down Expand Up @@ -207,7 +216,7 @@ class MigrationImporter
it.identityHash in importedIdentityHashes ||
database.localIdentityDao().identityExists(it.identityHash)
}
val contacts = importContacts(validContacts)
val contactResult = importContacts(validContacts)
onProgress(0.75f)

val announces = importAnnounces(bundle.announces)
Expand All @@ -219,7 +228,16 @@ class MigrationImporter
val (themes, idMap) = importCustomThemes(bundle.customThemes)
onProgress(0.82f)

return TransactionResult(identities, messages, contacts, announces, peerIdentities, themes, idMap)
return TransactionResult(
identities,
messages,
contactResult.imported,
announces,
peerIdentities,
themes,
idMap,
contactResult.relayHash,
)
}

private suspend fun importIdentities(
Expand Down Expand Up @@ -301,7 +319,10 @@ class MigrationImporter
return entities.size
}

private suspend fun importContacts(contacts: List<ContactExport>): Int {
private suspend fun importContacts(contacts: List<ContactExport>): ContactImportResult {
// Track relay restoration — written to DataStore after the transaction completes
var restoredRelayHash: String? = null

val entities =
contacts.map { contact ->
// Determine status: use exported value, or infer from publicKey for backward compatibility
Expand All @@ -318,6 +339,16 @@ class MigrationImporter
ContactStatus.ACTIVE
}

// Track which contact was the relay for settings restoration
val isMyRelay = contact.isMyRelay == true
if (isMyRelay) {
if (restoredRelayHash != null) {
Log.w(TAG, "Multiple relay contacts found in backup, using latest")
}
restoredRelayHash = contact.destinationHash
Log.d(TAG, "Found relay contact: ${contact.customNickname ?: contact.destinationHash.take(12)}")
}

ContactEntity(
destinationHash = contact.destinationHash,
identityHash = contact.identityHash,
Expand All @@ -330,11 +361,13 @@ class MigrationImporter
lastInteractionTimestamp = contact.lastInteractionTimestamp,
isPinned = contact.isPinned,
status = status,
isMyRelay = isMyRelay,
)
}
database.contactDao().insertContacts(entities)
Log.d(TAG, "Imported ${entities.size} contacts")
return entities.size

return ContactImportResult(entities.size, restoredRelayHash)
}

private suspend fun importAnnounces(announces: List<AnnounceExport>): Int {
Expand Down Expand Up @@ -406,6 +439,8 @@ class MigrationImporter
return imported
}

private data class ContactImportResult(val imported: Int, val relayHash: String?)

private data class ThemeImportResult(val imported: Int, val idMap: Map<Long, Long>)

private suspend fun importCustomThemes(themes: List<CustomThemeExport>): ThemeImportResult {
Expand Down Expand Up @@ -723,4 +758,46 @@ class MigrationImporter
) {
LegacySettingsImporter(settingsRepository).importAll(settings, themeIdMap)
}

/**
* Restore relay (propagation node) settings after the DB transaction and settings import.
*
* This runs AFTER importSettings, which may have already restored the relay preference
* from the backup's DataStore preferences. We only write from the contact's isMyRelay
* flag if importSettings didn't already restore a manual relay — this covers the case
* where an old backup has the contact flag but not the DataStore preference.
*
* If no relay was restored from either source and auto-select is enabled,
* trigger auto-selection so the user doesn't end up with no relay at all.
*/
private suspend fun restoreRelaySettings(restoredRelayHash: String?) {
try {
val manualRelay = settingsRepository.getManualPropagationNode()

if (manualRelay != null) {
// importSettings already restored the relay preference — nothing to do
Log.d(TAG, "Relay already restored from settings: $manualRelay")
return
}

if (restoredRelayHash != null) {
// Contact had isMyRelay=true but settings didn't include the preference
// (e.g., older backup format). Write it now.
settingsRepository.saveManualPropagationNode(restoredRelayHash)
settingsRepository.saveAutoSelectPropagationNode(false)
Log.d(TAG, "Restored manual propagation node from contact flag: $restoredRelayHash")
return
}

// No relay from either source — trigger auto-select if enabled
val isAutoSelect = settingsRepository.getAutoSelectPropagationNode()
if (isAutoSelect) {
Log.d(TAG, "No relay restored, auto-select enabled — triggering auto-selection")
propagationNodeManager.enableAutoSelect()
}
} catch (e: Exception) {
Log.w(TAG, "Failed to restore relay settings after import", e)
// Non-fatal — user can manually select a relay
}
}
}