1. #6. added multicast peers to peer list

vikulin · Dec 7, 2020 · fd6f741 · fd6f741
1 parent c5344d5
commit fd6f741
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt b/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt
@@ -258,7 +258,7 @@ class MainActivity : AppCompatActivity() {
         thread(start = true) {
             while(true) {
                 Thread.sleep(5000)
-                if(isStarted && this.currentPeers.isEmpty()) {
+                if(isStarted) {
                     updatePeers()
                 }
             }
@@ -340,9 +340,7 @@ class MainActivity : AppCompatActivity() {
         when (resultCode) {
             STATUS_START -> {
                 print("service started")
-                if (this.currentPeers.isEmpty()) {
-                    checkPeers()
-                }
+                checkPeers()
             }
             STATUS_FINISH -> {
                 isStarted = true

diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/models/config/Utils.kt b/app/src/main/java/io/github/chronosx88/yggdrasil/models/config/Utils.kt
@@ -120,7 +120,13 @@ class Utils {
                     if(p.endpoint == "(self)"){
                         out.add(PeerInfo(p.protocol, InetAddress.getByName("localhost"), p.port, null, true))
                     } else {
-                        var fixWlanPart = p.endpoint.substring(p.endpoint.indexOf('%'), p.endpoint.indexOf(']'))
+                        var fixWlanPart=""
+                        if(p.endpoint.indexOf(']')>0) {
+                            fixWlanPart = p.endpoint.substring(
+                                p.endpoint.indexOf('%'),
+                                p.endpoint.indexOf(']')
+                            )
+                        }
                         var fixedUrlString = p.endpoint.replace(fixWlanPart, "")
                         var url = URI(fixedUrlString)
                         out.add(