kumi/andOTP
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix crash because of the re-lock timer

Browse source 
If the option is not enabled the timer never gets created, needed a null check when aborting it in onPause()

+ Some minor style fixes
This commit is contained in:
Jakob Nixdorf 2020-02-03 07:20:03 +01:00
parent e7748e7979
commit ea5f8e01f8
No known key found for this signature in database
GPG key ID: BE99BF86574A7DBC
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/src/main/java/org/shadowice/flocke/andotp/Activities/MainActivity.java
View file

@ -357,7 +357,8 @@ public class MainActivity extends BaseActivity
checkIntent();
}
if(setCountDownTimerNow()) countDownTimer.start();
if (setCountDownTimerNow())
countDownTimer.start();
}
if (filterString != null) {
@ -383,7 +384,9 @@ public class MainActivity extends BaseActivity
});
super.onPause();
stopUpdater();
countDownTimer.cancel();
if (countDownTimer != null)
countDownTimer.cancel();
}
@Override
@ -762,13 +765,19 @@ public class MainActivity extends BaseActivity
super.onUserInteraction();
// Refresh Blackout Timer
if(countDownTimer != null) countDownTimer.cancel();
if(setCountDownTimerNow()) countDownTimer.start();
if (countDownTimer != null)
countDownTimer.cancel();
if (setCountDownTimerNow())
countDownTimer.start();
}
private boolean setCountDownTimerNow() {
int secondsToBlackout = 1000 * settings.getAuthInactivityDelay();
if(settings.getAuthMethod() == AuthMethod.NONE || !settings.getAuthInactivity() || secondsToBlackout == 0 ) return false;
if (settings.getAuthMethod() == AuthMethod.NONE || !settings.getAuthInactivity() || secondsToBlackout == 0)
return false;
countDownTimer = new CountDownTimer(secondsToBlackout, 1000) {
@Override
public void onTick(long millisUntilFinished) {
@ -780,6 +789,7 @@ public class MainActivity extends BaseActivity
this.cancel();
}
};
return true;
}