Merge pull request #441 from alexbakker/fix-lock-crash

Fix crash that would occur when locking the screen with a locked vault

app/src/main/java/com/beemdevelopment/aegis/AegisApplication.java

@@ -112,7 +112,7 @@ public class AegisApplication extends Application {
     }
 
     public boolean isAutoLockEnabled() {
-        return _prefs.isAutoLockEnabled() && _manager.isEncryptionEnabled() && !isVaultLocked();
+        return _prefs.isAutoLockEnabled() && !isVaultLocked() && _manager.isEncryptionEnabled() ;
     }
 
     public void registerLockListener(LockListener listener) {