Skip to content

Commit 1803b04

Browse files
authored
sync: smoother manager scoping (fixes #9031) (#9009)
1 parent 61dc5aa commit 1803b04

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ android {
99
applicationId "org.ole.planet.myplanet"
1010
minSdk = 26
1111
targetSdk = 36
12-
versionCode = 3718
13-
versionName = "0.37.18"
12+
versionCode = 3719
13+
versionName = "0.37.19"
1414
ndkVersion = '26.3.11579264'
1515
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1616
vectorDrawables.useSupportLibrary = true

app/src/main/java/org/ole/planet/myplanet/di/ServiceModule.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,10 @@ object ServiceModule {
4343
databaseService: DatabaseService,
4444
@AppPreferences preferences: SharedPreferences,
4545
apiInterface: ApiInterface,
46-
improvedSyncManager: Lazy<ImprovedSyncManager>
46+
improvedSyncManager: Lazy<ImprovedSyncManager>,
47+
@ApplicationScope scope: CoroutineScope
4748
): SyncManager {
48-
return SyncManager(context, databaseService, preferences, apiInterface, improvedSyncManager)
49+
return SyncManager(context, databaseService, preferences, apiInterface, improvedSyncManager, scope)
4950
}
5051

5152
@Provides

app/src/main/java/org/ole/planet/myplanet/service/SyncManager.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ import org.ole.planet.myplanet.datamanager.ApiInterface
3737
import org.ole.planet.myplanet.datamanager.DatabaseService
3838
import org.ole.planet.myplanet.datamanager.ManagerSync
3939
import org.ole.planet.myplanet.di.AppPreferences
40+
import org.ole.planet.myplanet.di.ApplicationScope
4041
import org.ole.planet.myplanet.model.RealmMeetup.Companion.insert
4142
import org.ole.planet.myplanet.model.RealmMyCourse.Companion.insertMyCourses
4243
import org.ole.planet.myplanet.model.RealmMyCourse.Companion.saveConcatenatedLinksToPrefs
@@ -64,15 +65,15 @@ class SyncManager @Inject constructor(
6465
private val databaseService: DatabaseService,
6566
@AppPreferences private val settings: SharedPreferences,
6667
private val apiInterface: ApiInterface,
67-
private val improvedSyncManager: Lazy<ImprovedSyncManager>
68+
private val improvedSyncManager: Lazy<ImprovedSyncManager>,
69+
@ApplicationScope private val syncScope: CoroutineScope
6870
) {
6971
private var td: Thread? = null
7072
lateinit var mRealm: Realm
7173
private var isSyncing = false
7274
private val stringArray = arrayOfNulls<String>(4)
7375
private var listener: SyncListener? = null
7476
private var backgroundSync: Job? = null
75-
private val syncScope = CoroutineScope(Dispatchers.IO + SupervisorJob())
7677
private var betaSync = false
7778
private val improvedSyncInitialized = AtomicBoolean(false)
7879

0 commit comments

Comments
 (0)