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

Forward new disabled by default for new installs

Browse Source
This commit is contained in:
M66B
2024-06-04 13:22:22 +02:00
parent 0fab872702
commit b55b787471
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/eu/faircode/email/ApplicationEx.java
View File

@@ -870,6 +870,9 @@ public class ApplicationEx extends Application
} else if (version < 2191) {
if ("a".equals(BuildConfig.REVISION))
editor.remove("show_changelog");
} else if (version < 2196) {
if (!prefs.contains("forward_new"))
editor.putBoolean("forward_new", true);
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && !BuildConfig.DEBUG)

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

@@ -5413,7 +5413,7 @@ public class FragmentCompose extends FragmentBase {
boolean auto_identity = prefs.getBoolean("auto_identity", false);
boolean suggest_sent = prefs.getBoolean("suggest_sent", true);
boolean suggest_received = prefs.getBoolean("suggest_received", false);
boolean forward_new = prefs.getBoolean("forward_new", true);
boolean forward_new = prefs.getBoolean("forward_new", false);
boolean markdown = prefs.getBoolean("markdown", false);
Log.i("Load draft action=" + action + " id=" + id + " reference=" + reference);

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

@@ -966,7 +966,7 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
swReceiptLegacy.setChecked(prefs.getBoolean("receipt_legacy", false));
swForwardNew.setChecked(prefs.getBoolean("forward_new", true));
swForwardNew.setChecked(prefs.getBoolean("forward_new", false));
swLookupMx.setChecked(prefs.getBoolean("lookup_mx", false));
swReplyMove.setChecked(prefs.getBoolean("reply_move", false));
swReplyMoveInbox.setChecked(prefs.getBoolean("reply_move_inbox", true));

4
app/src/main/java/eu/faircode/email/MessageHelper.java
View File

@@ -341,7 +341,7 @@ public class MessageHelper {
boolean autocrypt = prefs.getBoolean("autocrypt", true);
boolean mutual = prefs.getBoolean("autocrypt_mutual", true);
boolean encrypt_subject = prefs.getBoolean("encrypt_subject", false);
boolean forward_new = prefs.getBoolean("forward_new", true);
boolean forward_new = prefs.getBoolean("forward_new", false);
if (identity != null && identity.receipt_type != null)
receipt_type = identity.receipt_type;
@@ -1847,7 +1847,7 @@ public class MessageHelper {
refs.add(ref);
}
boolean forward_new = prefs.getBoolean("forward_new", true);
boolean forward_new = prefs.getBoolean("forward_new", false);
if (!forward_new)
try {
String fwd = imessage.getHeader("X-Forwarded-Message-Id", null);