Debug info public suffix list size

app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java

@@ -37,6 +37,7 @@ import android.os.Bundle;
 import android.os.Debug;
 import android.provider.Settings;
 import android.text.SpannableStringBuilder;
+import android.text.Spanned;
 import android.text.style.RelativeSizeSpan;
 import android.text.style.StyleSpan;
 import android.util.Pair;
@@ -143,6 +144,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
     private TextView tvMemoryClass;
     private TextView tvMemoryUsage;
     private TextView tvStorageUsage;
+    private TextView tvSuffixes;
     private TextView tvFingerprint;
     private Button btnGC;
     private Button btnCharsets;
@@ -262,6 +264,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
         tvMemoryClass = view.findViewById(R.id.tvMemoryClass);
         tvMemoryUsage = view.findViewById(R.id.tvMemoryUsage);
         tvStorageUsage = view.findViewById(R.id.tvStorageUsage);
+        tvSuffixes = view.findViewById(R.id.tvSuffixes);
         tvFingerprint = view.findViewById(R.id.tvFingerprint);
         btnGC = view.findViewById(R.id.btnGC);
         btnCharsets = view.findViewById(R.id.btnCharsets);
@@ -959,8 +962,6 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
 
         setLastCleanup(prefs.getLong("last_cleanup", -1));
 
-        setPermissionInfo();
-
         swExactAlarms.setEnabled(AlarmManagerCompatEx.canScheduleExactAlarms(getContext()));
         swTestIab.setVisibility(BuildConfig.DEBUG ? View.VISIBLE : View.GONE);
 
@@ -969,6 +970,13 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
         return view;
     }
 
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        setSuffixes();
+        setPermissionInfo();
+    }
+
     @Override
     public void onResume() {
         super.onResume();
@@ -1227,8 +1235,40 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
                         time < 0 ? "-" : DTF.format(time)));
     }
 
+    private void setSuffixes() {
+        new SimpleTask<Integer>() {
+            @Override
+            protected void onPreExecute(Bundle args) {
+                tvSuffixes.setText(getString(R.string.title_advanced_suffixes, -1));
+            }
+
+            @Override
+            protected Integer onExecute(Context context, Bundle args) {
+                return UriHelper.getSuffixCount(context);
+            }
+
+            @Override
+            protected void onExecuted(Bundle args, Integer count) {
+                tvSuffixes.setText(getString(R.string.title_advanced_suffixes, count));
+            }
+
+            @Override
+            protected void onException(Bundle args, Throwable ex) {
+                Log.w(ex);
+                tvSuffixes.setText(ex.toString());
+            }
+        }.execute(this, new Bundle(), "suffixes");
+    }
+
     private void setPermissionInfo() {
-        try {
+        new SimpleTask<Spanned>() {
+            @Override
+            protected void onPreExecute(Bundle args) {
+                tvPermissions.setText(null);
+            }
+
+            @Override
+            protected Spanned onExecute(Context context, Bundle args) throws Throwable {
                 int start = 0;
                 int dp24 = Helper.dp2pixels(getContext(), 24);
                 SpannableStringBuilder ssb = new SpannableStringBuilderEx();
@@ -1295,11 +1335,21 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
 
                     ssb.append('\n');
                 }
-            tvPermissions.setText(ssb);
+
-        } catch (Throwable ex) {
+                return ssb;
+            }
+
+            @Override
+            protected void onExecuted(Bundle args, Spanned permissions) {
+                tvPermissions.setText(permissions);
+            }
+
+            @Override
+            protected void onException(Bundle args, Throwable ex) {
                 Log.w(ex);
                 tvPermissions.setText(ex.toString());
             }
+        }.execute(this, new Bundle(), "permissions");
     }
 
     private static class StorageData {

app/src/main/java/eu/faircode/email/UriHelper.java

@@ -162,7 +162,14 @@ public class UriHelper {
         }
     }
 
-    static void ensureSuffixList(Context context) {
+    static int getSuffixCount(Context context) {
+        ensureSuffixList(context);
+        synchronized (suffixList) {
+            return suffixList.size();
+        }
+    }
+
+    private static void ensureSuffixList(Context context) {
         synchronized (suffixList) {
             if (suffixList.size() > 0)
                 return;

app/src/main/res/layout/fragment_options_misc.xml

@@ -855,6 +855,17 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvMemoryUsage" />
 
+                <eu.faircode.email.FixedTextView
+                    android:id="@+id/tvSuffixes"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:text="@string/title_advanced_suffixes"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                    android:textIsSelectable="true"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/tvStorageUsage" />
+
                 <eu.faircode.email.FixedTextView
                     android:id="@+id/tvFingerprint"
                     android:layout_width="0dp"
@@ -865,7 +876,7 @@
                     android:textIsSelectable="true"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/tvStorageUsage" />
+                    app:layout_constraintTop_toBottomOf="@id/tvSuffixes" />
 
                 <Button
                     android:id="@+id/btnGC"

app/src/main/res/values/strings.xml

@@ -660,6 +660,7 @@
     <string name="title_advanced_memory_class" translatable="false">Memory class: %1$s/%2$s Total: %3$s</string>
     <string name="title_advanced_memory_usage" translatable="false">Memory usage: %1$s/%2$s Native: %3$s</string>
     <string name="title_advanced_storage_usage" translatable="false">Storage space: %1$s/%2$s App: %3$s</string>
+    <string name="title_advanced_suffixes" translatable="false">Public suffix list: %1$d</string>
     <string name="title_advanced_gc" translatable="false">GC</string>
     <string name="title_advanced_charsets" translatable="false">Charsets</string>
     <string name="title_advanced_ciphers" translatable="false">Ciphers</string>