Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-11 11:33:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
M66B
2024-01-03 16:30:50 +01:00
parent 1855cf21bc ebd873511d
commit 103810bd41
29 changed files with 131 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/eu/faircode/email/ActivityMain.java
View File

@@ -461,8 +461,13 @@ public class ActivityMain extends ActivityBase implements FragmentManager.OnBack
@Override
public void onSharedPreferenceChanged(SharedPreferences prefs, String key) {
if ("eula".equals(key))
if (prefs.getBoolean(key, false))
recreate();
if ("eula".equals(key)) {
boolean eula = prefs.getBoolean(key, false);
if (eula) {
// recreate is done without animation
finish();
startActivity(getIntent());
}
}
}
}

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

@@ -164,6 +164,11 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
menus.add(new NavMenuItem(R.drawable.twotone_close_24, R.string.title_setup_close, new Runnable() {
@Override
public void run() {
if (BuildConfig.DEBUG) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ActivitySetup.this);
prefs.edit().remove("eula").apply();
}
onMenuClose();
}
}).setColor(colorWarning).setSeparated());

2
app/src/main/java/eu/faircode/email/FragmentEula.java
View File

@@ -56,7 +56,7 @@ public class FragmentEula extends FragmentBase {
btnAgree.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(view.getContext());
prefs.edit().putBoolean("eula", true).apply();
}
});