From afd12dcc1c280bbd83c9da1b076be9ca097d0ba9 Mon Sep 17 00:00:00 2001 From: hg42 Date: Tue, 22 Oct 2024 05:25:10 +0200 Subject: [PATCH] revert to BuildConfig, fix init sequence problems --- .../com/machiav3lli/backup/utils/SystemUtils.kt | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/machiav3lli/backup/utils/SystemUtils.kt b/src/main/java/com/machiav3lli/backup/utils/SystemUtils.kt index f5fee9af6..b2aa6deaa 100644 --- a/src/main/java/com/machiav3lli/backup/utils/SystemUtils.kt +++ b/src/main/java/com/machiav3lli/backup/utils/SystemUtils.kt @@ -64,19 +64,15 @@ object SystemUtils { return null } - val packageName = com.machiav3lli.backup.BuildConfig.APPLICATION_ID + val packageName get() = com.machiav3lli.backup.BuildConfig.APPLICATION_ID @Suppress("DEPRECATION") - val versionCode = if (OABX.minSDK(28)) { - OABX.context.getApplicationInfos()?.longVersionCode - } else { - OABX.context.getApplicationInfos()?.versionCode - } ?: com.machiav3lli.backup.BuildConfig.VERSION_CODE - val versionName = OABX.context.getApplicationInfos()?.versionName ?: com.machiav3lli.backup.BuildConfig.VERSION_NAME - val updateId = "${OABX.context.getApplicationInfos()?.lastUpdateTime?.toString()}-${versionName}" + val versionCode get() = com.machiav3lli.backup.BuildConfig.VERSION_CODE + val versionName get() = com.machiav3lli.backup.BuildConfig.VERSION_NAME + val updateId get() = "${OABX.context.getApplicationInfos()?.lastUpdateTime?.toString()}-${versionName}" - val applicationIssuer = OABX.context.getApplicationIssuer() ?: "UNKNOWN ISSUER" + val applicationIssuer get() = OABX.context.getApplicationIssuer() ?: "UNKNOWN ISSUER" - val numCores = Runtime.getRuntime().availableProcessors() + val numCores get() = Runtime.getRuntime().availableProcessors() suspend fun runParallel( items: List,