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

Show active connection info

This commit is contained in:
M66B 2020-10-27 14:14:54 +01:00
parent b051aaf41e
commit c51fd1c1ee
2 changed files with 59 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,8 +24,10 @@ import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.LinkProperties;
import android.net.Network; import android.net.Network;
import android.net.NetworkCapabilities; import android.net.NetworkCapabilities;
import android.net.NetworkInfo;
import android.net.NetworkRequest; import android.net.NetworkRequest;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
@ -61,8 +63,9 @@ public class FragmentOptionsConnection extends FragmentBase implements SharedPre
private SwitchCompat swPreferIp4; private SwitchCompat swPreferIp4;
private SwitchCompat swSslHarden; private SwitchCompat swSslHarden;
private Button btnManage; private Button btnManage;
private TextView tvConnectionType; private TextView tvNetworkMetered;
private TextView tvConnectionRoaming; private TextView tvNetworkRoaming;
private TextView tvNetworkInfo;
private final static String[] RESET_OPTIONS = new String[]{ private final static String[] RESET_OPTIONS = new String[]{
"metered", "download", "roaming", "rlah", "timeout", "prefer_ip4", "ssl_harden" "metered", "download", "roaming", "rlah", "timeout", "prefer_ip4", "ssl_harden"
@ -87,8 +90,9 @@ public class FragmentOptionsConnection extends FragmentBase implements SharedPre
swSslHarden = view.findViewById(R.id.swSslHarden); swSslHarden = view.findViewById(R.id.swSslHarden);
btnManage = view.findViewById(R.id.btnManage); btnManage = view.findViewById(R.id.btnManage);
tvConnectionType = view.findViewById(R.id.tvConnectionType); tvNetworkMetered = view.findViewById(R.id.tvNetworkMetered);
tvConnectionRoaming = view.findViewById(R.id.tvConnectionRoaming); tvNetworkRoaming = view.findViewById(R.id.tvNetworkRoaming);
tvNetworkInfo = view.findViewById(R.id.tvNetworkInfo);
setOptions(); setOptions();
@ -184,8 +188,9 @@ public class FragmentOptionsConnection extends FragmentBase implements SharedPre
PreferenceManager.getDefaultSharedPreferences(getContext()).registerOnSharedPreferenceChangeListener(this); PreferenceManager.getDefaultSharedPreferences(getContext()).registerOnSharedPreferenceChangeListener(this);
tvConnectionType.setVisibility(View.GONE); tvNetworkMetered.setVisibility(View.GONE);
tvConnectionRoaming.setVisibility(View.GONE); tvNetworkRoaming.setVisibility(View.GONE);
tvNetworkInfo.setVisibility(View.GONE);
return view; return view;
} }
@ -304,15 +309,41 @@ public class FragmentOptionsConnection extends FragmentBase implements SharedPre
}; };
private void showConnectionType() { private void showConnectionType() {
final ConnectionHelper.NetworkState networkState = ConnectionHelper.getNetworkState(getContext());
final StringBuilder sb = new StringBuilder();
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
boolean debug = prefs.getBoolean("debug", false);
if ((debug || BuildConfig.DEBUG) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
try {
ConnectivityManager cm = (ConnectivityManager) getContext().getSystemService(Context.CONNECTIVITY_SERVICE);
Network active = (cm == null ? null : cm.getActiveNetwork());
if (active != null) {
NetworkInfo ni = cm.getNetworkInfo(active);
if (ni != null)
sb.append(ni).append("\r\n\r\n");
NetworkCapabilities nc = cm.getNetworkCapabilities(active);
if (nc != null)
sb.append(nc).append("\r\n\r\n");
LinkProperties lp = cm.getLinkProperties(active);
if (lp != null)
sb.append(lp).append("\r\n\r\n");
}
} catch (Throwable ex) {
Log.e(ex);
}
getMainHandler().post(new Runnable() { getMainHandler().post(new Runnable() {
@Override @Override
public void run() { public void run() {
if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED)) { if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED)) {
ConnectionHelper.NetworkState networkState = ConnectionHelper.getNetworkState(getContext()); tvNetworkMetered.setText(networkState.isUnmetered() ? R.string.title_legend_unmetered : R.string.title_legend_metered);
tvNetworkInfo.setText(sb.toString());
tvConnectionType.setText(networkState.isUnmetered() ? R.string.title_legend_unmetered : R.string.title_legend_metered); tvNetworkMetered.setVisibility(networkState.isConnected() ? View.VISIBLE : View.GONE);
tvConnectionType.setVisibility(networkState.isConnected() ? View.VISIBLE : View.GONE); tvNetworkRoaming.setVisibility(networkState.isRoaming() ? View.VISIBLE : View.GONE);
tvConnectionRoaming.setVisibility(networkState.isRoaming() ? View.VISIBLE : View.GONE); tvNetworkInfo.setVisibility(sb.length() == 0 ? View.GONE : View.VISIBLE);
} }
} }
}); });

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

@ -230,12 +230,12 @@
app:layout_constraintTop_toBottomOf="@id/tvSslHardenHint" /> app:layout_constraintTop_toBottomOf="@id/tvSslHardenHint" />
<eu.faircode.email.FixedTextView <eu.faircode.email.FixedTextView
android:id="@+id/tvConnectionType" android:id="@+id/tvNetworkMetered"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:layout_marginEnd="48dp" android:layout_marginEnd="48dp"
android:text="Connection is unmetered" android:text="@string/title_legend_unmetered"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textStyle="italic" android:textStyle="italic"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@ -243,7 +243,7 @@
app:layout_constraintTop_toBottomOf="@id/btnManage" /> app:layout_constraintTop_toBottomOf="@id/btnManage" />
<eu.faircode.email.FixedTextView <eu.faircode.email.FixedTextView
android:id="@+id/tvConnectionRoaming" android:id="@+id/tvNetworkRoaming"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="6dp" android:layout_marginTop="6dp"
@ -253,6 +253,19 @@
android:textStyle="italic" android:textStyle="italic"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tvConnectionType" /> app:layout_constraintTop_toBottomOf="@+id/tvNetworkMetered" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvNetworkInfo"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:fontFamily="monospace"
android:text="Network info"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tvNetworkRoaming" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</eu.faircode.email.ScrollViewEx> </eu.faircode.email.ScrollViewEx>