update pltd and cjdroute, make wallet debug selectable,

app/src/main/java/co/anode/anodium/AnodeClient.kt

@@ -227,7 +227,7 @@ object AnodeClient {
         ignoreErr{ jsonObject.accumulate("localTimestamp", DateTimeFormatter.ISO_INSTANT.format(Instant.now())) }
         ignoreErr{ jsonObject.accumulate("ip4Address", CjdnsSocket.ipv4Address) }
         ignoreErr{ jsonObject.accumulate("ip6Address", CjdnsSocket.ipv6Route) }
-        ignoreErr{ jsonObject.accumulate("cpuUtilizationPercent", anodeUtil.readCPUUsage().toString()) }
+        ignoreErr{ jsonObject.accumulate("cpuUtilizationPercent", "0") }
         ignoreErr{ jsonObject.accumulate("availableMemoryBytes", anodeUtil.readMemUsage()) }
         val prefs = mycontext.getSharedPreferences("co.anode.anodium", Context.MODE_PRIVATE)
         val username = prefs!!.getString("username","")
@@ -281,7 +281,7 @@ object AnodeClient {
         jsonObject.accumulate("localTimestamp", DateTimeFormatter.ISO_INSTANT.format(Instant.now()))
         ignoreErr { jsonObject.accumulate("ip4Address", CjdnsSocket.ipv4Address) }
         ignoreErr { jsonObject.accumulate("ip6Address", CjdnsSocket.ipv6Route) }
-        ignoreErr { jsonObject.accumulate("cpuUtilizationPercent", anodeUtil.readCPUUsage().toString()) }
+        ignoreErr { jsonObject.accumulate("cpuUtilizationPercent", "0") }
         ignoreErr { jsonObject.accumulate("availableMemoryBytes", anodeUtil.readMemUsage()) }
         val prefs = mycontext.getSharedPreferences("co.anode.anodium", Context.MODE_PRIVATE)
         val username = prefs!!.getString("username","")

app/src/main/java/co/anode/anodium/AnodeUtil.kt

@@ -20,6 +20,8 @@ class AnodeUtil(c: Context?) {
     val CJDROUTE_LOG = "cjdroute.log"
     val PLTD_LOG = "pltd.log"
     val PLTD_BINFILE = "pltd"
+    lateinit var pltd_pb: Process
+    lateinit var cjdns_pb: Process
     private val CJDROUTE_TEMPCONFFILE = "tempcjdroute.conf"
 
     init {
@@ -47,6 +49,12 @@ class AnodeUtil(c: Context?) {
         newPath = "$filesdir/pltd"
         Os.symlink(oldPath,newPath)
 
+
+        //Create lnd directory
+        val lnddir = File("$CJDNS_PATH/lnd")
+        if (!lnddir.exists()) {
+            lnddir.mkdir()
+        }
         //Copy tls files
         var `in`: InputStream
         var out: OutputStream?
@@ -84,8 +92,8 @@ class AnodeUtil(c: Context?) {
         val confFile = File("$CJDNS_PATH/$CJDROUTE_CONFFILE")
         if (!confFile.exists()) {
             initializeCjdrouteConfFile()
-            launchCJDNS()
         }
+        launchCJDNS()
         launchpltd()
     }
 
@@ -130,9 +138,9 @@ class AnodeUtil(c: Context?) {
                     .redirectOutput(File(CJDNS_PATH, CJDROUTE_LOG))
                     .redirectErrorStream(true)
             pb.environment()["TMPDIR"] = CJDNS_PATH
-            val p = processBuilder.start()
-            p.waitFor()
-            Log.e(LOGTAG, "cjdns exited with " + p.exitValue())
+            cjdns_pb = processBuilder.start()
+            cjdns_pb.waitFor()
+            Log.e(LOGTAG, "cjdns exited with " + cjdns_pb.exitValue())
         } catch (e: Exception) {
             throw AnodeUtilException("Failed to execute cjdroute " + e.message)
         }
@@ -148,9 +156,7 @@ class AnodeUtil(c: Context?) {
                     .redirectOutput(File(CJDNS_PATH, PLTD_LOG))
                     .redirectErrorStream(true)
             pb.environment()["TMPDIR"] = CJDNS_PATH
-            val p = processBuilder.start()
-            //p.waitFor()
-            //Log.e(LOGTAG, "pltd exited with " + p.exitValue())
+            pltd_pb = processBuilder.start()
         } catch (e: Exception) {
             throw AnodeUtilException("Failed to execute pltd " + e.message)
         }
@@ -211,29 +217,6 @@ class AnodeUtil(c: Context?) {
         }
     }
 
-    fun readCPUUsage(): Float {
-        /*try {
-            val reader = RandomAccessFile("/proc/stat", "r")
-            var load = reader.readLine()
-            var toks = load.split(" +").toTypedArray() // Split on one or more spaces
-            val idle1 = toks[4].toLong()
-            val cpu1 = toks[2].toLong() + toks[3].toLong() + toks[5].toLong() + toks[6].toLong() + toks[7].toLong() + toks[8].toLong()
-            try {
-                Thread.sleep(360)
-            } catch (e: java.lang.Exception) {}
-            reader.seek(0)
-            load = reader.readLine()
-            reader.close()
-            toks = load.split(" +").toTypedArray()
-            val idle2 = toks[4].toLong()
-            val cpu2 = toks[2].toLong() + toks[3].toLong() + toks[5].toLong() + toks[6].toLong() + toks[7].toLong() + toks[8].toLong()
-            return (cpu2 - cpu1).toFloat() / (cpu2 + idle2 - (cpu1 + idle1))
-        } catch (ex: IOException) {
-            ex.printStackTrace()
-        }*/
-        return 0f
-    }
-
     fun readMemUsage(): String {
         val runtime = Runtime.getRuntime();
         val usedMemInMB=(runtime.totalMemory() - runtime.freeMemory()) / 1048576L;

app/src/main/java/co/anode/anodium/LndRPCController.kt

@@ -87,7 +87,7 @@ object LndRPCController {
             Log.e(LOGTAG, e.toString())
             return e.toString()
         }
-        return "fdsgfd"//"OK"
+        return "OK"
     }
 
     fun getPubKey() {

app/src/main/res/layout/activity_debug_wallet.xml

@@ -13,6 +13,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
+            android:textIsSelectable="true"
             android:layout_marginEnd="20dp"/>
     </ScrollView>
 </androidx.constraintlayout.widget.ConstraintLayout>

build.gradle

@@ -1,26 +1,27 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.72'
+    ext.kotlin_version = '1.4.31'
 
     repositories {
         google()
         jcenter()
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:4.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
+        //classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.13'
     }
 }
 
 allprojects {
     repositories {
         google()
         jcenter()
-
+        maven { url "https://jitpack.io" }
     }
 }
 

gradle.properties

@@ -17,4 +17,4 @@ org.gradle.jvmargs=-Xmx1536m
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
-
+android.bundle.enableUncompressedNativeLibs=false

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip