From 1cf6b20370a599b5fae036016ae5d64187170d32 Mon Sep 17 00:00:00 2001 From: TwistedUmbrellaX Date: Sun, 17 Mar 2024 10:27:54 -0400 Subject: [PATCH] fix: address deprecated code Build.RADIO has been deprecated since API 15, which means it hasn't worked since before the lowest target API of the app, and versioncode is deprecated in API 28. --- app/src/main/java/ani/dantotsu/util/Logger.kt | 61 +++++++++++-------- 1 file changed, 35 insertions(+), 26 deletions(-) diff --git a/app/src/main/java/ani/dantotsu/util/Logger.kt b/app/src/main/java/ani/dantotsu/util/Logger.kt index a6780748..3ecd501b 100644 --- a/app/src/main/java/ani/dantotsu/util/Logger.kt +++ b/app/src/main/java/ani/dantotsu/util/Logger.kt @@ -2,6 +2,7 @@ package ani.dantotsu.util import android.content.Context import android.content.Intent +import android.os.Build import android.util.Log import androidx.core.content.FileProvider import ani.dantotsu.BuildConfig @@ -31,8 +32,8 @@ object Logger { } file?.writeText("log started\n") file?.appendText("date/time: ${Date()}\n") - file?.appendText("device: ${android.os.Build.MODEL}\n") - file?.appendText("os version: ${android.os.Build.VERSION.RELEASE}\n") + file?.appendText("device: ${Build.MODEL}\n") + file?.appendText("os version: ${Build.VERSION.RELEASE}\n") file?.appendText( "app version: ${ context.packageManager.getPackageInfo( @@ -43,32 +44,40 @@ object Logger { ) file?.appendText( "app version code: ${ - context.packageManager.getPackageInfo( - context.packageName, - 0 - ).versionCode + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { + context.packageManager.getPackageInfo( + context.packageName, + 0 + ).longVersionCode + } else { + @Suppress("DEPRECATION") + context.packageManager.getPackageInfo( + context.packageName, + 0 + ).versionCode + } }\n" ) - file?.appendText("sdk version: ${android.os.Build.VERSION.SDK_INT}\n") - file?.appendText("manufacturer: ${android.os.Build.MANUFACTURER}\n") - file?.appendText("brand: ${android.os.Build.BRAND}\n") - file?.appendText("product: ${android.os.Build.PRODUCT}\n") - file?.appendText("device: ${android.os.Build.DEVICE}\n") - file?.appendText("hardware: ${android.os.Build.HARDWARE}\n") - file?.appendText("host: ${android.os.Build.HOST}\n") - file?.appendText("id: ${android.os.Build.ID}\n") - file?.appendText("type: ${android.os.Build.TYPE}\n") - file?.appendText("user: ${android.os.Build.USER}\n") - file?.appendText("tags: ${android.os.Build.TAGS}\n") - file?.appendText("time: ${android.os.Build.TIME}\n") - file?.appendText("radio: ${android.os.Build.RADIO}\n") - file?.appendText("bootloader: ${android.os.Build.BOOTLOADER}\n") - file?.appendText("board: ${android.os.Build.BOARD}\n") - file?.appendText("fingerprint: ${android.os.Build.FINGERPRINT}\n") - file?.appendText("supported_abis: ${android.os.Build.SUPPORTED_ABIS.joinToString()}\n") - file?.appendText("supported_32_bit_abis: ${android.os.Build.SUPPORTED_32_BIT_ABIS.joinToString()}\n") - file?.appendText("supported_64_bit_abis: ${android.os.Build.SUPPORTED_64_BIT_ABIS.joinToString()}\n") - file?.appendText("is emulator: ${android.os.Build.FINGERPRINT.contains("generic")}\n") + file?.appendText("sdk version: ${Build.VERSION.SDK_INT}\n") + file?.appendText("manufacturer: ${Build.MANUFACTURER}\n") + file?.appendText("brand: ${Build.BRAND}\n") + file?.appendText("product: ${Build.PRODUCT}\n") + file?.appendText("device: ${Build.DEVICE}\n") + file?.appendText("hardware: ${Build.HARDWARE}\n") + file?.appendText("host: ${Build.HOST}\n") + file?.appendText("id: ${Build.ID}\n") + file?.appendText("type: ${Build.TYPE}\n") + file?.appendText("user: ${Build.USER}\n") + file?.appendText("tags: ${Build.TAGS}\n") + file?.appendText("time: ${Build.TIME}\n") + file?.appendText("radio: ${Build.getRadioVersion()}\n") + file?.appendText("bootloader: ${Build.BOOTLOADER}\n") + file?.appendText("board: ${Build.BOARD}\n") + file?.appendText("fingerprint: ${Build.FINGERPRINT}\n") + file?.appendText("supported_abis: ${Build.SUPPORTED_ABIS.joinToString()}\n") + file?.appendText("supported_32_bit_abis: ${Build.SUPPORTED_32_BIT_ABIS.joinToString()}\n") + file?.appendText("supported_64_bit_abis: ${Build.SUPPORTED_64_BIT_ABIS.joinToString()}\n") + file?.appendText("is emulator: ${Build.FINGERPRINT.contains("generic")}\n") file?.appendText("--------------------------------\n") } catch (e: Exception) { Injekt.get().logException(e)