mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "Refactoring" 

This reverts commit 05885c6a71.
This commit is contained in:
M66B 2019-11-01 18:23:13 +01:00
parent 05885c6a71
commit 96797c7f31
2 changed files with 15 additions and 14 deletions
Show Stats 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,8 +161,10 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
public void onUserInteraction() {
Log.i("User interaction");
if (!this.getClass().equals(ActivityMain.class) && Helper.shouldAuthenticate(this))
restart(null);
if (!this.getClass().equals(ActivityMain.class) && Helper.shouldAuthenticate(this)) {
finishAndRemoveTask();
startActivity(new Intent(this, ActivityMain.class));
}
}
@Override
@ -203,8 +205,13 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
}
private void checkAuthentication() {
if (!this.getClass().equals(ActivityMain.class) && Helper.shouldAuthenticate(this))
restart(getIntent());
if (!this.getClass().equals(ActivityMain.class) && Helper.shouldAuthenticate(this)) {
Intent intent = getIntent();
finishAndRemoveTask();
startActivity(
new Intent(this, ActivityMain.class)
.putExtra("intent", intent));
}
}
@Override
@ -275,15 +282,6 @@ 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())

5
app/src/main/java/eu/faircode/email/FragmentBase.java
View File

@ -116,7 +116,10 @@ public class FragmentBase extends Fragment {
}
protected void restart() {
((ActivityBase) getActivity()).restart(null);
Intent intent = new Intent(getContext(), ActivityMain.class);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
startActivity(intent);
Runtime.getRuntime().exit(0);
}
@Override