Don't show UnlockActivity anymore, might get removed completetly later

parent 5d2c96f9
......@@ -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<Boolean>(this) {
@Override
......
......@@ -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);
}
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment