Replacing setTimeout in auto-lock time limit with chrome alarm (#15931)

feature/default_network_editable
Niranjana Binoy 2 years ago committed by GitHub
parent e74614dbec
commit c836f2f2ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      app/manifest/v3/_base.json
  2. 25
      app/scripts/controllers/app-state.js
  3. 1
      shared/constants/alarms.js

@ -67,6 +67,7 @@
"name": "__MSG_appName__", "name": "__MSG_appName__",
"permissions": [ "permissions": [
"activeTab", "activeTab",
"alarms",
"clipboardWrite", "clipboardWrite",
"notifications", "notifications",
"scripting", "scripting",

@ -2,6 +2,8 @@ import EventEmitter from 'events';
import { ObservableStore } from '@metamask/obs-store'; import { ObservableStore } from '@metamask/obs-store';
import { METAMASK_CONTROLLER_EVENTS } from '../metamask-controller'; import { METAMASK_CONTROLLER_EVENTS } from '../metamask-controller';
import { MINUTE } from '../../../shared/constants/time'; 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 { export default class AppStateController extends EventEmitter {
/** /**
@ -187,22 +189,45 @@ export default class AppStateController extends EventEmitter {
* *
* @private * @private
*/ */
/* eslint-disable no-undef */
_resetTimer() { _resetTimer() {
const { timeoutMinutes } = this.store.getState(); const { timeoutMinutes } = this.store.getState();
if (this.timer) { if (this.timer) {
if (isManifestV3) {
chrome.alarms.clear(AUTO_LOCK_TIMEOUT_ALARM);
} else {
clearTimeout(this.timer); clearTimeout(this.timer);
} }
}
if (!timeoutMinutes) { if (!timeoutMinutes) {
return; return;
} }
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.timer = setTimeout(
() => this.onInactiveTimeout(), () => this.onInactiveTimeout(),
timeoutMinutes * MINUTE, timeoutMinutes * MINUTE,
); );
} }
}
/** /**
* Sets the current browser and OS environment * Sets the current browser and OS environment

@ -0,0 +1 @@
export const AUTO_LOCK_TIMEOUT_ALARM = 'AUTO_LOCK_TIMEOUT_ALARM';
Loading…
Cancel
Save