monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-12-23 03:59:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3503

Browse source 
b2255cf main: use Utils.epoch() for epoch (selsta)
This commit is contained in:
luigi1111 2021-07-06 11:41:11 -04:00
commit 8730743207
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
main.qml
View file

@ -96,7 +96,6 @@ ApplicationWindow {
property alias viewState: rootItem.state property alias viewState: rootItem.state
property string prevSplashText; property string prevSplashText;
property bool splashDisplayedBeforeButtonRequest; property bool splashDisplayedBeforeButtonRequest;
property int appEpoch: Math.floor((new Date).getTime() / 1000)
property bool themeTransition: false property bool themeTransition: false
// fiat price conversion // fiat price conversion
@ -2201,8 +2200,7 @@ ApplicationWindow {
function userActivity() { function userActivity() {
// register user activity // register user activity
var epoch = Math.floor((new Date).getTime()/1000); appWindow.userLastActive = Utils.epoch();
appWindow.userLastActive = epoch;
} }
function checkInUserActivity() { function checkInUserActivity() {
@ -2214,8 +2212,7 @@ ApplicationWindow {
var informationPopupVisible = informationPopup && informationPopup.visible var informationPopupVisible = informationPopup && informationPopup.visible
// prompt password after X seconds of inactivity // prompt password after X seconds of inactivity
var epoch = Math.floor((new Date).getTime() / 1000); var inactivity = Utils.epoch() - appWindow.userLastActive;
var inactivity = epoch - appWindow.userLastActive;
if(inactivity < (persistentSettings.lockOnUserInActivityInterval * 60)) return; if(inactivity < (persistentSettings.lockOnUserInActivityInterval * 60)) return;
passwordDialog.onAcceptedCallback = function() { passwordDialog.onAcceptedCallback = function() {