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/build.gradle b/app/build.gradle
index 1a38c8d..20d3136 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,9 +9,9 @@ android {
defaultConfig {
applicationId "eu.neilalexander.yggdrasil"
minSdkVersion 21
- targetSdkVersion 34
- versionCode 20
- versionName "0.1-020"
+ targetSdkVersion 33
+ versionCode 18
+ versionName "0.1-018"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
@@ -51,12 +51,12 @@ android {
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.12.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'
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ebf9dd1..c91724e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -6,7 +6,6 @@
-
diff --git a/app/src/main/java/eu/neilalexander/yggdrasil/ConfigurationProxy.kt b/app/src/main/java/eu/neilalexander/yggdrasil/ConfigurationProxy.kt
index 2eca90a..0047679 100644
--- a/app/src/main/java/eu/neilalexander/yggdrasil/ConfigurationProxy.kt
+++ b/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": ".*",
diff --git a/app/src/main/java/eu/neilalexander/yggdrasil/DnsActivity.kt b/app/src/main/java/eu/neilalexander/yggdrasil/DnsActivity.kt
index bd50644..f3f9ed8 100644
--- a/app/src/main/java/eu/neilalexander/yggdrasil/DnsActivity.kt
+++ b/app/src/main/java/eu/neilalexander/yggdrasil/DnsActivity.kt
@@ -57,7 +57,7 @@ class DnsActivity : AppCompatActivity() {
addServerButton.setOnClickListener {
val view = inflater.inflate(R.layout.dialog_add_dns_server, null)
val input = view.findViewById(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 +128,7 @@ class DnsActivity : AppCompatActivity() {
view.findViewById(R.id.deletePeerButton).tag = i
view.findViewById(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 +176,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, _ ->
diff --git a/app/src/main/java/eu/neilalexander/yggdrasil/GlobalApplication.kt b/app/src/main/java/eu/neilalexander/yggdrasil/GlobalApplication.kt
index 0431d12..49a544b 100644
--- a/app/src/main/java/eu/neilalexander/yggdrasil/GlobalApplication.kt
+++ b/app/src/main/java/eu/neilalexander/yggdrasil/GlobalApplication.kt
@@ -11,7 +11,6 @@ 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 {
diff --git a/app/src/main/java/eu/neilalexander/yggdrasil/MainActivity.kt b/app/src/main/java/eu/neilalexander/yggdrasil/MainActivity.kt
index befdbe3..d1cd613 100644
--- a/app/src/main/java/eu/neilalexander/yggdrasil/MainActivity.kt
+++ b/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,7 +18,6 @@ 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
@@ -33,7 +29,6 @@ class MainActivity : AppCompatActivity() {
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)
@@ -62,7 +57,6 @@ class MainActivity : AppCompatActivity() {
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 +68,6 @@ class MainActivity : AppCompatActivity() {
startVpnActivity.launch(vpnIntent)
} else {
start()
- enabledSwitch.isEnabled = false
}
}
false -> {
@@ -110,11 +103,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 +151,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.. 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()
- }
- }
}
diff --git a/app/src/main/java/eu/neilalexander/yggdrasil/PacketTunnelProvider.kt b/app/src/main/java/eu/neilalexander/yggdrasil/PacketTunnelProvider.kt
index aa84803..c5519f6 100644
--- a/app/src/main/java/eu/neilalexander/yggdrasil/PacketTunnelProvider.kt
+++ b/app/src/main/java/eu/neilalexander/yggdrasil/PacketTunnelProvider.kt
@@ -232,11 +232,7 @@ open class PacketTunnelProvider: VpnService() {
}
private fun updater() {
- try {
- Thread.sleep(500)
- } catch (_: InterruptedException) {
- return
- }
+ Thread.sleep(500)
var lastStateUpdate = System.currentTimeMillis()
updates@ while (started.get()) {
val treeJSON = yggdrasil.treeJSON
diff --git a/app/src/main/java/eu/neilalexander/yggdrasil/PeersActivity.kt b/app/src/main/java/eu/neilalexander/yggdrasil/PeersActivity.kt
index 55e2817..030ffa1 100644
--- a/app/src/main/java/eu/neilalexander/yggdrasil/PeersActivity.kt
+++ b/app/src/main/java/eu/neilalexander/yggdrasil/PeersActivity.kt
@@ -5,6 +5,7 @@ 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
@@ -12,20 +13,13 @@ 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
@@ -105,7 +99,7 @@ class PeersActivity : AppCompatActivity() {
addPeerButton.setOnClickListener {
val view = inflater.inflate(R.layout.dialog_addpeer, null)
val input = view.findViewById(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 +153,7 @@ class PeersActivity : AppCompatActivity() {
view.findViewById(R.id.deletePeerButton).tag = i
view.findViewById(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 +180,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(R.id.addressLabel).text = ip
- view.findViewById(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)
+ view.findViewById(R.id.addressLabel).text = ip
+ view.findViewById(R.id.detailsLabel).text = peer.getString("URI")
+ connectedTableLayout.addView(view)
}
}
}
diff --git a/app/src/main/java/eu/neilalexander/yggdrasil/SettingsActivity.kt b/app/src/main/java/eu/neilalexander/yggdrasil/SettingsActivity.kt
index 8e2e3d2..5831776 100644
--- a/app/src/main/java/eu/neilalexander/yggdrasil/SettingsActivity.kt
+++ b/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(R.id.resetKeysRow).setOnClickListener {
config.resetKeys()
- publicKeyReset = true
updateView()
}
findViewById(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(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")
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index e85a344..9261130 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -351,9 +351,7 @@
-
+
Нет пиров
1 пир
%d пира/пиров
- Внимание
- Не настроено ни одного пира. Если не будет обнаруживаемых пиров в этой сети, то вам надо будет добавить пир вручную, чтобы подключение к Yggdrasil работало как положено.
Добавить пира в конфиг
Добавить
Убрать %s?
@@ -85,5 +83,4 @@
Приватный ключ:
Установить свой ключ
Сохранить
- Не найден браузер для открытия ссылки!
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 2c8e64a..4f74376 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -5,7 +5,6 @@
#FF3700B3
#FF03DAC5
#FF018786
- #5FBF9F
#FF000000
#FFFFFFFF
#F2F1F5
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 61c8633..f886f02 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -29,8 +29,6 @@
No peers
1 peer
%d peers
- Note
- 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.
Add Configured Peer
Add
Remove %s?
@@ -85,5 +83,4 @@
Private key:
Set your own key
Save
- No browser found to open the URL!
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index e48c592..ece6c2c 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -18,8 +18,4 @@
- @color/white
- @color/black
-
-
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 2f8ae41..f6f831d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
// 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()
diff --git a/fastlane/metadata/android/en-US/changelogs/19.txt b/fastlane/metadata/android/en-US/changelogs/19.txt
deleted file mode 100644
index da2178d..0000000
--- a/fastlane/metadata/android/en-US/changelogs/19.txt
+++ /dev/null
@@ -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
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/20.txt b/fastlane/metadata/android/en-US/changelogs/20.txt
deleted file mode 100644
index 8641cf5..0000000
--- a/fastlane/metadata/android/en-US/changelogs/20.txt
+++ /dev/null
@@ -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
diff --git a/fastlane/metadata/android/en-US/images/icon.png b/fastlane/metadata/android/en-US/images/icon.png
deleted file mode 100644
index 124727e..0000000
Binary files a/fastlane/metadata/android/en-US/images/icon.png and /dev/null differ
diff --git a/fastlane/metadata/android/ru/changelogs/19.txt b/fastlane/metadata/android/ru/changelogs/19.txt
deleted file mode 100644
index 4bbe5b8..0000000
--- a/fastlane/metadata/android/ru/changelogs/19.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-Обновлена основная библиотека до версии 0.5.9, в которой представлены следующие изменения:
-
-Изменено
-Алгоритм маршрутизации был обновлен с учетом стоимости соединения с RTT, что должно отдавать предпочтения соединениям с меньшей задержкой соединениям с большей задержкой, когда это возможно
-Расчетная стоимость представляет собой среднее значение RTT соединения, но новые соединения изначально оцениваются выше, так что можно избежать проблем с нестабильными узлами
-Стоимость соединения используется только при наличии нескольких следующих переходов и будет игнорироваться, если есть только один путь без петель к месту назначения
-Эта версия совместима с существующими узлами v0.5.x, но будет иметь наилучшие результаты при пиринге с узлами, которые также работают под управлением последней версии
-Команда getPeers теперь будет сообщать рассчитанную стоимость соединения для каждого заданного пира
-Обновлены зависимости
-
-Исправлено
-Обнаружение локальных пиров теперь должно снова работать при сборке Yggdrasil как фреймворка Android
-Обнаружение локальных пиров теперь будет правильно игнорировать интерфейсы, которые не помечены как работающие
-Эфемерные соединения, такие как добавленные мультикастом, больше не будут пытаться быстро переподключаться в цикле, устранена проблема высокой загрузки ЦП
-Интерфейс TUN больше не будет прекращать работу при срабатывании ошибки чтения пакета с помощью векторизованного чтения
-Опция AllowedPublicKeys снова больше не будет применяться к локальным пирам, как изначально предполагалось
-Потенциальный краш при отключении пиринговых соединений был исправлен
-Избыточный системный вызов для установки MTU в OpenBSD был удален
-
-Исправления в приложении для Android
-Исправлен случайный сбой при запуске/остановке
-Обновлены некоторые зависимости
-Обновлен Android API до 34
\ No newline at end of file
diff --git a/fastlane/metadata/android/ru/changelogs/20.txt b/fastlane/metadata/android/ru/changelogs/20.txt
deleted file mode 100644
index ef12299..0000000
--- a/fastlane/metadata/android/ru/changelogs/20.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Обновлена основная библиотека до версии 0.5.12, в которой представлены следующие изменения:
-
-Исправлено
-Исправлена регрессия синхронизации, которая приводит к более высокому уровню служебного трафика в простое
-
-Исправления в приложении Android
-Исправления и улучшения пользовательского интерфейса
-Обновлены некоторые зависимости
-
-Обновления с предыдущих версий:
-
-Изменено
-Алгоритм выбора родителя теперь выбирает нового родителя только в том случае, если это дает большую экономическую выгоду, что должно помочь стабилизировать дерево
-Фильтры Блума теперь периодически распространяются повторно, чтобы избежать застревания узлов в плохом состоянии
-
-Исправлено
-Утечка памяти, вызванная пропущенной очисткой карты ответов пиров
-Другие исправления ошибок с распространением фильтра Блума для фильтров вне дерева
-Пиринг с использованием TLS теперь снова поддерживают TLS 1.2
\ No newline at end of file
diff --git a/libs/yggdrasil-go b/libs/yggdrasil-go
deleted file mode 160000
index 213f72b..0000000
--- a/libs/yggdrasil-go
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 213f72b8403ff55a5e38a0fa7d1cd0a093ac4666
diff --git a/readme.md b/readme.md
index 98e1bc2..69fe52e 100644
--- a/readme.md
+++ b/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
-
-[
](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