mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-11-22 01:47:00 +01:00
Replacing setTimeout in auto-lock time limit with chrome alarm (#15931)
This commit is contained in:
parent
e74614dbec
commit
c836f2f2ac
@ -67,6 +67,7 @@
|
||||
"name": "__MSG_appName__",
|
||||
"permissions": [
|
||||
"activeTab",
|
||||
"alarms",
|
||||
"clipboardWrite",
|
||||
"notifications",
|
||||
"scripting",
|
||||
|
@ -2,6 +2,8 @@ import EventEmitter from 'events';
|
||||
import { ObservableStore } from '@metamask/obs-store';
|
||||
import { METAMASK_CONTROLLER_EVENTS } from '../metamask-controller';
|
||||
import { MINUTE } from '../../../shared/constants/time';
|
||||
import { AUTO_LOCK_TIMEOUT_ALARM } from '../../../shared/constants/alarms';
|
||||
import { isManifestV3 } from '../../../shared/modules/mv3.utils';
|
||||
|
||||
export default class AppStateController extends EventEmitter {
|
||||
/**
|
||||
@ -187,21 +189,44 @@ export default class AppStateController extends EventEmitter {
|
||||
*
|
||||
* @private
|
||||
*/
|
||||
/* eslint-disable no-undef */
|
||||
_resetTimer() {
|
||||
const { timeoutMinutes } = this.store.getState();
|
||||
|
||||
if (this.timer) {
|
||||
clearTimeout(this.timer);
|
||||
if (isManifestV3) {
|
||||
chrome.alarms.clear(AUTO_LOCK_TIMEOUT_ALARM);
|
||||
} else {
|
||||
clearTimeout(this.timer);
|
||||
}
|
||||
}
|
||||
|
||||
if (!timeoutMinutes) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.timer = setTimeout(
|
||||
() => this.onInactiveTimeout(),
|
||||
timeoutMinutes * MINUTE,
|
||||
);
|
||||
if (isManifestV3) {
|
||||
chrome.alarms.create(AUTO_LOCK_TIMEOUT_ALARM, {
|
||||
delayInMinutes: timeoutMinutes,
|
||||
periodInMinutes: timeoutMinutes,
|
||||
});
|
||||
chrome.alarms.onAlarm.addListener(() => {
|
||||
chrome.alarms.getAll((alarms) => {
|
||||
const hasAlarm = alarms.find(
|
||||
(alarm) => alarm.name === AUTO_LOCK_TIMEOUT_ALARM,
|
||||
);
|
||||
if (hasAlarm) {
|
||||
this.onInactiveTimeout();
|
||||
chrome.alarms.clear(AUTO_LOCK_TIMEOUT_ALARM);
|
||||
}
|
||||
});
|
||||
});
|
||||
} else {
|
||||
this.timer = setTimeout(
|
||||
() => this.onInactiveTimeout(),
|
||||
timeoutMinutes * MINUTE,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
1
shared/constants/alarms.js
Normal file
1
shared/constants/alarms.js
Normal file
@ -0,0 +1 @@
|
||||
export const AUTO_LOCK_TIMEOUT_ALARM = 'AUTO_LOCK_TIMEOUT_ALARM';
|
Loading…
Reference in New Issue
Block a user