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

Connection debug card

Browse Source
This commit is contained in:
M66B
2021-05-15 14:19:20 +02:00
parent 39ae86d0b7
commit bd4f42fcaa
2 changed files with 51 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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