msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Connection debug card

Browse Source
pull/198/head
M66B 4 years ago
parent 39ae86d0b7
commit bd4f42fcaa
2 changed files with 51 additions and 14 deletions
Show Stats Download Patch File Download Diff File

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

@ -50,6 +50,7 @@ import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.appcompat.widget.SwitchCompat; import androidx.appcompat.widget.SwitchCompat;
import androidx.cardview.widget.CardView;
import androidx.constraintlayout.widget.Group; import androidx.constraintlayout.widget.Group;
import androidx.core.content.ContextCompat; import androidx.core.content.ContextCompat;
import androidx.lifecycle.Lifecycle; import androidx.lifecycle.Lifecycle;
@ -72,6 +73,7 @@ public class FragmentOptionsConnection extends FragmentBase implements SharedPre
private Button btnManage; private Button btnManage;
private TextView tvNetworkMetered; private TextView tvNetworkMetered;
private TextView tvNetworkRoaming; private TextView tvNetworkRoaming;
private CardView cardDebug;
private TextView tvNetworkInfo; private TextView tvNetworkInfo;
private Group grpValidated; private Group grpValidated;
@ -109,6 +111,8 @@ public class FragmentOptionsConnection extends FragmentBase implements SharedPre
tvNetworkMetered = view.findViewById(R.id.tvNetworkMetered); tvNetworkMetered = view.findViewById(R.id.tvNetworkMetered);
tvNetworkRoaming = view.findViewById(R.id.tvNetworkRoaming); tvNetworkRoaming = view.findViewById(R.id.tvNetworkRoaming);
cardDebug = view.findViewById(R.id.cardDebug);
tvNetworkInfo = view.findViewById(R.id.tvNetworkInfo); tvNetworkInfo = view.findViewById(R.id.tvNetworkInfo);
grpValidated = view.findViewById(R.id.grpValidated); grpValidated = view.findViewById(R.id.grpValidated);
@ -264,7 +268,7 @@ public class FragmentOptionsConnection extends FragmentBase implements SharedPre
tvNetworkMetered.setVisibility(View.GONE); tvNetworkMetered.setVisibility(View.GONE);
tvNetworkRoaming.setVisibility(View.GONE); tvNetworkRoaming.setVisibility(View.GONE);
tvNetworkInfo.setVisibility(View.GONE); cardDebug.setVisibility(View.GONE);
return view; return view;
} }
@ -390,7 +394,7 @@ public class FragmentOptionsConnection extends FragmentBase implements SharedPre
if (context == null) { if (context == null) {
tvNetworkMetered.setVisibility(View.GONE); tvNetworkMetered.setVisibility(View.GONE);
tvNetworkRoaming.setVisibility(View.GONE); tvNetworkRoaming.setVisibility(View.GONE);
tvNetworkInfo.setVisibility(View.GONE); cardDebug.setVisibility(View.GONE);
return; return;
} }
@ -399,7 +403,8 @@ public class FragmentOptionsConnection extends FragmentBase implements SharedPre
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean debug = prefs.getBoolean("debug", false); boolean debug = prefs.getBoolean("debug", false);
if ((debug || BuildConfig.DEBUG) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) if ((debug || BuildConfig.DEBUG) &&
Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
try { try {
ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
Network active = (cm == null ? null : cm.getActiveNetwork()); Network active = (cm == null ? null : cm.getActiveNetwork());
@ -418,7 +423,7 @@ public class FragmentOptionsConnection extends FragmentBase implements SharedPre
} }
sb.append("Airplane mode=") sb.append("Airplane mode=")
.append(ConnectionHelper.airplaneMode(context)).append("\r\n\r\n"); .append(ConnectionHelper.airplaneMode(context)).append("\r\n");
} catch (Throwable ex) { } catch (Throwable ex) {
Log.e(ex); Log.e(ex);
} }
@ -431,7 +436,7 @@ public class FragmentOptionsConnection extends FragmentBase implements SharedPre
tvNetworkInfo.setText(sb.toString()); tvNetworkInfo.setText(sb.toString());
tvNetworkMetered.setVisibility(networkState.isConnected() ? View.VISIBLE : View.GONE); tvNetworkMetered.setVisibility(networkState.isConnected() ? View.VISIBLE : View.GONE);
tvNetworkRoaming.setVisibility(networkState.isRoaming() ? View.VISIBLE : View.GONE); tvNetworkRoaming.setVisibility(networkState.isRoaming() ? View.VISIBLE : View.GONE);
tvNetworkInfo.setVisibility(sb.length() == 0 ? View.GONE : View.VISIBLE); cardDebug.setVisibility(sb.length() == 0 ? View.GONE : View.VISIBLE);
} }
} }
}); });

50
app/src/main/res/layout/fragment_options_connection.xml
Unescape View File

@ -420,18 +420,50 @@
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>
<eu.faircode.email.FixedTextView <androidx.cardview.widget.CardView
android:id="@+id/tvNetworkInfo" android:id="@+id/cardDebug"
android:layout_width="0dp" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="3dp"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:fontFamily="monospace" app:cardBackgroundColor="?attr/colorCardBackground"
android:text="Network info" app:cardCornerRadius="6dp"
android:textAppearance="@style/TextAppearance.AppCompat.Small" app:cardElevation="0dp"
android:textIsSelectable="true"
android:textSize="12sp"
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/cardAdvanced" /> app:layout_constraintTop_toBottomOf="@id/cardAdvanced">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="6dp">
<eu.faircode.email.FixedTextView
android:id="@+id/tvCaptionDebug"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/title_advanced_caption_debug"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvNetworkInfo"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:fontFamily="monospace"
android:text="Network info"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="?android:attr/textColorPrimary"
android:textIsSelectable="true"
android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvCaptionDebug" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</eu.faircode.email.ScrollViewEx> </eu.faircode.email.ScrollViewEx>

Write Preview
Loading…
Cancel
Save