From ca45b37baa303c9a5a969e6861f7c4d742d45368 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Fri, 31 May 2024 23:32:03 +0100 Subject: [PATCH] Use peer count to track enabled/connected, remove unused submodule --- .gitmodules | 3 --- .../java/eu/neilalexander/yggdrasil/MainActivity.kt | 10 +++++----- libs/yggdrasil-go | 1 - 3 files changed, 5 insertions(+), 9 deletions(-) delete mode 160000 libs/yggdrasil-go diff --git a/.gitmodules b/.gitmodules index 3340ab4..e69de29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "libs/yggdrasil-go"] - path = libs/yggdrasil-go - url = https://github.com/yggdrasil-network/yggdrasil-go diff --git a/app/src/main/java/eu/neilalexander/yggdrasil/MainActivity.kt b/app/src/main/java/eu/neilalexander/yggdrasil/MainActivity.kt index 947dd07..106189c 100644 --- a/app/src/main/java/eu/neilalexander/yggdrasil/MainActivity.kt +++ b/app/src/main/java/eu/neilalexander/yggdrasil/MainActivity.kt @@ -155,11 +155,11 @@ class MainActivity : AppCompatActivity() { "state" -> { enabledLabel.text = if (intent.getBooleanExtra("started", false)) { var count = 0 - if (intent.hasExtra("tree")) { - val tree = intent.getStringExtra("tree") - if (tree != null && tree != "null") { - val treeState = JSONArray(tree) - count = treeState.length() + if (intent.hasExtra("peers")) { + val peers = intent.getStringExtra("peers") + if (peers != null && peers != "null") { + val peerState = JSONArray(peers) + count = peerState.length() } } if (count == 0) { diff --git a/libs/yggdrasil-go b/libs/yggdrasil-go deleted file mode 160000 index 6b6cd0b..0000000 --- a/libs/yggdrasil-go +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6b6cd0bed553ada887632524994e4de4e839688e