summaryrefslogtreecommitdiff
path: root/app/src/main/java
diff options
context:
space:
mode:
authorMohamed <mohamed@zenadi.com>2017-11-19 12:13:38 +0100
committerMohamed <mohamed@zenadi.com>2017-11-19 12:13:38 +0100
commitb2839eb0a166cdff87e1a1a2433f036bb71be203 (patch)
treec5b7f85c46830004b0c3c8d4c4381823512827d1 /app/src/main/java
parent3d5dd65e306ba3ca560b3c221830ee4cdb4363fb (diff)
add a missing check that password clearing task is running
fixes #351
Diffstat (limited to 'app/src/main/java')
-rw-r--r--app/src/main/java/com/zeapo/pwdstore/crypto/PgpActivity.kt5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpActivity.kt b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpActivity.kt
index 905f37bf..3b47bf66 100644
--- a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpActivity.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpActivity.kt
@@ -495,7 +495,10 @@ class PgpActivity : AppCompatActivity(), OpenPgpServiceConnection.OnBound {
}
private fun setTimer() {
- delayTask?.skip = true
+ // if the previous task is still running, do not ask it to clear the password
+ if (delayTask?.status == AsyncTask.Status.RUNNING) {
+ delayTask?.skip = true
+ }
// launch a new one
delayTask = DelayShow(this)