diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsConnection.java b/app/src/main/java/eu/faircode/email/FragmentOptionsConnection.java
index a988beca25..29f40db0be 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsConnection.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsConnection.java
@@ -47,13 +47,13 @@ import androidx.preference.PreferenceManager;
public class FragmentOptionsConnection extends FragmentBase implements SharedPreferences.OnSharedPreferenceChangeListener {
private SwitchCompat swMetered;
private Spinner spDownload;
- private SwitchCompat swRoaming;
private SwitchCompat swRlah;
+ private SwitchCompat swRoaming;
private TextView tvConnectionType;
private TextView tvConnectionRoaming;
private final static String[] RESET_OPTIONS = new String[]{
- "metered", "download", "roaming", "rlah"
+ "metered", "download", "rlah", "roaming"
};
@Override
@@ -68,8 +68,8 @@ public class FragmentOptionsConnection extends FragmentBase implements SharedPre
swMetered = view.findViewById(R.id.swMetered);
spDownload = view.findViewById(R.id.spDownload);
- swRoaming = view.findViewById(R.id.swRoaming);
swRlah = view.findViewById(R.id.swRlah);
+ swRoaming = view.findViewById(R.id.swRoaming);
tvConnectionType = view.findViewById(R.id.tvConnectionType);
tvConnectionRoaming = view.findViewById(R.id.tvConnectionRoaming);
@@ -101,14 +101,6 @@ public class FragmentOptionsConnection extends FragmentBase implements SharedPre
}
});
- swRoaming.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
- @Override
- public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
- prefs.edit().putBoolean("roaming", checked).apply();
- ServiceSynchronize.reload(getContext(), "roaming=" + checked);
- }
- });
-
swRlah.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
@@ -117,6 +109,14 @@ public class FragmentOptionsConnection extends FragmentBase implements SharedPre
}
});
+ swRoaming.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+ @Override
+ public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
+ prefs.edit().putBoolean("roaming", checked).apply();
+ ServiceSynchronize.reload(getContext(), "roaming=" + checked);
+ }
+ });
+
PreferenceManager.getDefaultSharedPreferences(getContext()).registerOnSharedPreferenceChangeListener(this);
tvConnectionType.setVisibility(View.GONE);
@@ -192,8 +192,8 @@ public class FragmentOptionsConnection extends FragmentBase implements SharedPre
break;
}
- swRoaming.setChecked(prefs.getBoolean("roaming", true));
swRlah.setChecked(prefs.getBoolean("rlah", false));
+ swRoaming.setChecked(prefs.getBoolean("roaming", true));
}
private ConnectivityManager.NetworkCallback networkCallback = new ConnectivityManager.NetworkCallback() {
diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index 52906a03ea..f8eaa2c29d 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -866,8 +866,8 @@ public class Helper {
static NetworkState getNetworkState(Context context) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean metered = prefs.getBoolean("metered", true);
- boolean roaming = prefs.getBoolean("roaming", true);
boolean rlah = prefs.getBoolean("rlah", false);
+ boolean roaming = prefs.getBoolean("roaming", true);
NetworkState state = new NetworkState();
Boolean isMetered = isMetered(context);
diff --git a/app/src/main/res/layout/fragment_options_connection.xml b/app/src/main/res/layout/fragment_options_connection.xml
index caaaa26fcd..9578f7c52d 100644
--- a/app/src/main/res/layout/fragment_options_connection.xml
+++ b/app/src/main/res/layout/fragment_options_connection.xml
@@ -75,16 +75,6 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvDownload" />
-
-
+
+
+
+
+ app:layout_constraintTop_toBottomOf="@+id/swRoaming" />
Use metered connections
Automatically download messages and attachments on a metered connection up to
+ Roam like at home
Download messages and attachments while roaming
- Roam like at home EU
Browse messages on the server
Show on start screen
@@ -232,6 +232,7 @@
Tap on a time to set a time
Metered connections are generally mobile connections or paid Wi-Fi hotspots
Disabling this option will disable receiving and sending messages on mobile internet connections
+ Disable roaming within the EU
Fetch more messages when scrolling down
Group messages related to each other