yetangitu/timelimit-android
1
0
Fork 0
mirror of https://codeberg.org/timelimit/timelimit-android.git synced 2025-10-05 19:42:20 +02:00
Code Issues Projects Releases Wiki Activity

Improve logic for syncing installed apps

Browse source
This commit is contained in:
Jonas L 2019-04-22 00:00:00 +00:00
parent fe3a8f7153
commit 1121bb6aad
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/src/main/java/io/timelimit/android/logic/SyncInstalledAppsLogic.kt
View file

@ -36,7 +36,7 @@ class SyncInstalledAppsLogic(val appLogic: AppLogic) {
init { init {
appLogic.platformIntegration.installedAppsChangeListener = Runnable { requestSync() } appLogic.platformIntegration.installedAppsChangeListener = Runnable { requestSync() }
appLogic.deviceEntryIfEnabled.map { appLogic.deviceEntryIfEnabled.map {
it?.id + it?.currentUserId + it?.enableActivityLevelBlocking it?.id + it?.currentUserId + it?.defaultUser + it?.enableActivityLevelBlocking
}.ignoreUnchanged().observeForever { requestSync() } }.ignoreUnchanged().observeForever { requestSync() }
runAsyncExpectForever { syncLoop() } runAsyncExpectForever { syncLoop() }
@ -62,11 +62,18 @@ class SyncInstalledAppsLogic(val appLogic: AppLogic) {
return return
} }
val userEntry = appLogic.deviceUserEntry.waitForNullableValue() if (appLogic.database.config().getDeviceAuthTokenAsync().waitForNullableValue().isNullOrEmpty()) {
// local mode -> sync always
} else {
// connected mode -> don't sync always
if (userEntry == null || userEntry.type != UserType.Child) { val userEntry = appLogic.deviceUserEntry.waitForNullableValue()
val defaultUserEntry = appLogic.database.user().getUserByIdLive(deviceEntry.defaultUser).waitForNullableValue()
if (userEntry?.type != UserType.Child && defaultUserEntry?.type != UserType.Child) {
return@withLock return@withLock
} }
}
val deviceId = deviceEntry.id val deviceId = deviceEntry.id