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

Added option to connect via VPN only

This commit is contained in:
M66B 2021-09-11 10:07:08 +02:00
parent 5b5a4b62d8
commit 7fb81ccf7a
4 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/eu/faircode/email/ConnectionHelper.java
View File

@ -45,7 +45,7 @@ import java.util.Objects;
public class ConnectionHelper {
static final List<String> PREF_NETWORK = Collections.unmodifiableList(Arrays.asList(
"metered", "roaming", "rlah" // update network state
"metered", "roaming", "rlah", "require_validated", "vpn_only" // update network state
));
// Roam like at home
@ -213,6 +213,7 @@ public class ConnectionHelper {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean standalone_vpn = prefs.getBoolean("standalone_vpn", false);
boolean require_validated = prefs.getBoolean("require_validated", false);
boolean vpn_only = prefs.getBoolean("vpn_only", false);
ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
if (cm == null) {
@ -276,6 +277,13 @@ public class ConnectionHelper {
return null;
}
if (vpn_only) {
boolean vpn = vpnActive(context);
Log.i("VPN only vpn=" + vpn);
if (!vpn)
return null;
}
if (standalone_vpn ||
caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN)) {
// NET_CAPABILITY_NOT_METERED is unreliable on older Android versions

13
app/src/main/java/eu/faircode/email/FragmentOptionsConnection.java
View File

@ -63,6 +63,7 @@ public class FragmentOptionsConnection extends FragmentBase implements SharedPre
private SwitchCompat swDownloadHeaders;
private SwitchCompat swDownloadEml;
private SwitchCompat swValidated;
private SwitchCompat swVpnOnly;
private EditText etTimeout;
private SwitchCompat swPreferIp4;
private SwitchCompat swBindSocket;
@ -81,7 +82,8 @@ public class FragmentOptionsConnection extends FragmentBase implements SharedPre
private final static String[] RESET_OPTIONS = new String[]{
"metered", "download", "roaming", "rlah",
"download_headers", "download_eml",
"require_validated", "timeout", "prefer_ip4", "bind_socket", "standalone_vpn", "tcp_keep_alive", "ssl_harden"
"require_validated", "vpn_only",
"timeout", "prefer_ip4", "bind_socket", "standalone_vpn", "tcp_keep_alive", "ssl_harden"
};
@Override
@ -101,6 +103,7 @@ public class FragmentOptionsConnection extends FragmentBase implements SharedPre
swDownloadHeaders = view.findViewById(R.id.swDownloadHeaders);
swDownloadEml = view.findViewById(R.id.swDownloadEml);
swValidated = view.findViewById(R.id.swValidated);
swVpnOnly = view.findViewById(R.id.swVpnOnly);
etTimeout = view.findViewById(R.id.etTimeout);
swPreferIp4 = view.findViewById(R.id.swPreferIp4);
swBindSocket = view.findViewById(R.id.swBindSocket);
@ -181,6 +184,13 @@ public class FragmentOptionsConnection extends FragmentBase implements SharedPre
}
});
swVpnOnly.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
prefs.edit().putBoolean("vpn_only", checked).apply();
}
});
etTimeout.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
@ -353,6 +363,7 @@ public class FragmentOptionsConnection extends FragmentBase implements SharedPre
swDownloadEml.setChecked(prefs.getBoolean("download_eml", false));
swValidated.setChecked(prefs.getBoolean("require_validated", false));
swVpnOnly.setChecked(prefs.getBoolean("vpn_only", false));
int timeout = prefs.getInt("timeout", 0);
etTimeout.setText(timeout == 0 ? null : Integer.toString(timeout));

15
app/src/main/res/layout/fragment_options_connection.xml
View File

@ -271,6 +271,17 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/swValidated" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/swVpnOnly"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/title_advanced_vpn_only"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvValidatedHint"
app:switchPadding="12dp" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvTimeout"
android:layout_width="0dp"
@ -282,7 +293,7 @@
android:textColor="?android:attr/textColorPrimary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvValidatedHint" />
app:layout_constraintTop_toBottomOf="@id/swVpnOnly" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvTimeoutHint"
@ -432,7 +443,7 @@
android:id="@+id/grpValidated"
android:layout_width="0dp"
android:layout_height="0dp"
app:constraint_referenced_ids="swValidated,tvValidatedHint" />
app:constraint_referenced_ids="swValidated,tvValidatedHint,swVpnOnly" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>

1
app/src/main/res/values/strings.xml
View File

@ -386,6 +386,7 @@
<string name="title_advanced_download_headers">Download all message headers</string>
<string name="title_advanced_download_eml">Download raw message files</string>
<string name="title_advanced_validated">Require a validated (checked) connection</string>
<string name="title_advanced_vpn_only">Connect only via a VPN</string>
<string name="title_advanced_timeout">Connection timeout (seconds)</string>
<string name="title_advanced_prefer_ip4">Prefer IPv4 over IPv6</string>
<string name="title_advanced_bind_socket" translatable="false">Bind sockets to the active network</string>