Fix debug info

bitfireAT · Sep 17, 2024 · 35332e7 · 35332e7
1 parent e32c10c
commit 35332e7
Showing 1 changed file with 18 additions and 17 deletions.
diff --git a/app/src/main/kotlin/at/bitfire/davdroid/ui/DebugInfoModel.kt b/app/src/main/kotlin/at/bitfire/davdroid/ui/DebugInfoModel.kt
@@ -257,7 +257,7 @@ class DebugInfoModel @AssistedInject constructor(
             // system info
             val locales: Any = LocaleList.getAdjustedDefault()
             writer.append(
-                "\nSYSTEM INFORMATION\n\n" +
+                "\n\nSYSTEM INFORMATION\n\n" +
                         "Android version: ${Build.VERSION.RELEASE} (${Build.DISPLAY})\n" +
                         "Device: ${Build.MANUFACTURER} ${Build.MODEL} (${Build.DEVICE})\n\n" +
                         "Locale(s): $locales\n" +
@@ -305,7 +305,7 @@ class DebugInfoModel @AssistedInject constructor(
 
             // connectivity
             context.getSystemService<ConnectivityManager>()?.let { connectivityManager ->
-                writer.append("\nCONNECTIVITY\n\n")
+                writer.append("\n\nCONNECTIVITY\n\n")
                 val activeNetwork = connectivityManager.activeNetwork
                 connectivityManager.allNetworks.sortedByDescending { it == activeNetwork }.forEach { network ->
                     val properties = connectivityManager.getLinkProperties(network)
@@ -340,7 +340,7 @@ class DebugInfoModel @AssistedInject constructor(
                 writer.append('\n')
             }
 
-            writer.append("\nCONFIGURATION\n\n")
+            writer.append("\n\nCONFIGURATION\n")
             // notifications
             val nm = NotificationManagerCompat.from(context)
             writer.append("\nNotifications")
@@ -380,19 +380,20 @@ class DebugInfoModel @AssistedInject constructor(
             writer.append('\n')
 
             // accounts
-            writer.append("\nACCOUNTS\n\n")
+            writer.append("\nACCOUNTS")
             val accountManager = AccountManager.get(context)
             for (account in accountRepository.getAll())
-                dumpMainAccount(account, writer)
+                dumpAccount(account, writer)
+
             val addressBookAccounts = accountManager.getAccountsByType(context.getString(R.string.account_type_address_book)).toMutableList()
             if (addressBookAccounts.isNotEmpty()) {
-                writer.append("Address book accounts:\n")
+                writer.append("ADDRESS BOOK ACCOUNTS\n\n")
                 for (account in addressBookAccounts)
                     dumpAddressBookAccount(account, accountManager, writer)
             }
 
             // database dump
-            writer.append("\nDATABASE DUMP\n\n")
+            writer.append("\n\nDATABASE DUMP\n\n")
             db.dump(writer, arrayOf("webdav_document"))
 
             // app settings
@@ -459,12 +460,12 @@ class DebugInfoModel @AssistedInject constructor(
      *
      * Note: Helper method of [generateDebugInfo].
      */
-    private fun dumpMainAccount(account: Account, writer: Writer) {
+    private fun dumpAccount(account: Account, writer: Writer) {
         writer.append("\n\n - Account: ${account.name}\n")
-        writer.append(dumpAccount(account, AccountDumpInfo.mainAccount(context, account)))
-        try {
-            val accountSettings = accountSettingsFactory.create(account)
+        val accountSettings = accountSettingsFactory.create(account)
 
+        writer.append(dumpAccount(account, accountSettings, AccountDumpInfo.mainAccount(context, account)))
+        try {
             val credentials = accountSettings.credentials()
             val authStr = mutableListOf<String>()
             if (credentials.username != null)
@@ -509,10 +510,11 @@ class DebugInfoModel @AssistedInject constructor(
      */
     private fun dumpAddressBookAccount(account: Account, accountManager: AccountManager, writer: Writer) {
         writer.append("  * Address book: ${account.name}\n")
-        val table = dumpAccount(account, AccountDumpInfo.addressBookAccount(account))
+        val table = dumpAccount(account, null, AccountDumpInfo.addressBookAccount(account))
         writer.append(TextTable.indent(table, 4))
-            .append("URL: ${accountManager.getUserData(account, LocalAddressBook.USER_DATA_URL)}\n")
-            .append("    Read-only: ${accountManager.getUserData(account, LocalAddressBook.USER_DATA_READ_ONLY) ?: 0}\n")
+            .append("Collection ID: ${accountManager.getUserData(account, LocalAddressBook.USER_DATA_COLLECTION_ID)}\n")
+            .append("    URL: ${accountManager.getUserData(account, LocalAddressBook.USER_DATA_URL)}\n")
+            .append("    Read-only: ${accountManager.getUserData(account, LocalAddressBook.USER_DATA_READ_ONLY) ?: 0}\n\n")
     }
 
     /**
@@ -522,7 +524,7 @@ class DebugInfoModel @AssistedInject constructor(
      *
      * @return the requested information
      */
-    private fun dumpAccount(account: Account, infos: Iterable<AccountDumpInfo>): String {
+    private fun dumpAccount(account: Account, accountSettings: AccountSettings?, infos: Iterable<AccountDumpInfo>): String {
         val table = TextTable("Authority", "isSyncable", "syncAutomatically", "Interval", "Entries")
         for (info in infos) {
             var nrEntries = "—"
@@ -536,12 +538,11 @@ class DebugInfoModel @AssistedInject constructor(
                 } catch (e: Exception) {
                     nrEntries = e.toString()
                 }
-            val accountSettings = accountSettingsFactory.create(account)
             table.addLine(
                 info.authority,
                 ContentResolver.getIsSyncable(account, info.authority),
                 ContentResolver.getSyncAutomatically(account, info.authority),  // content-triggered sync
-                accountSettings.getSyncInterval(info.authority)?.takeIf { it >= 0 }?.let {"${it/60} min"},
+                accountSettings?.getSyncInterval(info.authority)?.takeIf { it >= 0 }?.let {"${it/60} min"},
                 nrEntries
             )
         }