From 3a6655d7ae75a7da6be55772da06aa86adcbe1c3 Mon Sep 17 00:00:00 2001 From: Vincenzo Palazzo Date: Fri, 4 Jun 2021 20:16:43 +0200 Subject: [PATCH] Release lightning version 0.10.0 a.k.a Miami Signed-off-by: Vincenzo Palazzo --- app/src/main/java/com/lvaccaro/lamp/MainActivity.kt | 10 +++++----- app/src/main/java/com/lvaccaro/lamp/utils/Archive.kt | 10 ++++++++-- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/lvaccaro/lamp/MainActivity.kt b/app/src/main/java/com/lvaccaro/lamp/MainActivity.kt index c2451aa4..92db9bf9 100644 --- a/app/src/main/java/com/lvaccaro/lamp/MainActivity.kt +++ b/app/src/main/java/com/lvaccaro/lamp/MainActivity.kt @@ -118,8 +118,8 @@ class MainActivity : UriResultActivity() { } // Check lightning_ndk release version - val release = getPreferences(Context.MODE_PRIVATE).getString("RELEASE", Archive.RELEASE) - if (release != Archive.RELEASE) { + val release = getPreferences(Context.MODE_PRIVATE).getString("RELEASE", Archive.RELEASE.version) + if (release != Archive.RELEASE.version) { AlertDialog.Builder(this) .setTitle(R.string.id_update) .setMessage("New lightning_ndk version is available: ${Archive.RELEASE}. Make a backup from Settings. Tap Update to start download.") @@ -358,8 +358,8 @@ class MainActivity : UriResultActivity() { private fun powerOff() { contentMainOn.visibility = View.GONE contentMainOff.visibility = View.VISIBLE - val release = getPreferences(Context.MODE_PRIVATE).getString("RELEASE", "") - versionText.text = "Version: ${BuildConfig.VERSION_NAME} - ${release}" + //val release = getPreferences(Context.MODE_PRIVATE).getString("RELEASE", "") + versionText.text = "Version: ${BuildConfig.VERSION_NAME} - ${Archive.RELEASE}" statusText.text = "Offline. Rub the lamp to turn on." powerImageView.off() invalidateOptionsMenu() @@ -408,7 +408,7 @@ class MainActivity : UriResultActivity() { return runOnUiThread { - getPreferences(Context.MODE_PRIVATE).edit().putString("RELEASE", Archive.RELEASE).apply() + getPreferences(Context.MODE_PRIVATE).edit().putString("RELEASE", Archive.RELEASE.version).apply() statusText.text = "Download Completed. Uncompressing..." } diff --git a/app/src/main/java/com/lvaccaro/lamp/utils/Archive.kt b/app/src/main/java/com/lvaccaro/lamp/utils/Archive.kt index ef6f47be..b36c1659 100644 --- a/app/src/main/java/com/lvaccaro/lamp/utils/Archive.kt +++ b/app/src/main/java/com/lvaccaro/lamp/utils/Archive.kt @@ -9,8 +9,14 @@ import java.io.* class Archive { + class Release(val name: String, val version: String) { + override fun toString(): String { + return "%s %s".format(name, version).trim() + } + } + companion object { - const val RELEASE = "v0.9.3" + val RELEASE = Release("Miami","v0.10.0") fun arch(): String { var abi: String? @@ -36,7 +42,7 @@ class Archive { fun url(): String { val TAR_FILENAME = tarFilename() - return "https://github.com/lightningamp/lightning_ndk/releases/download/${RELEASE}/${TAR_FILENAME}" + return "https://github.com/lightningamp/lightning_ndk/releases/download/${RELEASE.version}/${TAR_FILENAME}" } fun delete(downloadDir: File): Boolean {