commit a1e7f234f96494eb38f3cc5b80a1b4e1617f3178
parent 0bfb75d00cd4e82760810f356a2aee330f9806aa
Author: rhunk <101876869+rhunk@users.noreply.github.com>
Date: Mon, 7 Aug 2023 00:58:36 +0200
fix(auto_updater): cpu arch deprecated method
- remove unused import
Diffstat:
2 files changed, 6 insertions(+), 24 deletions(-)
diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/AutoUpdater.kt b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/AutoUpdater.kt
@@ -7,6 +7,7 @@ import android.content.Context
import android.content.Intent
import android.content.IntentFilter
import android.net.Uri
+import android.os.Build
import android.os.Environment
import com.google.gson.JsonParser
import me.rhunk.snapenhance.Logger
@@ -41,11 +42,6 @@ class AutoUpdater : Feature("AutoUpdater", loadParams = FeatureLoadParams.ACTIVI
}
}
- @Suppress("DEPRECATION")
- private fun getCPUArchitecture(): String {
- return Build.CPU_ABI
- }
-
@SuppressLint("UnspecifiedRegisterReceiverFlag")
fun checkForUpdates(): String? {
val endpoint = Request.Builder().url("https://api.github.com/repos/rhunk/SnapEnhance/releases").build()
@@ -61,10 +57,10 @@ class AutoUpdater : Feature("AutoUpdater", loadParams = FeatureLoadParams.ACTIVI
val latestVersion = latestRelease.getAsJsonPrimitive("tag_name").asString
if (latestVersion.removePrefix("v") == BuildConfig.VERSION_NAME) return null
- val architectureName = when (getCPUArchitecture()) {
- "armeabi-v7a", "armeabi" -> "armv7"
- "arm64-v8a" -> "armv8"
- else -> { throw Throwable("Failed getting architecture") }
+ val architectureName = Build.SUPPORTED_ABIS.let {
+ if (it.contains("arm64-v8a")) return@let "armv8"
+ if (it.contains("armeabi-v7a") || it.contains("armeabi")) return@let "armv7"
+ throw Throwable("Failed getting architecture")
}
val releaseContentBody = latestRelease.getAsJsonPrimitive("body").asString
diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/ui/menu/impl/SettingsMenu.kt b/core/src/main/kotlin/me/rhunk/snapenhance/ui/menu/impl/SettingsMenu.kt
@@ -1,24 +1,10 @@
package me.rhunk.snapenhance.ui.menu.impl
import android.annotation.SuppressLint
-import android.app.AlertDialog
-import android.graphics.Color
-import android.graphics.Typeface
-import android.text.InputType
import android.view.View
import android.widget.Button
-import android.widget.EditText
-import android.widget.LinearLayout
-import android.widget.Switch
-import android.widget.TextView
-import me.rhunk.snapenhance.config.ConfigProperty
-import me.rhunk.snapenhance.config.impl.ConfigIntegerValue
-import me.rhunk.snapenhance.config.impl.ConfigStateListValue
-import me.rhunk.snapenhance.config.impl.ConfigStateSelection
-import me.rhunk.snapenhance.config.impl.ConfigStateValue
-import me.rhunk.snapenhance.config.impl.ConfigStringValue
-import me.rhunk.snapenhance.ui.menu.AbstractMenu
import me.rhunk.snapenhance.ui.ViewAppearanceHelper
+import me.rhunk.snapenhance.ui.menu.AbstractMenu
class SettingsMenu : AbstractMenu() {
//TODO: quick settings
