From 660ba16a14455822b301dbf7861acff675e22b55 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 19 Sep 2018 16:06:13 -0300
Subject: [PATCH] Fix app lock after sign-out bug

It some cases, it was observered how the app was locked after the user
had signed out.
This commit ensures that set alarms are canceled and that no new ones
will be set after the LockManager service has been stopped.

Fixes #1386
---
 .../org/briarproject/briar/android/account/LockManagerImpl.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/briar-android/src/main/java/org/briarproject/briar/android/account/LockManagerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/account/LockManagerImpl.java
index 34b7b373d..17c821997 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/account/LockManagerImpl.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/account/LockManagerImpl.java
@@ -101,6 +101,8 @@ public class LockManagerImpl implements LockManager, Service, EventListener {
 
 	@Override
 	public void stopService() {
+		timeoutMinutes = timeoutNever;
+		if (alarmSet) alarmManager.cancel(lockIntent);
 	}
 
 	@UiThread