From 2d18410348a9e1e713af9331b85ee66c23fa7ac2 Mon Sep 17 00:00:00 2001 From: Seishirou101 <57241064+Seishirou101@users.noreply.github.com.> Date: Tue, 24 Oct 2023 10:27:40 -0500 Subject: [PATCH] add ext info to crashlog --- .../eu/kanade/tachiyomi/util/CrashLogUtil.kt | 33 ++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/CrashLogUtil.kt b/app/src/main/java/eu/kanade/tachiyomi/util/CrashLogUtil.kt index 505ec3cf9b..ade1e64dbd 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/CrashLogUtil.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/CrashLogUtil.kt @@ -3,6 +3,7 @@ package eu.kanade.tachiyomi.util import android.content.Context import android.os.Build import eu.kanade.tachiyomi.BuildConfig +import eu.kanade.tachiyomi.extension.ExtensionManager import eu.kanade.tachiyomi.util.storage.getUriCompat import eu.kanade.tachiyomi.util.system.WebViewUtil import eu.kanade.tachiyomi.util.system.createFileInCacheDir @@ -10,14 +11,18 @@ import eu.kanade.tachiyomi.util.system.toShareIntent import eu.kanade.tachiyomi.util.system.toast import tachiyomi.core.util.lang.withNonCancellableContext import tachiyomi.core.util.lang.withUIContext +import uy.kohesive.injekt.Injekt +import uy.kohesive.injekt.api.get class CrashLogUtil(private val context: Context) { suspend fun dumpLogs() = withNonCancellableContext { try { val file = context.createFileInCacheDir("tachiyomi_crash_logs.txt") + file.appendText(getDebugInfo() + "\n\n") + file.appendText(getExtensionsInfo() + "\n\n") Runtime.getRuntime().exec("logcat *:E -d -f ${file.absolutePath}").waitFor() - file.appendText(getDebugInfo()) + val uri = file.getUriCompat(context) context.startActivity(uri.toShareIntent(context, "text/plain")) @@ -26,6 +31,32 @@ class CrashLogUtil(private val context: Context) { } } + private fun getExtensionsInfo(): String { + val extensionManager: ExtensionManager = Injekt.get() + val installedExtensions = extensionManager.installedExtensionsFlow.value + val availableExtensions = extensionManager.availableExtensionsFlow.value + + val extensionInfoList = mutableListOf() + + for (installedExtension in installedExtensions) { + val availableExtension = availableExtensions.find { it.pkgName == installedExtension.pkgName } + + val hasUpdate = (availableExtension?.versionCode ?: 0) > installedExtension.versionCode + if (hasUpdate || installedExtension.isObsolete) { + val extensionInfo = + "Extension Name: ${installedExtension.name}\n" + + "Installed Version: ${installedExtension.versionName}\n" + + "Available Version: ${availableExtension?.versionName ?: "N/A"}\n" + + "Obsolete: ${installedExtension.isObsolete}\n" + extensionInfoList.add(extensionInfo) + } + } + if (extensionInfoList.isNotEmpty()) { + extensionInfoList.add(0, "Extensions that are outdated or obsolete") + } + return extensionInfoList.joinToString("\n") + } + fun getDebugInfo(): String { return """ App version: ${BuildConfig.VERSION_NAME} (${BuildConfig.FLAVOR}, ${BuildConfig.COMMIT_SHA}, ${BuildConfig.VERSION_CODE}, ${BuildConfig.BUILD_TIME})