From feab8258659f222681c78e384f17052557c9f3c2 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Tue, 7 Aug 2018 15:56:30 -0300 Subject: [PATCH] Don't show UnlockActivity anymore, might get removed completetly later --- .../briarproject/briar/android/activity/BriarActivity.java | 1 + .../briarproject/briar/android/login/UnlockActivity.java | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/activity/BriarActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/activity/BriarActivity.java index efeb5ec6e..75e49bca6 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/activity/BriarActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/activity/BriarActivity.java @@ -73,6 +73,7 @@ public abstract class BriarActivity extends BaseActivity { } else if (lockManager.isLocked()) { Intent i = new Intent(this, UnlockActivity.class); startActivityForResult(i, REQUEST_UNLOCK); + overridePendingTransition(0, 0); } else if (SDK_INT >= 23) { briarController.hasDozed(new UiResultHandler(this) { @Override diff --git a/briar-android/src/main/java/org/briarproject/briar/android/login/UnlockActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/login/UnlockActivity.java index 727606fe8..d3ddd1d42 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/login/UnlockActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/login/UnlockActivity.java @@ -60,8 +60,9 @@ public class UnlockActivity extends BaseActivity { protected void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); - if (requestCode == REQUEST_UNLOCK && resultCode == RESULT_OK) { - unlock(); + if (requestCode == REQUEST_UNLOCK) { + if (resultCode == RESULT_OK) unlock(); + else finish(); } } @@ -78,6 +79,7 @@ public class UnlockActivity extends BaseActivity { unlock(); } else { startActivityForResult(intent, REQUEST_UNLOCK); + overridePendingTransition(0, 0); } }