Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-31 06:08:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Reset hints

Browse Source
This commit is contained in:
M66B
2020-03-21 09:16:49 +01:00
parent 94031f889b
commit 2dcdc264b9
4 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,6 +53,7 @@ import java.util.Map;
abstract class ActivityBase extends AppCompatActivity implements SharedPreferences.OnSharedPreferenceChangeListener {
private Context originalContext;
private boolean visible;
private boolean contacts;
private List<IKeyPressedListener> keyPressedListeners = new ArrayList<>();
@@ -235,6 +236,8 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
protected void onResume() {
Log.d("Resume " + this.getClass().getName());
visible = true;
boolean contacts = hasPermission(Manifest.permission.READ_CONTACTS);
if (!this.getClass().equals(ActivitySetup.class) && this.contacts != contacts) {
Log.i("Contacts permission=" + contacts);
@@ -251,6 +254,8 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
Log.d("Pause " + this.getClass().getName());
super.onPause();
visible = false;
if (!this.getClass().equals(ActivityMain.class) && Helper.shouldAuthenticate(this))
finishAndRemoveTask();
}
@@ -367,7 +372,7 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
finish();
if (this.getClass().equals(ActivitySetup.class))
startActivity(getIntent());
} else if (!this.getClass().equals(ActivitySetup.class) &&
} else if (!this.getClass().equals(ActivitySetup.class) && !visible &&
Arrays.asList(FragmentOptions.OPTIONS_RESTART).contains(key))
finish();
}