yetangitu/timelimit-android
1
0
Fork 0
mirror of https://codeberg.org/timelimit/timelimit-android.git synced 2025-10-06 03:50:23 +02:00
Code Issues Projects Releases Wiki Activity

Squashed commit of the following:

Browse source 
commit bb5606826a0b108df334968657d87fff3762afe8
Author: Jonas L <jonas@determapp.de>
Date:   Mon Mar 25 00:00:00 2019 +0000

    Hide overlay permission

commit a0c0fe3624a86d9d7eee2c0486fa086a4a5ee064
Author: Jonas L <jonas@determapp.de>
Date:   Mon Mar 25 00:00:00 2019 +0000

    Add warning to overlay if shown for a longer time

commit 0705ee57374a0257e97f5dfd4bbde3428ec58933
Author: Jonas L <jonas@determapp.de>
Date:   Mon Mar 25 00:00:00 2019 +0000

    Allow ignoring warning of overlay manipulation

commit 2685be2de0bdb2eb56b2514cc8a6dfc05eec923e
Author: Jonas L <jonas@determapp.de>
Date:   Mon Mar 25 00:00:00 2019 +0000

    Add overlay permission to update device status action

commit dde4f800b8ab1331a22b6a702341edd3d595748c
Author: Jonas L <jonas@determapp.de>
Date:   Mon Mar 25 00:00:00 2019 +0000

    Add draw over other apps permission to device screen

commit 0d54e76cc23cb3f534c88533ce962cb84f68f105
Author: Jonas L <jonas@determapp.de>
Date:   Mon Mar 25 00:00:00 2019 +0000

    Add column for the overlay permission

commit 42da690ae823a9fead00e98d7a2d74ea7df406fe
Author: Jonas L <jonas@determapp.de>
Date:   Mon Mar 25 00:00:00 2019 +0000

    Add UI to grant overlay permission to the setup screen

commit 5b8697bc79c773666c2ca2be3201f0998da64169
Author: Jonas L <jonas@determapp.de>
Date:   Mon Mar 25 00:00:00 2019 +0000

    Add using draw over other apps permission
This commit is contained in:
Jonas L 2019-03-25 00:00:00 +00:00
parent 57bfe99226
commit 52fa115b2f
30 changed files with 1144 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/io/timelimit/android/sync/ApplyServerDataStatus.kt
View file

@ -154,7 +154,9 @@ object ApplyServerDataStatus {
showDeviceConnected = newDevice.showDeviceConnected,
defaultUser = newDevice.defaultUser,
defaultUserTimeout = newDevice.defaultUserTimeout,
considerRebootManipulation = newDevice.considerRebootManipulation
considerRebootManipulation = newDevice.considerRebootManipulation,
currentOverlayPermission = newDevice.currentOverlayPermission,
highestOverlayPermission = newDevice.highestOverlayPermission
))
} else {
// eventually update old entry
@ -181,7 +183,9 @@ object ApplyServerDataStatus {
showDeviceConnected = newDevice.showDeviceConnected,
defaultUser = newDevice.defaultUser,
defaultUserTimeout = newDevice.defaultUserTimeout,
considerRebootManipulation = newDevice.considerRebootManipulation
considerRebootManipulation = newDevice.considerRebootManipulation,
currentOverlayPermission = newDevice.currentOverlayPermission,
highestOverlayPermission = newDevice.highestOverlayPermission
)
if (updatedDeviceEntry != oldDeviceEntry) {