1
0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-04-30 17:42:06 -04:00

loginctl: simplify event handling

This commit is contained in:
bbedward
2026-04-22 10:32:05 -04:00
parent b87c36d29e
commit 97fa86d8f0
8 changed files with 18 additions and 129 deletions

View File

@@ -45,7 +45,6 @@ Singleton {
signal networkStateUpdate(var data)
signal cupsStateUpdate(var data)
signal loginctlStateUpdate(var data)
signal loginctlEvent(var event)
signal capabilitiesReceived
signal credentialsRequest(var data)
signal bluetoothPairingRequest(var data)
@@ -348,11 +347,7 @@ Singleton {
} else if (service === "network.credentials") {
credentialsRequest(data);
} else if (service === "loginctl") {
if (data.event) {
loginctlEvent(data);
} else {
loginctlStateUpdate(data);
}
loginctlStateUpdate(data);
} else if (service === "bluetooth.pairing") {
bluetoothPairingRequest(data);
} else if (service === "cups") {

View File

@@ -749,8 +749,13 @@ Singleton {
runResumeRecoveryPass();
resumeRecoveryAttempt++;
if (resumeRecoveryAttempt < 3) {
interval = resumeRecoveryAttempt === 1 ? 1400 : 2600;
switch (resumeRecoveryAttempt) {
case 1:
interval = 1400;
restart();
return;
case 2:
interval = 2600;
restart();
return;
}

View File

@@ -472,7 +472,6 @@ Singleton {
}
function onCapabilitiesReceived() {
checkDMSCapabilities();
syncSleepInhibitor();
}
}
@@ -526,10 +525,6 @@ Singleton {
function onLoginctlStateUpdate(data) {
updateLoginctlState(data);
}
function onLoginctlEvent(event) {
handleLoginctlEvent(event);
}
}
function checkDMSCapabilities() {
@@ -677,16 +672,4 @@ Singleton {
loginctlStateChanged();
}
function handleLoginctlEvent(event) {
if (event.event === "Lock") {
locked = true;
lockedHint = true;
sessionLocked();
} else if (event.event === "Unlock") {
locked = false;
lockedHint = false;
sessionUnlocked();
}
}
}