From 201fb7a4484eb78f229f09870907e1d2c2e757f1 Mon Sep 17 00:00:00 2001 From: Vitor Hugo Schwaab Date: Thu, 26 Oct 2023 15:33:48 +0200 Subject: [PATCH 1/2] Commit with unresolved merge conflicts outside of --- .../wire/kalium/logic/sync/slow/SlowSyncManager.kt | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/slow/SlowSyncManager.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/slow/SlowSyncManager.kt index 96a6db6ec49..9ec10ba0a33 100644 --- a/logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/slow/SlowSyncManager.kt +++ b/logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/slow/SlowSyncManager.kt @@ -152,10 +152,22 @@ internal class SlowSyncManager( } private companion object { + /** + * The current version of Slow Sync. + * + * By bumping this version, we can force all clients to perform a new Slow Sync. + * Useful when a new step is added to Slow Sync, or when we fix some bug in Slow Sync, + * and we'd like to get all users to take advantage of the fix. + */ + const val CURRENT_VERSION = 5 + val MIN_RETRY_DELAY = 1.seconds val MAX_RETRY_DELAY = 10.minutes val MIN_TIME_BETWEEN_SLOW_SYNCS = 7.days } } +<<<<<<< HEAD const val CURRENT_VERSION = 5 // bump this version to perform slow sync when some new feature flag was added +======= +>>>>>>> 8f733ec373 (chore(sync): bump slow sync version (WPB-5057) (#2173)) From 00bec2c651d647b6298ffb149d1fd6646e039862 Mon Sep 17 00:00:00 2001 From: Vitor Hugo Schwaab Date: Thu, 26 Oct 2023 15:38:33 +0200 Subject: [PATCH 2/2] chore: bump slow sync version to 6 Develop was bumped to 5, and RC also was bumped to 5. We need to make Develop to 6 so it will trigger an update on the next release from develop. --- .../com/wire/kalium/logic/sync/slow/SlowSyncManager.kt | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/slow/SlowSyncManager.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/slow/SlowSyncManager.kt index 9ec10ba0a33..79fffcb023a 100644 --- a/logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/slow/SlowSyncManager.kt +++ b/logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/slow/SlowSyncManager.kt @@ -159,15 +159,10 @@ internal class SlowSyncManager( * Useful when a new step is added to Slow Sync, or when we fix some bug in Slow Sync, * and we'd like to get all users to take advantage of the fix. */ - const val CURRENT_VERSION = 5 + const val CURRENT_VERSION = 6 val MIN_RETRY_DELAY = 1.seconds val MAX_RETRY_DELAY = 10.minutes val MIN_TIME_BETWEEN_SLOW_SYNCS = 7.days } } -<<<<<<< HEAD - -const val CURRENT_VERSION = 5 // bump this version to perform slow sync when some new feature flag was added -======= ->>>>>>> 8f733ec373 (chore(sync): bump slow sync version (WPB-5057) (#2173))