TimeLimit.io/timelimit-server
1
0
Fork 0
mirror of https://codeberg.org/timelimit/timelimit-server.git synced 2026-08-31 19:03:45 +02:00
Code Actions Packages Releases 6 Activity

Add columns for overlay permission

Browse Source
This commit is contained in:
Jonas L
2019-03-25 00:00:00 +00:00
parent a2b07e7b95
commit ae0f1c67aa
3 changed files with 71 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/database/device.ts
+22 -3
View File
@@ -69,9 +69,14 @@ export interface DeviceAttributesVersion6 {
considerRebootManipulation: boolean
}
export interface DeviceAttributesVersion7 {
currentOverlayPermission: RuntimePermissionStatus
highestOverlayPermission: RuntimePermissionStatus
}
export type DeviceAttributes = DeviceAttributesVersion1 & DeviceAttributesVersion2 &
DeviceAttributesVersion3 & DeviceAttributesVersion4 & DeviceAttributesVersion5 &
DeviceAttributesVersion6
DeviceAttributesVersion6 & DeviceAttributesVersion7
export type DeviceInstance = Sequelize.Instance<DeviceAttributes> & DeviceAttributes
export type DeviceModel = Sequelize.Model<DeviceInstance, DeviceAttributes>
@@ -175,13 +180,25 @@ export const attributesVersion6: SequelizeAttributes<DeviceAttributesVersion6> =
}
}
export const attributesVersion7: SequelizeAttributes<DeviceAttributesVersion7> = {
currentOverlayPermission: {
...createEnumColumn(runtimePermissionStatusValues),
defaultValue: 'not granted'
},
highestOverlayPermission: {
...createEnumColumn(runtimePermissionStatusValues),
defaultValue: 'not granted'
}
}
export const attributes: SequelizeAttributes<DeviceAttributes> = {
...attributesVersion1,
...attributesVersion2,
...attributesVersion3,
...attributesVersion4,
...attributesVersion5,
...attributesVersion6
...attributesVersion6,
...attributesVersion7
}
export const createDeviceModel = (sequelize: Sequelize.Sequelize): DeviceModel => sequelize.define<DeviceInstance, DeviceAttributes>('Device', attributes)
@@ -190,13 +207,15 @@ export const hasDeviceManipulation = (device: DeviceAttributes) => {
const manipulationOfUsageStats = device.currentUsageStatsPermission !== device.highestUsageStatsPermission
const manipulationOfNotificationAccess = device.currentNotificationAccessPermission !== device.highestNotificationAccessPermission
const manipulationOfAppVersion = device.currentAppVersion !== device.highestAppVersion
const manipulationOfOverlayPermission = device.currentOverlayPermission !== device.highestOverlayPermission
const hasActiveManipulationWarning = manipulationOfProtectionLevel ||
manipulationOfUsageStats ||
manipulationOfNotificationAccess ||
manipulationOfAppVersion ||
device.triedDisablingDeviceAdmin ||
device.didReboot
device.didReboot ||
manipulationOfOverlayPermission
const hasAnyManipulation = hasActiveManipulationWarning || device.hadManipulation