.github/workflows/android.yml

@@ -23,7 +23,7 @@ jobs:
       with:
         repository: yggdrasil-network/yggdrasil-go
         path: yggdrasil-go
-        ref: master
+        ref: develop
         fetch-depth: 0
     
     - name: Setup Go environment
@@ -34,10 +34,10 @@ jobs:
         go install golang.org/x/mobile/cmd/gomobile@latest
         ~/go/bin/gomobile init
     
-    - name: Set up JDK 17
+    - name: Set up JDK 11
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '11'
         distribution: 'temurin'
         cache: gradle
         

app/build.gradle

@@ -4,14 +4,14 @@ plugins {
 }
 
 android {
-    compileSdkVersion 34
+    compileSdkVersion 33
 
     defaultConfig {
         applicationId "eu.neilalexander.yggdrasil"
         minSdkVersion 21
-        targetSdkVersion 34
-        versionCode 20
-        versionName "0.1-020"
+        targetSdkVersion 33
+        versionCode 15
+        versionName "0.1-015"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -45,18 +45,17 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
-    namespace 'eu.neilalexander.yggdrasil'
 }
 
 dependencies {
     implementation fileTree(include: ['*.aar'], dir: 'libs')
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.13.1'
-    implementation 'androidx.appcompat:appcompat:1.7.0'
-    implementation 'com.google.android.material:material:1.12.0'
+    implementation 'androidx.core:core-ktx:1.6.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'com.google.android.material:material:1.5.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.preference:preference-ktx:1.2.1'
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
+    testImplementation 'junit:junit:4.+'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 }

app/src/main/AndroidManifest.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="eu.neilalexander.yggdrasil">
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SYSTEM_EXEMPTED" />
 
     <application
         android:name=".GlobalApplication"
@@ -43,7 +43,6 @@
         <service
             android:name=".PacketTunnelProvider"
             android:permission="android.permission.BIND_VPN_SERVICE"
-            android:foregroundServiceType="systemExempted"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.net.VpnService" />

app/src/main/java/eu/neilalexander/yggdrasil/ConfigurationProxy.kt

@@ -55,7 +55,7 @@ object ConfigurationProxy {
             json.put("IfMTU", 65535)
 
             if (json.getJSONArray("MulticastInterfaces").get(0) is String) {
-                val ar = JSONArray()
+                var ar = JSONArray()
                 ar.put(0, JSONObject("""
                     {
                         "Regex": ".*",

app/src/main/java/eu/neilalexander/yggdrasil/DnsActivity.kt

@@ -13,7 +13,6 @@ import androidx.preference.PreferenceManager
 import com.google.android.material.textfield.TextInputEditText
 
 const val KEY_DNS_SERVERS = "dns_servers"
-const val KEY_DNS_VERSION = "dns_version"
 const val KEY_ENABLE_CHROME_FIX = "enable_chrome_fix"
 
 class DnsActivity : AppCompatActivity() {
@@ -42,10 +41,10 @@ class DnsActivity : AppCompatActivity() {
         val descriptionRevertron = getString(R.string.dns_server_info_revertron)
         // Here we can add some other DNS servers in a future
         defaultDnsServers = hashMapOf(
-            "308:62:45:62::" to Pair(getString(R.string.location_amsterdam), descriptionRevertron),
-            "308:84:68:55::" to Pair(getString(R.string.location_frankfurt), descriptionRevertron),
-            "308:25:40:bd::" to Pair(getString(R.string.location_bratislava), descriptionRevertron),
-            "308:c8:48:45::" to Pair(getString(R.string.location_buffalo), descriptionRevertron),
+            "302:7991::53" to Pair(getString(R.string.location_amsterdam), descriptionRevertron),
+            "302:db60::53" to Pair(getString(R.string.location_prague), descriptionRevertron),
+            "300:6223::53" to Pair(getString(R.string.location_bratislava), descriptionRevertron),
+            "301:1088::53" to Pair(getString(R.string.location_buffalo), descriptionRevertron),
         )
 
         serversTableLayout = findViewById(R.id.configuredDnsTableLayout)
@@ -57,7 +56,7 @@ class DnsActivity : AppCompatActivity() {
         addServerButton.setOnClickListener {
             val view = inflater.inflate(R.layout.dialog_add_dns_server, null)
             val input = view.findViewById<TextInputEditText>(R.id.addDnsInput)
-            val builder: AlertDialog.Builder = AlertDialog.Builder(ContextThemeWrapper(this, R.style.YggdrasilDialogs))
+            val builder: AlertDialog.Builder = AlertDialog.Builder(ContextThemeWrapper(this, R.style.Theme_MaterialComponents_DayNight_Dialog))
             builder.setTitle(getString(R.string.dns_add_server_dialog_title))
             builder.setView(view)
             builder.setPositiveButton(getString(R.string.add)) { _, _ ->
@@ -128,7 +127,7 @@ class DnsActivity : AppCompatActivity() {
                     view.findViewById<ImageButton>(R.id.deletePeerButton).tag = i
 
                     view.findViewById<ImageButton>(R.id.deletePeerButton).setOnClickListener { button ->
-                        val builder: AlertDialog.Builder = AlertDialog.Builder(ContextThemeWrapper(this, R.style.YggdrasilDialogs))
+                        val builder: AlertDialog.Builder = AlertDialog.Builder(ContextThemeWrapper(this, R.style.Theme_MaterialComponents_DayNight_Dialog))
                         builder.setTitle(getString(R.string.dns_remove_title, server))
                         builder.setPositiveButton(getString(R.string.remove)) { dialog, _ ->
                             servers.removeAt(button.tag as Int)
@@ -176,7 +175,7 @@ class DnsActivity : AppCompatActivity() {
                 }
             }
             view.setOnLongClickListener {
-                val builder: AlertDialog.Builder = AlertDialog.Builder(ContextThemeWrapper(this, R.style.YggdrasilDialogs))
+                val builder: AlertDialog.Builder = AlertDialog.Builder(ContextThemeWrapper(this, R.style.Theme_MaterialComponents_DayNight_Dialog))
                 builder.setTitle(getString(R.string.dns_server_info_dialog_title))
                 builder.setMessage("${infoPair.first}\n\n${infoPair.second}")
                 builder.setPositiveButton(getString(R.string.ok)) { dialog, _ ->

app/src/main/java/eu/neilalexander/yggdrasil/GlobalApplication.kt

@@ -8,16 +8,14 @@ import android.os.Build
 import android.service.quicksettings.TileService
 import androidx.annotation.RequiresApi
 import androidx.core.app.NotificationCompat
-import androidx.preference.PreferenceManager
 
 const val PREF_KEY_ENABLED = "enabled"
-const val PREF_KEY_PEERS_NOTE = "peers_note"
 const val MAIN_CHANNEL_ID = "Yggdrasil Service"
 
 class GlobalApplication: Application(), YggStateReceiver.StateReceiver {
     private lateinit var config: ConfigurationProxy
     private var currentState: State = State.Disabled
-    private var updaterConnections: Int = 0
+    var updaterConnections: Int = 0
 
     override fun onCreate() {
         super.onCreate()
@@ -26,7 +24,6 @@ class GlobalApplication: Application(), YggStateReceiver.StateReceiver {
         callback.register()
         val receiver = YggStateReceiver(this)
         receiver.register(this)
-        migrateDnsServers(this)
     }
 
     fun subscribe() {
@@ -67,28 +64,6 @@ class GlobalApplication: Application(), YggStateReceiver.StateReceiver {
     }
 }
 
-fun migrateDnsServers(context: Context) {
-    val preferences = PreferenceManager.getDefaultSharedPreferences(context)
-    if (preferences.getInt(KEY_DNS_VERSION, 0) >= 1) {
-        return
-    }
-    val serverString = preferences.getString(KEY_DNS_SERVERS, "")
-    if (serverString!!.isNotEmpty()) {
-        // Replacing old Revertron's servers by new ones
-        val newServers = serverString
-            .replace("300:6223::53", "308:25:40:bd::")
-            .replace("302:7991::53", "308:62:45:62::")
-            .replace("302:db60::53", "308:84:68:55::")
-            .replace("301:1088::53", "308:c8:48:45::")
-        val editor = preferences.edit()
-        editor.putInt(KEY_DNS_VERSION, 1)
-        if (newServers != serverString) {
-            editor.putString(KEY_DNS_SERVERS, newServers)
-        }
-        editor.apply()
-    }
-}
-
 fun createServiceNotification(context: Context, state: State): Notification {
     createNotificationChannels(context)
 

app/src/main/java/eu/neilalexander/yggdrasil/MainActivity.kt

@@ -1,13 +1,10 @@
 package eu.neilalexander.yggdrasil
 
 import android.app.Activity
-import android.app.AlertDialog
 import android.content.*
 import android.graphics.Color
-import android.net.Uri
 import android.net.VpnService
 import android.os.Bundle
-import android.view.ContextThemeWrapper
 import android.widget.Switch
 import android.widget.TextView
 import android.widget.Toast
@@ -21,19 +18,18 @@ import eu.neilalexander.yggdrasil.PacketTunnelProvider.Companion.STATE_INTENT
 import mobile.Mobile
 import org.json.JSONArray
 
-const val APP_WEB_URL = "https://github.com/yggdrasil-network/yggdrasil-android"
 
 class MainActivity : AppCompatActivity() {
     private lateinit var enabledSwitch: Switch
     private lateinit var enabledLabel: TextView
     private lateinit var ipAddressLabel: TextView
     private lateinit var subnetLabel: TextView
+    private lateinit var treeLengthLabel: TextView
     private lateinit var peersLabel: TextView
     private lateinit var peersRow: LinearLayoutCompat
     private lateinit var dnsLabel: TextView
     private lateinit var dnsRow: LinearLayoutCompat
     private lateinit var settingsRow: LinearLayoutCompat
-    private lateinit var versionRow: LinearLayoutCompat
 
     private fun start() {
         val intent = Intent(this, PacketTunnelProvider::class.java)
@@ -57,12 +53,12 @@ class MainActivity : AppCompatActivity() {
         enabledLabel = findViewById(R.id.yggdrasilStatusLabel)
         ipAddressLabel = findViewById(R.id.ipAddressValue)
         subnetLabel = findViewById(R.id.subnetValue)
+        treeLengthLabel = findViewById(R.id.treeLengthValue)
         peersLabel = findViewById(R.id.peersValue)
         peersRow = findViewById(R.id.peersTableRow)
         dnsLabel = findViewById(R.id.dnsValue)
         dnsRow = findViewById(R.id.dnsTableRow)
         settingsRow = findViewById(R.id.settingsTableRow)
-        versionRow = findViewById(R.id.versionTableRow)
 
         enabledLabel.setTextColor(Color.GRAY)
 
@@ -74,7 +70,6 @@ class MainActivity : AppCompatActivity() {
                         startVpnActivity.launch(vpnIntent)
                     } else {
                         start()
-                        enabledSwitch.isEnabled = false
                     }
                 }
                 false -> {
@@ -110,11 +105,6 @@ class MainActivity : AppCompatActivity() {
             startActivity(intent)
         }
 
-        versionRow.isClickable = true
-        versionRow.setOnClickListener {
-            openUrlInBrowser(APP_WEB_URL)
-        }
-
         ipAddressLabel.setOnLongClickListener {
             val clipboard: ClipboardManager = getSystemService(CLIPBOARD_SERVICE) as ClipboardManager
             val clip = ClipData.newPlainText("ip", ipAddressLabel.text)
@@ -163,16 +153,15 @@ class MainActivity : AppCompatActivity() {
         override fun onReceive(context: Context?, intent: Intent) {
             when (intent.getStringExtra("type")) {
                 "state" -> {
-                    val peerState = JSONArray(intent.getStringExtra("peers") ?: "[]")
-                    var count = 0
-                    for (i in 0..<peerState.length()) {
-                        val peer = peerState.getJSONObject(i)
-                        if (peer.getString("IP").isNotEmpty()) {
-                            count += 1
-                        }
-                    }
                     enabledLabel.text = if (intent.getBooleanExtra("started", false)) {
-                        showPeersNoteIfNeeded(peerState.length())
+                        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 (count == 0) {
                             enabledLabel.setTextColor(Color.RED)
                             getString(R.string.main_no_connectivity)
@@ -186,52 +175,17 @@ class MainActivity : AppCompatActivity() {
                     }
                     ipAddressLabel.text = intent.getStringExtra("ip") ?: "N/A"
                     subnetLabel.text = intent.getStringExtra("subnet") ?: "N/A"
+                    treeLengthLabel.text = intent.getStringExtra("coords") ?: "0"
                     if (intent.hasExtra("peers")) {
-                        peersLabel.text = when (count) {
+                        val peerState = JSONArray(intent.getStringExtra("peers") ?: "[]")
+                        peersLabel.text = when (val count = peerState.length()) {
                             0 -> getString(R.string.main_no_peers)
                             1 -> getString(R.string.main_one_peer)
                             else -> getString(R.string.main_many_peers, count)
                         }
                     }
-                    if (!enabledSwitch.isEnabled) {
-                        enabledSwitch.isEnabled = true
                 }
             }
         }
     }
-    }
-
-    private fun showPeersNoteIfNeeded(peerCount: Int) {
-        if (peerCount > 0) return
-        val preferences = PreferenceManager.getDefaultSharedPreferences(this@MainActivity.baseContext)
-        if (!preferences.getBoolean(PREF_KEY_PEERS_NOTE, false)) {
-            this@MainActivity.runOnUiThread {
-                val builder: AlertDialog.Builder =
-                    AlertDialog.Builder(ContextThemeWrapper(this@MainActivity, R.style.YggdrasilDialogs))
-                builder.setTitle(getString(R.string.main_add_some_peers_title))
-                builder.setMessage(getString(R.string.main_add_some_peers_message))
-                builder.setPositiveButton(getString(R.string.ok)) { dialog, _ ->
-                    dialog.dismiss()
-                }
-                builder.show()
-            }
-            // Mark this note as shown
-            preferences.edit().apply {
-                putBoolean(PREF_KEY_PEERS_NOTE, true)
-                commit()
-            }
-        }
-    }
-
-    fun openUrlInBrowser(url: String) {
-        val intent = Intent(Intent.ACTION_VIEW).apply {
-            data = Uri.parse(url)
-        }
-        try {
-            startActivity(intent)
-        } catch (e: ActivityNotFoundException) {
-            // Handle the exception if no browser is found
-            Toast.makeText(this, getText(R.string.no_browser_found_toast), Toast.LENGTH_SHORT).show()
-        }
-    }
 }

app/src/main/java/eu/neilalexander/yggdrasil/PacketTunnelProvider.kt

@@ -232,14 +232,15 @@ open class PacketTunnelProvider: VpnService() {
     }
 
     private fun updater() {
-        try {
         Thread.sleep(500)
-        } catch (_: InterruptedException) {
-            return
-        }
         var lastStateUpdate = System.currentTimeMillis()
         updates@ while (started.get()) {
             val treeJSON = yggdrasil.treeJSON
+            var treeLength = 0
+            if (treeJSON != null && treeJSON != "null") {
+                val treeState = JSONArray(treeJSON)
+                treeLength = treeState.length()
+            }
             if ((application as  GlobalApplication).needUiUpdates()) {
                 val intent = Intent(STATE_INTENT)
                 intent.putExtra("type", "state")
@@ -247,7 +248,9 @@ open class PacketTunnelProvider: VpnService() {
                 intent.putExtra("ip", yggdrasil.addressString)
                 intent.putExtra("subnet", yggdrasil.subnetString)
                 intent.putExtra("pubkey", yggdrasil.publicKeyString)
+                intent.putExtra("coords", "$treeLength")
                 intent.putExtra("peers", yggdrasil.peersJSON)
+                intent.putExtra("tree", treeJSON)
                 LocalBroadcastManager.getInstance(this).sendBroadcast(intent)
             }
             val curTime = System.currentTimeMillis()

app/src/main/java/eu/neilalexander/yggdrasil/PeersActivity.kt

@@ -5,27 +5,20 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
+import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
-import android.text.method.LinkMovementMethod
 import android.util.Log
 import android.view.ContextThemeWrapper
 import android.view.KeyEvent
 import android.view.LayoutInflater
 import android.view.View
-import android.widget.EditText
-import android.widget.ImageButton
-import android.widget.Switch
-import android.widget.TableLayout
-import android.widget.TableRow
-import android.widget.TextView
-import androidx.appcompat.app.AppCompatActivity
+import android.widget.*
 import androidx.core.widget.doOnTextChanged
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import com.google.android.material.textfield.TextInputEditText
 import org.json.JSONArray
 import org.json.JSONObject
 
-
 class PeersActivity : AppCompatActivity() {
     private lateinit var config: ConfigurationProxy
     private lateinit var inflater: LayoutInflater
@@ -54,9 +47,6 @@ class PeersActivity : AppCompatActivity() {
         configuredTableLayout = findViewById(R.id.configuredPeersTableLayout)
         configuredTableLabel = findViewById(R.id.configuredPeersLabel)
 
-        val discoveryLink = findViewById<TextView>(R.id.peers_discovery_link)
-        discoveryLink.movementMethod = LinkMovementMethod.getInstance()
-
         multicastListenSwitch = findViewById(R.id.enableMulticastListen)
         multicastListenSwitch.setOnCheckedChangeListener { button, _ ->
             config.multicastListen = button.isChecked
@@ -105,7 +95,7 @@ class PeersActivity : AppCompatActivity() {
         addPeerButton.setOnClickListener {
             val view = inflater.inflate(R.layout.dialog_addpeer, null)
             val input = view.findViewById<TextInputEditText>(R.id.addPeerInput)
-            val builder: AlertDialog.Builder = AlertDialog.Builder(ContextThemeWrapper(this, R.style.YggdrasilDialogs))
+            val builder: AlertDialog.Builder = AlertDialog.Builder(ContextThemeWrapper(this, R.style.Theme_MaterialComponents_DayNight_Dialog))
             builder.setTitle(getString(R.string.peers_add_peer))
             builder.setView(view)
             builder.setPositiveButton(getString(R.string.peers_add)) { dialog, _ ->
@@ -159,7 +149,7 @@ class PeersActivity : AppCompatActivity() {
                     view.findViewById<ImageButton>(R.id.deletePeerButton).tag = i
 
                     view.findViewById<ImageButton>(R.id.deletePeerButton).setOnClickListener { button ->
-                        val builder: AlertDialog.Builder = AlertDialog.Builder(ContextThemeWrapper(this, R.style.YggdrasilDialogs))
+                        val builder: AlertDialog.Builder = AlertDialog.Builder(ContextThemeWrapper(this, R.style.Theme_MaterialComponents_DayNight_Dialog))
                         builder.setTitle(getString(R.string.peers_remove_title, peer))
                         builder.setPositiveButton(getString(R.string.peers_remove)) { dialog, _ ->
                             config.updateJSON { json ->
@@ -186,25 +176,16 @@ class PeersActivity : AppCompatActivity() {
                 connectedTableLabel.text = getString(R.string.peers_no_connected_title)
             }
             else -> {
-                var connected = false
+                connectedTableLayout.visibility = View.VISIBLE
+                connectedTableLabel.text = getString(R.string.peers_connected_title)
+
                 connectedTableLayout.removeAllViewsInLayout()
                 for (peer in peers) {
                     val view = inflater.inflate(R.layout.peers_connected, null)
                     val ip = peer.getString("IP")
-                    // Only connected peers have IPs
-                    if (ip.isNotEmpty()) {
                     view.findViewById<TextView>(R.id.addressLabel).text = ip
                     view.findViewById<TextView>(R.id.detailsLabel).text = peer.getString("URI")
                     connectedTableLayout.addView(view)
-                        connected = true
-                    }
-                }
-                if (connected) {
-                    connectedTableLayout.visibility = View.VISIBLE
-                    connectedTableLabel.text = getString(R.string.peers_connected_title)
-                } else {
-                    connectedTableLayout.visibility = View.GONE
-                    connectedTableLabel.text = getString(R.string.peers_no_connected_title)
                 }
             }
         }

app/src/main/java/eu/neilalexander/yggdrasil/SettingsActivity.kt

@@ -27,7 +27,6 @@ class SettingsActivity : AppCompatActivity() {
     private lateinit var deviceNameEntry: EditText
     private lateinit var publicKeyLabel: TextView
     private lateinit var resetConfigurationRow: LinearLayoutCompat
-    private var publicKeyReset = false
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -70,7 +69,7 @@ class SettingsActivity : AppCompatActivity() {
 
         resetConfigurationRow.setOnClickListener {
             val view = inflater.inflate(R.layout.dialog_resetconfig, null)
-            val builder: AlertDialog.Builder = AlertDialog.Builder(ContextThemeWrapper(this, R.style.YggdrasilDialogs))
+            val builder: AlertDialog.Builder = AlertDialog.Builder(ContextThemeWrapper(this, R.style.Theme_MaterialComponents_DayNight_Dialog))
             builder.setTitle(getString(R.string.settings_warning_title))
             builder.setView(view)
             builder.setPositiveButton(getString(R.string.settings_reset)) { dialog, _ ->
@@ -86,13 +85,12 @@ class SettingsActivity : AppCompatActivity() {
 
         findViewById<View>(R.id.resetKeysRow).setOnClickListener {
             config.resetKeys()
-            publicKeyReset = true
             updateView()
         }
 
         findViewById<View>(R.id.setKeysRow).setOnClickListener {
             val view = inflater.inflate(R.layout.dialog_set_keys, null)
-            val builder: AlertDialog.Builder = AlertDialog.Builder(ContextThemeWrapper(this, R.style.YggdrasilDialogs))
+            val builder: AlertDialog.Builder = AlertDialog.Builder(ContextThemeWrapper(this, R.style.Theme_MaterialComponents_DayNight_Dialog))
             val privateKey = view.findViewById<EditText>(R.id.private_key)
             builder.setTitle(getString(R.string.set_keys))
             builder.setView(view)
@@ -127,11 +125,7 @@ class SettingsActivity : AppCompatActivity() {
             deviceNameEntry.setText("", TextView.BufferType.EDITABLE)
         }
 
-        var key = json.optString("PrivateKey")
-        if (key.isNotEmpty()) {
-            key = key.substring(key.length / 2)
-        }
-        publicKeyLabel.text = key
+        publicKeyLabel.text = json.optString("PublicKey")
     }
 
     override fun onResume() {
@@ -151,7 +145,7 @@ class SettingsActivity : AppCompatActivity() {
     // To be able to get public key from running Yggdrasil we use this receiver, as we don't have this field in config
     private val receiver: BroadcastReceiver = object : BroadcastReceiver() {
         override fun onReceive(context: Context?, intent: Intent) {
-            if (intent.hasExtra("pubkey") && !publicKeyReset) {
+            if (intent.hasExtra("pubkey")) {
                 val tree = intent.getStringExtra("pubkey")
                 if (tree != null && tree != "null") {
                     publicKeyLabel.text = intent.getStringExtra("pubkey")

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

@@ -116,7 +116,7 @@
                         android:layout_height="32px" />
 
                     <TextView
-                        android:id="@+id/networkInfoSectionLabel"
+                        android:id="@+id/statisticsSectionLabel"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="16pt"
@@ -126,7 +126,7 @@
                         android:layout_marginBottom="2pt"
                         android:alpha="0.7"
                         android:paddingRight="8pt"
-                        android:text="@string/main_network_info"
+                        android:text="@string/main_statistics"
                         android:textAllCaps="true"
                         android:textAppearance="@style/TextAppearance.AppCompat.Small"
                         android:textSize="12sp" />
@@ -203,6 +203,32 @@
 
                         </androidx.appcompat.widget.LinearLayoutCompat>
 
+                        <androidx.appcompat.widget.LinearLayoutCompat style="@style/SelectableItemStyle">
+
+                            <TextView
+                                android:id="@+id/coordinatesLabel"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="0"
+                                android:text="@string/main_tree_length"
+                                android:textColor="?attr/textDefault" />
+
+                            <TextView
+                                android:id="@+id/treeLengthValue"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1"
+                                android:alpha="0.5"
+                                android:ellipsize="end"
+                                android:maxLines="1"
+                                android:scrollHorizontally="false"
+                                android:selectAllOnFocus="true"
+                                android:singleLine="true"
+                                android:text="0"
+                                android:textAlignment="viewEnd"
+                                android:textIsSelectable="true" />
+                        </androidx.appcompat.widget.LinearLayoutCompat>
+
                     </androidx.appcompat.widget.LinearLayoutCompat>
 
                     <Space
@@ -351,9 +377,7 @@
 
                         </androidx.appcompat.widget.LinearLayoutCompat>
 
-                        <androidx.appcompat.widget.LinearLayoutCompat
-                            android:id="@+id/versionTableRow"
-                            style="@style/SelectableItemStyle">
+                        <androidx.appcompat.widget.LinearLayoutCompat style="@style/SelectableItemStyle">
 
                             <TextView
                                 android:id="@+id/versionLabel"

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

@@ -137,23 +137,6 @@
                         android:textAppearance="@style/TextAppearance.AppCompat.Small"
                         android:textSize="12sp" />
 
-                    <TextView
-                        android:id="@+id/peers_discovery_link"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16pt"
-                        android:layout_marginLeft="16pt"
-                        android:layout_marginTop="4pt"
-                        android:layout_marginEnd="8pt"
-                        android:layout_marginRight="8pt"
-                        android:layout_marginBottom="4pt"
-                        android:alpha="0.7"
-                        android:paddingRight="8pt"
-                        android:text="@string/peers_discovery_hint"
-                        android:textAllCaps="false"
-                        android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                        android:textSize="12sp" />
-
                     <Space
                         android:layout_width="match_parent"
                         android:layout_height="32px" />

app/src/main/res/values-ru/strings.xml

@@ -29,8 +29,6 @@
     <string name="main_no_peers">Нет пиров</string>
     <string name="main_one_peer">1 пир</string>
     <string name="main_many_peers">%d пира/пиров</string>
-    <string name="main_add_some_peers_title">Внимание</string>
-    <string name="main_add_some_peers_message">Не настроено ни одного пира. Если не будет обнаруживаемых пиров в этой сети, то вам надо будет добавить пир вручную, чтобы подключение к Yggdrasil работало как положено.</string>
     <string name="peers_add_peer">Добавить пира в конфиг</string>
     <string name="peers_add">Добавить</string>
     <string name="peers_remove_title">Убрать %s?</string>
@@ -44,10 +42,11 @@
     <string name="settings_reset">Сброс</string>
     <string name="main_status">Состояние</string>
     <string name="main_enable_yggdrasil">Включить Yggdrasil</string>
-    <string name="main_network_info">Адрес и сеть</string>
+    <string name="main_statistics">Статистика</string>
     <string name="main_not_available">Н/Д</string>
     <string name="main_ip">Адрес</string>
     <string name="main_subnet">Подсеть</string>
+    <string name="main_tree_length">Высота дерева</string>
     <string name="main_configuration">Конфигурация</string>
     <string name="main_peers">Пиры</string>
     <string name="main_dns_servers">Серверы DNS</string>
@@ -59,7 +58,6 @@
     <string name="discoverable_over_multicast">Находимый через multicast</string>
     <string name="search_for_multicast_peers">Искать пиров через multicast</string>
     <string name="configured_peers_hint">Yggdrasil будет пытаться подключаться к этим пирам автоматически. Если вы добавите несколько пиров, ваше устройство может быть использовано для переноса данных между другими узлами сети. Чтобы этого избежать настройте только один пир.</string>
-    <string name="peers_discovery_hint">Вы можете найти публичные пиры <a href="https://publicpeers.neilalexander.dev/">по этой ссылке</a>.</string>
     <string name="peer_connectivity_hint">Пиры могут быть найдены с помощью Multicast если они находятся в той же Wi-Fi сети, либо через USB. У них должен быть одинаковый пароль. Трафик в мобильной сети может быть платным. Вы можете отключить мобильные данные в настройках устройства.</string>
     <string name="peers_multicast_password_hint">Пароль</string>
     <string name="node_info">Об узле</string>
@@ -75,9 +73,9 @@
     <string name="tile_enabled">Включено (Нет подключения)</string>
     <string name="tile_connected">Подключено</string>
     <string name="location_amsterdam">Амстердам, Нидерланды</string>
-    <string name="location_frankfurt">Франкфурт, Германия</string>
+    <string name="location_prague">Прага, Чехия</string>
     <string name="location_bratislava">Братислава, Словакия</string>
-    <string name="location_buffalo">Буффало, США</string>
+    <string name="location_buffalo">Баффало, США</string>
     <string name="channel_name">Сервис VPN</string>
     <string name="channel_description">Главный канал нотификаций сервиса</string>
     <string name="permission_notification_text">Нажмите здесь чтобы включить Yggdrasil.</string>
@@ -85,5 +83,4 @@
     <string name="private_key_label">Приватный ключ:</string>
     <string name="set_keys">Установить свой ключ</string>
     <string name="save">Сохранить</string>
-    <string name="no_browser_found_toast">Не найден браузер для открытия ссылки!</string>
 </resources>

app/src/main/res/values/colors.xml

@@ -5,7 +5,6 @@
     <color name="purple_700">#FF3700B3</color>
     <color name="teal_200">#FF03DAC5</color>
     <color name="teal_700">#FF018786</color>
-    <color name="green">#5FBF9F</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
     <color name="hintlight">#F2F1F5</color>

app/src/main/res/values/strings.xml

@@ -29,8 +29,6 @@
     <string name="main_no_peers">No peers</string>
     <string name="main_one_peer">1 peer</string>
     <string name="main_many_peers">%d peers</string>
-    <string name="main_add_some_peers_title">Note</string>
-    <string name="main_add_some_peers_message">No peers are configured. If there are no multicast peers nearby, you will need to manually configure peers in order for Yggdrasil to connect and work properly.</string>
     <string name="peers_add_peer">Add Configured Peer</string>
     <string name="peers_add">Add</string>
     <string name="peers_remove_title">Remove %s?</string>
@@ -44,10 +42,11 @@
     <string name="settings_reset">Reset</string>
     <string name="main_status">Status</string>
     <string name="main_enable_yggdrasil">Enable Yggdrasil</string>
-    <string name="main_network_info">Network info</string>
+    <string name="main_statistics">Statistics</string>
     <string name="main_not_available">N/A</string>
     <string name="main_ip">IP</string>
     <string name="main_subnet">Subnet</string>
+    <string name="main_tree_length">Tree length</string>
     <string name="main_configuration">Configuration</string>
     <string name="main_peers">Peers</string>
     <string name="main_dns_servers">DNS servers</string>
@@ -59,7 +58,6 @@
     <string name="discoverable_over_multicast">Discoverable over multicast</string>
     <string name="search_for_multicast_peers">Search for multicast peers</string>
     <string name="configured_peers_hint">Yggdrasil will automatically attempt to connect to configured peers when started. If you configure more than one peer, your device may carry traffic on behalf of other network nodes. Avoid this by configuring only a single peer.</string>
-    <string name="peers_discovery_hint">You can find public peers by opening <a href="https://publicpeers.neilalexander.dev/">this link</a>.</string>
     <string name="peer_connectivity_hint">Multicast peers will be discovered on the same Wi-Fi network or via USB. They must have the same password. Data charges may apply when using mobile data. You can prevent data usage in the device settings.</string>
     <string name="peers_multicast_password_hint">Password</string>
     <string name="node_info">Node Info</string>
@@ -75,7 +73,7 @@
     <string name="tile_enabled">Enabled (No connectivity)</string>
     <string name="tile_connected">Connected</string>
     <string name="location_amsterdam">Amsterdam, NL</string>
-    <string name="location_frankfurt">Frankfurt, DE</string>
+    <string name="location_prague">Prague, CZ</string>
     <string name="location_bratislava">Bratislava, SK</string>
     <string name="location_buffalo">Buffalo, US</string>
     <string name="channel_name">VPN Service</string>
@@ -85,5 +83,4 @@
     <string name="private_key_label">Private key:</string>
     <string name="set_keys">Set your own key</string>
     <string name="save">Save</string>
-    <string name="no_browser_found_toast">No browser found to open the URL!</string>
 </resources>

app/src/main/res/values/themes.xml

@@ -18,8 +18,4 @@
         <item name="tableBackgroundColor">@color/white</item>
         <item name="textDefault">@color/black</item>
     </style>
-
-    <style name="YggdrasilDialogs" parent="@style/Theme.MaterialComponents.DayNight.Dialog">
-        <item name="colorPrimary">@color/green</item>
-    </style>
 </resources>

build.gradle

@@ -1,12 +1,12 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = '1.9.20'
+    ext.kotlin_version = '1.9.10'
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.4'
+        classpath 'com.android.tools.build:gradle:7.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

fastlane/metadata/android/en-US/changelogs/16.txt

@@ -1 +0,0 @@
-* Updated core Yggdrasil library to 0.5.4

fastlane/metadata/android/en-US/changelogs/17.txt

@@ -1 +0,0 @@
-* Updated core Yggdrasil library to 0.5.6

fastlane/metadata/android/en-US/changelogs/18.txt

@@ -1,14 +0,0 @@
-Updated core library to 0.5.7, presenting these changes:
-
-Added
-WebSocket support for peerings, by using the new ws:// scheme in Listen and Peers
-Additionally, the wss:// scheme can be used to connect to a WebSocket peer behind a HTTPS reverse proxy
-
-Changed
-On Linux, the TUN adapter now uses vectorised reads/writes where possible, which should reduce the amount of CPU time spent on syscalls and potentially improve throughput
-Link error handling has been improved and various link error messages have been rewritten to be clearer
-Upgrade dependencies
-
-Fixed
-Multiple multicast connections to the same remote machine should now work correctly
-You may get two connections in some cases, one inbound and one outbound, this is known and will not cause problems

fastlane/metadata/android/en-US/changelogs/19.txt

@@ -1,23 +0,0 @@
-Updated core library to 0.5.9, presenting these changes:
-
-Changed
-The routing algorithm has been updated with RTT-aware link costing, which should prefer lower latency links over higher latency links where possible
-The calculated cost is an average of the link RTT, but newly established links are costed higher to begin with, such that unstable peerings can be avoided
-Link costs are only used where multiple next-hops are available and will be ignored if there is only one loop-free path to the destination
-This is protocol-compatible with existing v0.5.x nodes but will have the best results when peering with nodes that are also running the latest version
-The getPeers endpoint will now report the calculated link cost for each given peer
-Upgrade dependencies
-
-Fixed
-Multicast discovery should now work again when building Yggdrasil as an Android framework
-Multicast discovery will now correctly ignore interfaces that are not marked as running
-Ephemeral links, such as those added by multicast, will no longer try to reconnect in a fast loop, fixing a high CPU issue
-The TUN interface will no longer stop working when hitting a segment read error from vectorised reads
-The AllowedPublicKeys option will once again no longer apply to multicast peerings, as was originally intended
-A potential panic when shutting down peering links has been fixed
-A redundant system call for setting MTU on OpenBSD has been removed
-
-Fixes in Android app
-Fixed occasional crash on start/stop
-Updated some dependencies
-Updated Android API to 34

fastlane/metadata/android/en-US/changelogs/20.txt

@@ -1,19 +0,0 @@
-Updated core library to 0.5.12, presenting these changes:
-
-Fixed
-A timing regression which causes a higher level of idle protocol traffic on each peering has been fixed
-
-Fixes in Android app
-Some UI fixes and improvements
-Updated some dependencies
-
-Updates from previous versions:
-
-Changed
-The parent selection algorithm now only chooses a new parent if there is a larger cost benefit to doing so, which should help to stabilise the tree
-The bloom filters are now repropagated periodically, to avoid nodes getting stuck with bad state
-
-Fixed
-A memory leak caused by missed cleanup of the peer response map has been fixed
-Other bug fixes with bloom filter propagation for off-tree filters and zero vs one bits
-TLS-based peering connections now support TLS 1.2 again

fastlane/metadata/android/ru/changelogs/16.txt

@@ -1 +0,0 @@
-* Обновлена библиотека Yggdrasil до 0.5.4

fastlane/metadata/android/ru/changelogs/17.txt

@@ -1 +0,0 @@
-* Обновлена библиотека Yggdrasil до 0.5.6

fastlane/metadata/android/ru/changelogs/18.txt

@@ -1,14 +0,0 @@
-Обновлена основная библиотека до версии 0.5.7, в которой представлены следующие изменения:
-
-Добавлено
-Поддержка WebSocket для пиринга с использованием новой схемы ws:// в Listen и Peers
-Кроме того, схему wss:// можно использовать для подключения к узлам WebSocket за обратным прокси-сервером HTTPS вроде Nginx
-
-Изменено
-В Linux адаптер TUN теперь использует векторизованную чтение/запись, где это возможно, что должно сократить количество времени ЦП, затрачиваемого на системные вызовы, и потенциально повысить пропускную способность
-Улучшена обработка ошибок соединения, а различные сообщения об ошибках соединения были переписаны для большей ясности
-Обновление зависимостей
-
-Исправлено
-Несколько мультикаст подключений к одной и той же удаленной машине теперь должны работать правильно
-В некоторых случаях вы можете получить два подключения, одно входящее и одно исходящее, это известное поведение и не вызовет проблем

fastlane/metadata/android/ru/changelogs/19.txt

@@ -1,23 +0,0 @@
-Обновлена основная библиотека до версии 0.5.9, в которой представлены следующие изменения:
-
-Изменено
-Алгоритм маршрутизации был обновлен с учетом стоимости соединения с RTT, что должно отдавать предпочтения соединениям с меньшей задержкой соединениям с большей задержкой, когда это возможно
-Расчетная стоимость представляет собой среднее значение RTT соединения, но новые соединения изначально оцениваются выше, так что можно избежать проблем с нестабильными узлами
-Стоимость соединения используется только при наличии нескольких следующих переходов и будет игнорироваться, если есть только один путь без петель к месту назначения
-Эта версия совместима с существующими узлами v0.5.x, но будет иметь наилучшие результаты при пиринге с узлами, которые также работают под управлением последней версии
-Команда getPeers теперь будет сообщать рассчитанную стоимость соединения для каждого заданного пира
-Обновлены зависимости
-
-Исправлено
-Обнаружение локальных пиров теперь должно снова работать при сборке Yggdrasil как фреймворка Android
-Обнаружение локальных пиров теперь будет правильно игнорировать интерфейсы, которые не помечены как работающие
-Эфемерные соединения, такие как добавленные мультикастом, больше не будут пытаться быстро переподключаться в цикле, устранена проблема высокой загрузки ЦП
-Интерфейс TUN больше не будет прекращать работу при срабатывании ошибки чтения пакета с помощью векторизованного чтения
-Опция AllowedPublicKeys снова больше не будет применяться к локальным пирам, как изначально предполагалось
-Потенциальный краш при отключении пиринговых соединений был исправлен
-Избыточный системный вызов для установки MTU в OpenBSD был удален
-
-Исправления в приложении для Android
-Исправлен случайный сбой при запуске/остановке
-Обновлены некоторые зависимости
-Обновлен Android API до 34

fastlane/metadata/android/ru/changelogs/20.txt

@@ -1,19 +0,0 @@
-Обновлена основная библиотека до версии 0.5.12, в которой представлены следующие изменения:
-
-Исправлено
-Исправлена регрессия синхронизации, которая приводит к более высокому уровню служебного трафика в простое
-
-Исправления в приложении Android
-Исправления и улучшения пользовательского интерфейса
-Обновлены некоторые зависимости
-
-Обновления с предыдущих версий:
-
-Изменено
-Алгоритм выбора родителя теперь выбирает нового родителя только в том случае, если это дает большую экономическую выгоду, что должно помочь стабилизировать дерево
-Фильтры Блума теперь периодически распространяются повторно, чтобы избежать застревания узлов в плохом состоянии
-
-Исправлено
-Утечка памяти, вызванная пропущенной очисткой карты ответов пиров
-Другие исправления ошибок с распространением фильтра Блума для фильтров вне дерева
-Пиринг с использованием TLS теперь снова поддерживают TLS 1.2

gradle.properties

@@ -17,7 +17,3 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 android.useAndroidX=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-#android.enableR8.fullMode=false
-android.defaults.buildfeatures.buildconfig=true
-android.nonTransitiveRClass=false
-android.nonFinalResIds=false

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Nov 27 01:27:23 CET 2023
+#Sat Aug 26 21:38:34 CEST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

libs/yggdrasil-go

@@ -1 +1 @@
-Subproject commit 213f72b8403ff55a5e38a0fa7d1cd0a093ac4666
+Subproject commit e5e8c84d7c1a030cf0da1076eb6d2e01d2b9c8c3

readme.md

@@ -1,23 +1,4 @@
-Yggdrasil Android
------------------
-
-Yggdrasil is an early-stage implementation of a fully end-to-end encrypted IPv6 network. It is lightweight, self-arranging, supported on multiple platforms and allows pretty much any IPv6-capable application to communicate securely with other Yggdrasil nodes. Yggdrasil does not require you to have IPv6 Internet connectivity - it also works over IPv4.
-
-This app allows you to connect to Yggdrasil Network and use any service located in this network. It works as VPN service, but all your usual traffic will go trough your provider, not through Yggdrasil Network.
-
-Also, it is not a goal of the Yggdrasil project to provide anonymity. Direct peers over the Internet will be able to see your IP address and may be able to use this information to determine your location or identity. Multicast-discovered peerings on the same network will typically expose your device MAC address. Other nodes on the network may be able to discern some information about which nodes you are peered with.
-
-All traffic sent across the Yggdrasil network is encrypted end-to-end. Assuming that our crypto is solid, it cannot be decrypted or read by any intermediate nodes, and can only be decrypted by the recipient for which it was intended. However, please note that Yggdrasil has not been officially externally audited. 
-
-## Download
-
-[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
-     alt="Get it on F-Droid"
-     height="80">](https://f-droid.org/packages/eu.neilalexander.yggdrasil/)
-
-Or get the APK from the [Releases Section](https://github.com/yggdrasil-network/yggdrasil-android/releases/latest).
-
-## Build Instructions
+## build instructions
 
 * install gomobile