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

Added option to connect account via VPN only

Browse Source
This commit is contained in:
M66B
2022-09-05 22:41:30 +02:00
parent 7677b34c4e
commit f0939d0069
6 changed files with 55 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/eu/faircode/email/FragmentAccount.java
View File

@@ -128,6 +128,7 @@ public class FragmentAccount extends FragmentBase {
private RadioGroup rgDate;
private CheckBox cbUnicode;
private CheckBox cbUnmetered;
private CheckBox cbVpnOnly;
private Button btnCheck;
private ContentLoadingProgressBar pbCheck;
@@ -240,6 +241,7 @@ public class FragmentAccount extends FragmentBase {
rgDate = view.findViewById(R.id.rgDate);
cbUnicode = view.findViewById(R.id.cbUnicode);
cbUnmetered = view.findViewById(R.id.cbUnmeteredOnly);
cbVpnOnly = view.findViewById(R.id.cbVpnOnly);
btnCheck = view.findViewById(R.id.btnCheck);
pbCheck = view.findViewById(R.id.pbCheck);
@@ -909,6 +911,7 @@ public class FragmentAccount extends FragmentBase {
args.putBoolean("use_received", rgDate.getCheckedRadioButtonId() == R.id.radio_received_header);
args.putBoolean("unicode", cbUnicode.isChecked());
args.putBoolean("unmetered", cbUnmetered.isChecked());
args.putBoolean("vpn_only", cbVpnOnly.isChecked());
args.putSerializable("drafts", drafts);
args.putSerializable("sent", sent);
@@ -982,6 +985,7 @@ public class FragmentAccount extends FragmentBase {
boolean use_received = args.getBoolean("use_received");
boolean unicode = args.getBoolean("unicode");
boolean unmetered = args.getBoolean("unmetered");
boolean vpn_only = args.getBoolean("vpn_only");
EntityFolder drafts = (EntityFolder) args.getSerializable("drafts");
EntityFolder sent = (EntityFolder) args.getSerializable("sent");
@@ -1094,6 +1098,8 @@ public class FragmentAccount extends FragmentBase {
return true;
if (unmetered != jconditions.optBoolean("unmetered"))
return true;
if (vpn_only != jconditions.optBoolean("vpn_only"))
return true;
if (account.error != null && account.synchronize)
return true;
@@ -1238,6 +1244,7 @@ public class FragmentAccount extends FragmentBase {
account.unicode = unicode;
jconditions.put("unmetered", unmetered);
jconditions.put("vpn_only", vpn_only);
account.conditions = jconditions.toString();
if (!update)
@@ -1600,6 +1607,7 @@ public class FragmentAccount extends FragmentBase {
cbIgnoreSize.setChecked(account == null ? false : account.ignore_size);
cbUnicode.setChecked(account == null ? false : account.unicode);
cbUnmetered.setChecked(jcondition.optBoolean("unmetered"));
cbVpnOnly.setChecked(jcondition.optBoolean("vpn_only"));
if (account != null && account.use_date)
rgDate.check(R.id.radio_date_header);