update to lightningd v0.9.3

This commit add the support to lightningd 0.9.3, in
addition add an small exception to check if there is some error during the archive operation.


Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>

app/src/main/java/com/lvaccaro/lamp/MainActivity.kt

@@ -155,9 +155,7 @@ class MainActivity : UriResultActivity() {
         }
 
         if (!isLightningRunning()) {
-            statusText.text =
-                "Offline. Rub the lamp to start."
-
+            statusText.text = "Offline. Rub the lamp to start."
             val sharedPref = PreferenceManager.getDefaultSharedPreferences(applicationContext)
             if (isFirstStart && sharedPref.getBoolean("autostart", true))
                 start()
@@ -332,14 +330,22 @@ class MainActivity : UriResultActivity() {
         val tarFile = File(dir(), Archive.tarFilename())
         if (tarFile.exists()) {
             // Uncompress package
-            statusText.text =
-                "Package already downloaded. Uncompressing..."
+            statusText.text = "Package already downloaded. Uncompressing..."
             powerImageView.animating()
             doAsync {
-                Archive.uncompressXZ(tarFile, rootDir())
-                runOnUiThread {
-                    powerOff()
+                try {
+                    Archive.uncompressXZ(tarFile, rootDir())
+                } catch(ex: Exception) {
+                    Log.e(TAG, "Error during uncompressXZ operation %s".format(ex.localizedMessage))
+                    runOnUiThread {
+                        UI.snackBar(this@MainActivity, "Error During download lightning node")
+                    }
+                }finally {
+                    runOnUiThread {
+                        powerOff()
+                    }
                 }
+
             }
         } else {
             statusText.text =

app/src/main/java/com/lvaccaro/lamp/utils/Archive.kt

@@ -5,15 +5,12 @@ import org.apache.commons.compress.archivers.tar.TarArchiveEntry
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream
 import org.apache.commons.compress.compressors.xz.XZCompressorInputStream
 import org.apache.commons.compress.utils.IOUtils
-import java.io.BufferedInputStream
-import java.io.File
-import java.io.FileInputStream
-import java.io.FileOutputStream
+import java.io.*
 
 class Archive {
 
     companion object {
-        val RELEASE = "v0.9.2"
+        const val RELEASE = "v0.9.3"
 
         fun arch(): String {
             var abi: String?
@@ -33,7 +30,7 @@ class Archive {
 
         fun tarFilename(): String {
             val ARCH = arch()
-            val PACKAGE = "bitcoin"
+            val PACKAGE = "lightning_ndk"
             return "${ARCH}_${PACKAGE}.tar.xz"
         }
 
@@ -60,39 +57,36 @@ class Archive {
             mkdir(File(outputDir, "plugins"))
             mkdir(File(outputDir, "lightningd"))
             mkdir(File(outputDir, "cli"))
-
             val input = TarArchiveInputStream(
-                BufferedInputStream(
-                    XZCompressorInputStream(
-                        BufferedInputStream(FileInputStream(inputFile))
+                    BufferedInputStream(
+                            XZCompressorInputStream(
+                                    BufferedInputStream(FileInputStream(inputFile))
+                            )
                     )
-                )
             )
             var counter = 0
             var entry = input.nextEntry
             while (entry != null) {
-
                 val name = entry.name
-                val f = File(outputDir, name)
-
-                var out = FileOutputStream(f)
+                val file: File?
+                file = File(outputDir, name)
+                val out = FileOutputStream(file)
                 try {
                     IOUtils.copy(input, out)
                 } finally {
                     IOUtils.closeQuietly(out)
                 }
-
                 val mode = (entry as TarArchiveEntry).mode
                 //noinspection ResultOfMethodCallIgnored
-                f.setExecutable(true, mode and 1 == 0)
+                file.setExecutable(true, mode and 1 == 0)
                 entry = input.nextEntry
                 counter++
             }
             IOUtils.closeQuietly(input)
             inputFile.delete()
         }
 
-        fun mkdir(dir: File) {
+        private fun mkdir(dir: File) {
             if (!dir.exists()) {
                 dir.mkdir()
             }

app/src/main/java/com/lvaccaro/lamp/utils/UI.kt

@@ -1,7 +1,5 @@
 package com.lvaccaro.lamp.utils
 
-import android.app.Notification
-import android.app.Notification.VISIBILITY_PUBLIC
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.content.ClipData
@@ -15,7 +13,6 @@ import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.NotificationCompat
-import androidx.core.content.ContextCompat.getSystemService
 import com.google.android.material.snackbar.Snackbar
 import com.google.zxing.WriterException
 import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel