Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-22 15:49:53 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Torsten Grote
2018-08-07 15:56:30 -03:00
parent 5d2c96f916
commit feab825865
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
briar-android/src/main/java/org/briarproject/briar/android/activity/BriarActivity.java
View File

@@ -73,6 +73,7 @@ public abstract class BriarActivity extends BaseActivity {
} else if (lockManager.isLocked()) { } else if (lockManager.isLocked()) {
Intent i = new Intent(this, UnlockActivity.class); Intent i = new Intent(this, UnlockActivity.class);
startActivityForResult(i, REQUEST_UNLOCK); startActivityForResult(i, REQUEST_UNLOCK);
overridePendingTransition(0, 0);
} else if (SDK_INT >= 23) { } else if (SDK_INT >= 23) {
briarController.hasDozed(new UiResultHandler<Boolean>(this) { briarController.hasDozed(new UiResultHandler<Boolean>(this) {
@Override @Override

6
briar-android/src/main/java/org/briarproject/briar/android/login/UnlockActivity.java
View File

@@ -60,8 +60,9 @@ public class UnlockActivity extends BaseActivity {
protected void onActivityResult(int requestCode, int resultCode, protected void onActivityResult(int requestCode, int resultCode,
Intent data) { Intent data) {
super.onActivityResult(requestCode, resultCode, data); super.onActivityResult(requestCode, resultCode, data);
if (requestCode == REQUEST_UNLOCK && resultCode == RESULT_OK) { if (requestCode == REQUEST_UNLOCK) {
unlock(); if (resultCode == RESULT_OK) unlock();
else finish();
} }
} }
@@ -78,6 +79,7 @@ public class UnlockActivity extends BaseActivity {
unlock(); unlock();
} else { } else {
startActivityForResult(intent, REQUEST_UNLOCK); startActivityForResult(intent, REQUEST_UNLOCK);
overridePendingTransition(0, 0);
} }
} }