Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-12-27 08:01:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring

Browse Source
This commit is contained in:
M66B
2019-11-01 18:20:28 +01:00
parent cd2396524f
commit 05885c6a71
2 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/java/eu/faircode/email/ActivityBase.java
View File

@@ -161,10 +161,8 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
public void onUserInteraction() {
Log.i("User interaction");
if (!this.getClass().equals(ActivityMain.class) && Helper.shouldAuthenticate(this)) {
finishAndRemoveTask();
startActivity(new Intent(this, ActivityMain.class));
}
if (!this.getClass().equals(ActivityMain.class) && Helper.shouldAuthenticate(this))
restart(null);
}
@Override
@@ -205,13 +203,8 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
}
private void checkAuthentication() {
if (!this.getClass().equals(ActivityMain.class) && Helper.shouldAuthenticate(this)) {
Intent intent = getIntent();
finishAndRemoveTask();
startActivity(
new Intent(this, ActivityMain.class)
.putExtra("intent", intent));
}
if (!this.getClass().equals(ActivityMain.class) && Helper.shouldAuthenticate(this))
restart(getIntent());
}
@Override
@@ -282,6 +275,15 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
}
}
protected void restart(Intent intent) {
Intent main = new Intent(this, ActivityMain.class);
if (intent != null)
main.putExtra("intent", intent);
main.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
startActivity(main);
finishAndRemoveTask();
}
protected boolean backHandled() {
for (IBackPressedListener listener : backPressedListeners)
if (listener.onBackPressed())