diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index d80c32f..a929523 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -23,7 +23,7 @@ jobs: with: repository: yggdrasil-network/yggdrasil-go path: yggdrasil-go - ref: develop + ref: master 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 11 + - name: Set up JDK 17 uses: actions/setup-java@v3 with: - java-version: '11' + java-version: '17' distribution: 'temurin' cache: gradle diff --git a/app/build.gradle b/app/build.gradle index 854ae6a..1a38c8d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,15 +4,14 @@ plugins { } android { - compileSdkVersion 29 - buildToolsVersion "30.0.3" + compileSdkVersion 34 defaultConfig { applicationId "eu.neilalexander.yggdrasil" minSdkVersion 21 - targetSdkVersion 29 - versionCode 13 - versionName "0.1-013" + targetSdkVersion 34 + versionCode 20 + versionName "0.1-020" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -46,17 +45,18 @@ 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.5.0' - implementation 'androidx.appcompat:appcompat:1.3.0' - implementation 'com.google.android.material:material:1.3.0' - implementation 'androidx.constraintlayout:constraintlayout:2.0.4' - implementation 'androidx.preference:preference-ktx:1.1.0' - testImplementation 'junit:junit:4.+' - androidTestImplementation 'androidx.test.ext:junit:1.1.2' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' + 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.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' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e5231bb..ebf9dd1 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,11 +1,12 @@ - + + + - - + + diff --git a/app/src/main/java/eu/neilalexander/yggdrasil/ConfigurationProxy.kt b/app/src/main/java/eu/neilalexander/yggdrasil/ConfigurationProxy.kt index e5dd0ba..2eca90a 100644 --- a/app/src/main/java/eu/neilalexander/yggdrasil/ConfigurationProxy.kt +++ b/app/src/main/java/eu/neilalexander/yggdrasil/ConfigurationProxy.kt @@ -32,14 +32,12 @@ object ConfigurationProxy { val newJson = JSONObject(String(Mobile.generateConfigJSON())) updateJSON { json -> json.put("PrivateKey", newJson.getString("PrivateKey")) - json.put("PublicKey", newJson.getString("PublicKey")) } } - fun setKeys(privateKey: String, publicKey: String) { + fun setKeys(privateKey: String) { updateJSON { json -> json.put("PrivateKey", privateKey) - json.put("PublicKey", publicKey) } } @@ -57,12 +55,13 @@ object ConfigurationProxy { json.put("IfMTU", 65535) if (json.getJSONArray("MulticastInterfaces").get(0) is String) { - var ar = JSONArray() + val ar = JSONArray() ar.put(0, JSONObject(""" { "Regex": ".*", "Beacon": true, - "Listen": true + "Listen": true, + "Password": "" } """.trimIndent())) json.put("MulticastInterfaces", ar) @@ -94,4 +93,12 @@ object ConfigurationProxy { (json.getJSONArray("MulticastInterfaces").get(0) as JSONObject).put("Beacon", value) } } + + var multicastPassword: String + get() = (json.getJSONArray("MulticastInterfaces").get(0) as JSONObject).optString("Password") + set(value) { + updateJSON { json -> + (json.getJSONArray("MulticastInterfaces").get(0) as JSONObject).put("Password", value) + } + } } \ No newline at end of file diff --git a/app/src/main/java/eu/neilalexander/yggdrasil/DnsActivity.kt b/app/src/main/java/eu/neilalexander/yggdrasil/DnsActivity.kt index 7ef32c4..bd50644 100644 --- a/app/src/main/java/eu/neilalexander/yggdrasil/DnsActivity.kt +++ b/app/src/main/java/eu/neilalexander/yggdrasil/DnsActivity.kt @@ -13,6 +13,7 @@ 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() { @@ -41,10 +42,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( - "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), + "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), ) serversTableLayout = findViewById(R.id.configuredDnsTableLayout) @@ -56,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.Theme_MaterialComponents_DayNight_Dialog)) + val builder: AlertDialog.Builder = AlertDialog.Builder(ContextThemeWrapper(this, R.style.YggdrasilDialogs)) builder.setTitle(getString(R.string.dns_add_server_dialog_title)) builder.setView(view) builder.setPositiveButton(getString(R.string.add)) { _, _ -> @@ -127,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(this) + val builder: AlertDialog.Builder = AlertDialog.Builder(ContextThemeWrapper(this, R.style.YggdrasilDialogs)) builder.setTitle(getString(R.string.dns_remove_title, server)) builder.setPositiveButton(getString(R.string.remove)) { dialog, _ -> servers.removeAt(button.tag as Int) @@ -175,7 +176,7 @@ class DnsActivity : AppCompatActivity() { } } view.setOnLongClickListener { - val builder: AlertDialog.Builder = AlertDialog.Builder(this) + val builder: AlertDialog.Builder = AlertDialog.Builder(ContextThemeWrapper(this, R.style.YggdrasilDialogs)) 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 b2f02b4..0431d12 100644 --- a/app/src/main/java/eu/neilalexander/yggdrasil/GlobalApplication.kt +++ b/app/src/main/java/eu/neilalexander/yggdrasil/GlobalApplication.kt @@ -8,14 +8,16 @@ 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 - var updaterConnections: Int = 0 + private var updaterConnections: Int = 0 override fun onCreate() { super.onCreate() @@ -24,6 +26,7 @@ class GlobalApplication: Application(), YggStateReceiver.StateReceiver { callback.register() val receiver = YggStateReceiver(this) receiver.register(this) + migrateDnsServers(this) } fun subscribe() { @@ -47,8 +50,10 @@ class GlobalApplication: Application(), YggStateReceiver.StateReceiver { @RequiresApi(Build.VERSION_CODES.N) override fun onStateChange(state: State) { if (state != currentState) { - val componentName = ComponentName(this, YggTileService::class.java) - TileService.requestListeningState(this, componentName) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { + val componentName = ComponentName(this, YggTileService::class.java) + TileService.requestListeningState(this, componentName) + } if (state != State.Disabled) { val notification = createServiceNotification(this, state) @@ -62,13 +67,39 @@ 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) val intent = Intent(context, MainActivity::class.java).apply { this.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK } - val pendingIntent: PendingIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT) + var flags = PendingIntent.FLAG_UPDATE_CURRENT + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { + flags = PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE + } + val pendingIntent: PendingIntent = PendingIntent.getActivity(context, 0, intent, flags) val text = when (state) { State.Disabled -> context.getText(R.string.tile_disabled) @@ -91,7 +122,11 @@ fun createPermissionMissingNotification(context: Context): Notification { val intent = Intent(context, MainActivity::class.java).apply { this.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK } - val pendingIntent: PendingIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT) + var flags = PendingIntent.FLAG_UPDATE_CURRENT + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { + flags = PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE + } + val pendingIntent: PendingIntent = PendingIntent.getActivity(context, 0, intent, flags) return NotificationCompat.Builder(context, MAIN_CHANNEL_ID) .setShowWhen(false) diff --git a/app/src/main/java/eu/neilalexander/yggdrasil/MainActivity.kt b/app/src/main/java/eu/neilalexander/yggdrasil/MainActivity.kt index dc79acb..befdbe3 100644 --- a/app/src/main/java/eu/neilalexander/yggdrasil/MainActivity.kt +++ b/app/src/main/java/eu/neilalexander/yggdrasil/MainActivity.kt @@ -1,16 +1,19 @@ 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.TableRow import android.widget.TextView import android.widget.Toast import androidx.activity.result.contract.ActivityResultContracts import androidx.appcompat.app.AppCompatActivity +import androidx.appcompat.widget.LinearLayoutCompat import androidx.core.content.edit import androidx.localbroadcastmanager.content.LocalBroadcastManager import androidx.preference.PreferenceManager @@ -18,18 +21,19 @@ 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 coordinatesLabel: TextView private lateinit var peersLabel: TextView - private lateinit var peersRow: TableRow + private lateinit var peersRow: LinearLayoutCompat private lateinit var dnsLabel: TextView - private lateinit var dnsRow: TableRow - private lateinit var settingsRow: TableRow + 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) @@ -53,12 +57,12 @@ class MainActivity : AppCompatActivity() { enabledLabel = findViewById(R.id.yggdrasilStatusLabel) ipAddressLabel = findViewById(R.id.ipAddressValue) subnetLabel = findViewById(R.id.subnetValue) - coordinatesLabel = findViewById(R.id.coordinatesValue) 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) @@ -70,6 +74,7 @@ class MainActivity : AppCompatActivity() { startVpnActivity.launch(vpnIntent) } else { start() + enabledSwitch.isEnabled = false } } false -> { @@ -82,7 +87,7 @@ class MainActivity : AppCompatActivity() { preferences.edit(commit = true) { putBoolean(PREF_KEY_ENABLED, isChecked) } } - val enableYggdrasilPanel = findViewById(R.id.enableYggdrasilPanel) + val enableYggdrasilPanel = findViewById(R.id.enableYggdrasilPanel) enableYggdrasilPanel.setOnClickListener { enabledSwitch.toggle() } @@ -105,6 +110,11 @@ 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) @@ -153,15 +163,16 @@ class MainActivity : AppCompatActivity() { override fun onReceive(context: Context?, intent: Intent) { when (intent.getStringExtra("type")) { "state" -> { - enabledLabel.text = if (intent.getBooleanExtra("started", false)) { - var count = 0 - if (intent.hasExtra("dht")) { - val dht = intent.getStringExtra("dht") - if (dht != null && dht != "null") { - val dhtState = JSONArray(dht) - count = dhtState.length() - } + 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 36d3b56..aa84803 100644 --- a/app/src/main/java/eu/neilalexander/yggdrasil/PacketTunnelProvider.kt +++ b/app/src/main/java/eu/neilalexander/yggdrasil/PacketTunnelProvider.kt @@ -1,7 +1,8 @@ package eu.neilalexander.yggdrasil -import android.content.* +import android.content.Intent import android.net.VpnService +import android.net.wifi.WifiManager import android.os.Build import android.os.ParcelFileDescriptor import android.system.OsConstants @@ -42,6 +43,7 @@ open class PacketTunnelProvider: VpnService() { private var parcel: ParcelFileDescriptor? = null private var readerStream: FileInputStream? = null private var writerStream: FileOutputStream? = null + private var multicastLock: WifiManager.MulticastLock? = null override fun onCreate() { super.onCreate() @@ -101,6 +103,13 @@ open class PacketTunnelProvider: VpnService() { val notification = createServiceNotification(this, State.Enabled) startForeground(SERVICE_NOTIFICATION_ID, notification) + // Acquire multicast lock + val wifi = applicationContext.getSystemService(WIFI_SERVICE) as WifiManager + multicastLock = wifi.createMulticastLock("Yggdrasil").apply { + setReferenceCounted(false) + acquire() + } + Log.d(TAG, config.getJSON().toString()) yggdrasil.startJSON(config.getJSONByteArray()) @@ -163,16 +172,7 @@ open class PacketTunnelProvider: VpnService() { updater() } - var intent = Intent(STATE_INTENT) - intent.putExtra("type", "state") - intent.putExtra("started", true) - intent.putExtra("ip", yggdrasil.addressString) - intent.putExtra("subnet", yggdrasil.subnetString) - intent.putExtra("coords", yggdrasil.coordsString) - intent.putExtra("peers", yggdrasil.peersJSON) - LocalBroadcastManager.getInstance(this).sendBroadcast(intent) - - intent = Intent(YGG_STATE_INTENT) + var intent = Intent(YGG_STATE_INTENT) intent.putExtra("state", STATE_ENABLED) LocalBroadcastManager.getInstance(this).sendBroadcast(intent) } @@ -221,6 +221,7 @@ open class PacketTunnelProvider: VpnService() { stopForeground(true) stopSelf() + multicastLock?.release() } private fun connect() { @@ -231,27 +232,34 @@ 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 if ((application as GlobalApplication).needUiUpdates()) { val intent = Intent(STATE_INTENT) intent.putExtra("type", "state") intent.putExtra("started", true) intent.putExtra("ip", yggdrasil.addressString) intent.putExtra("subnet", yggdrasil.subnetString) - intent.putExtra("coords", yggdrasil.coordsString) + intent.putExtra("pubkey", yggdrasil.publicKeyString) intent.putExtra("peers", yggdrasil.peersJSON) - intent.putExtra("dht", yggdrasil.dhtjson) LocalBroadcastManager.getInstance(this).sendBroadcast(intent) } val curTime = System.currentTimeMillis() if (lastStateUpdate + 10000 < curTime) { val intent = Intent(YGG_STATE_INTENT) var state = STATE_ENABLED - val dht = yggdrasil.dhtjson - if (dht != null && dht != "null") { - val dhtState = JSONArray(dht) - val count = dhtState.length() + if (yggdrasil.routingEntries > 0) { + state = STATE_CONNECTED + } + if (treeJSON != null && treeJSON != "null") { + val treeState = JSONArray(treeJSON) + val count = treeState.length() if (count > 1) state = STATE_CONNECTED } diff --git a/app/src/main/java/eu/neilalexander/yggdrasil/PeersActivity.kt b/app/src/main/java/eu/neilalexander/yggdrasil/PeersActivity.kt index 2f5acce..55e2817 100644 --- a/app/src/main/java/eu/neilalexander/yggdrasil/PeersActivity.kt +++ b/app/src/main/java/eu/neilalexander/yggdrasil/PeersActivity.kt @@ -5,17 +5,27 @@ 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.* +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 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 @@ -27,6 +37,7 @@ class PeersActivity : AppCompatActivity() { private lateinit var configuredTableLabel: TextView private lateinit var multicastListenSwitch: Switch private lateinit var multicastBeaconSwitch: Switch + private lateinit var passwordEdit: EditText private lateinit var addPeerButton: ImageButton override fun onCreate(savedInstanceState: Bundle?) { @@ -43,6 +54,9 @@ class PeersActivity : AppCompatActivity() { configuredTableLayout = findViewById(R.id.configuredPeersTableLayout) configuredTableLabel = findViewById(R.id.configuredPeersLabel) + val discoveryLink = findViewById(R.id.peers_discovery_link) + discoveryLink.movementMethod = LinkMovementMethod.getInstance() + multicastListenSwitch = findViewById(R.id.enableMulticastListen) multicastListenSwitch.setOnCheckedChangeListener { button, _ -> config.multicastListen = button.isChecked @@ -62,12 +76,36 @@ class PeersActivity : AppCompatActivity() { multicastListenPanel.setOnClickListener { multicastListenSwitch.toggle() } + passwordEdit = findViewById(R.id.passwordEdit) + passwordEdit.setText(config.multicastPassword) + + passwordEdit.doOnTextChanged { text, _, _, _ -> + config.multicastPassword = text.toString() + } + + passwordEdit.setOnKeyListener { _, keyCode, _ -> + (keyCode == KeyEvent.KEYCODE_DPAD_CENTER || keyCode == KeyEvent.KEYCODE_ENTER) + } + + findViewById(R.id.passwordTableRow).setOnKeyListener { _, keyCode, event -> + Log.i("Key", keyCode.toString()) + if (event.action == KeyEvent.ACTION_DOWN) { + if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER || keyCode == KeyEvent.KEYCODE_ENTER) { + passwordEdit.requestFocus() + true + } else { + false + } + } else { + false + } + } addPeerButton = findViewById(R.id.addPeerButton) 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.Theme_MaterialComponents_DayNight_Dialog)) + val builder: AlertDialog.Builder = AlertDialog.Builder(ContextThemeWrapper(this, R.style.YggdrasilDialogs)) builder.setTitle(getString(R.string.peers_add_peer)) builder.setView(view) builder.setPositiveButton(getString(R.string.peers_add)) { dialog, _ -> @@ -121,7 +159,7 @@ class PeersActivity : AppCompatActivity() { view.findViewById(R.id.deletePeerButton).tag = i view.findViewById(R.id.deletePeerButton).setOnClickListener { button -> - val builder: AlertDialog.Builder = AlertDialog.Builder(this) + val builder: AlertDialog.Builder = AlertDialog.Builder(ContextThemeWrapper(this, R.style.YggdrasilDialogs)) builder.setTitle(getString(R.string.peers_remove_title, peer)) builder.setPositiveButton(getString(R.string.peers_remove)) { dialog, _ -> config.updateJSON { json -> @@ -148,16 +186,25 @@ class PeersActivity : AppCompatActivity() { connectedTableLabel.text = getString(R.string.peers_no_connected_title) } else -> { - connectedTableLayout.visibility = View.VISIBLE - connectedTableLabel.text = getString(R.string.peers_connected_title) - + var connected = false connectedTableLayout.removeAllViewsInLayout() for (peer in peers) { val view = inflater.inflate(R.layout.peers_connected, null) val ip = peer.getString("IP") - view.findViewById(R.id.addressLabel).text = ip - view.findViewById(R.id.detailsLabel).text = peer.getString("Remote") - connectedTableLayout.addView(view) + // 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) } } } @@ -168,7 +215,9 @@ class PeersActivity : AppCompatActivity() { when (intent.getStringExtra("type")) { "state" -> { if (intent.hasExtra("peers")) { - val peersArray = JSONArray(intent.getStringExtra("peers") ?: "[]") + val peers1 = intent.getStringExtra("peers") + //Log.i("PeersActivity", "Peers json: $peers1") + val peersArray = JSONArray(peers1 ?: "[]") val array = Array(peersArray.length()) { i -> peersArray.getJSONObject(i) } diff --git a/app/src/main/java/eu/neilalexander/yggdrasil/SettingsActivity.kt b/app/src/main/java/eu/neilalexander/yggdrasil/SettingsActivity.kt index b4e8779..8e2e3d2 100644 --- a/app/src/main/java/eu/neilalexander/yggdrasil/SettingsActivity.kt +++ b/app/src/main/java/eu/neilalexander/yggdrasil/SettingsActivity.kt @@ -1,15 +1,23 @@ package eu.neilalexander.yggdrasil import android.app.AlertDialog +import android.content.BroadcastReceiver import android.content.ClipData import android.content.ClipboardManager +import android.content.Context +import android.content.Intent +import android.content.IntentFilter import androidx.appcompat.app.AppCompatActivity import android.os.Bundle +import android.util.Log import android.view.ContextThemeWrapper +import android.view.KeyEvent import android.view.LayoutInflater import android.view.View import android.widget.* +import androidx.appcompat.widget.LinearLayoutCompat import androidx.core.widget.doOnTextChanged +import androidx.localbroadcastmanager.content.LocalBroadcastManager import org.json.JSONObject class SettingsActivity : AppCompatActivity() { @@ -18,7 +26,8 @@ class SettingsActivity : AppCompatActivity() { private lateinit var deviceNameEntry: EditText private lateinit var publicKeyLabel: TextView - private lateinit var resetConfigurationRow: TableRow + private lateinit var resetConfigurationRow: LinearLayoutCompat + private var publicKeyReset = false override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -41,9 +50,27 @@ class SettingsActivity : AppCompatActivity() { } } + deviceNameEntry.setOnKeyListener { view, keyCode, event -> + (keyCode == KeyEvent.KEYCODE_DPAD_CENTER || keyCode == KeyEvent.KEYCODE_ENTER) + } + + findViewById(R.id.deviceNameTableRow).setOnKeyListener { view, keyCode, event -> + Log.i("Key", keyCode.toString()) + if (event.action == KeyEvent.ACTION_DOWN) { + if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER || keyCode == KeyEvent.KEYCODE_ENTER) { + deviceNameEntry.requestFocus() + true + } else { + false + } + } else { + false + } + } + resetConfigurationRow.setOnClickListener { val view = inflater.inflate(R.layout.dialog_resetconfig, null) - val builder: AlertDialog.Builder = AlertDialog.Builder(ContextThemeWrapper(this, R.style.Theme_MaterialComponents_DayNight_Dialog)) + val builder: AlertDialog.Builder = AlertDialog.Builder(ContextThemeWrapper(this, R.style.YggdrasilDialogs)) builder.setTitle(getString(R.string.settings_warning_title)) builder.setView(view) builder.setPositiveButton(getString(R.string.settings_reset)) { dialog, _ -> @@ -59,18 +86,18 @@ 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.Theme_MaterialComponents_DayNight_Dialog)) + val builder: AlertDialog.Builder = AlertDialog.Builder(ContextThemeWrapper(this, R.style.YggdrasilDialogs)) val privateKey = view.findViewById(R.id.private_key) - val publicKey = view.findViewById(R.id.public_key) builder.setTitle(getString(R.string.set_keys)) builder.setView(view) builder.setPositiveButton(getString(R.string.save)) { dialog, _ -> - config.setKeys(privateKey.text.toString(), publicKey.text.toString()) + config.setKeys(privateKey.text.toString()) updateView() dialog.dismiss() } @@ -92,13 +119,44 @@ class SettingsActivity : AppCompatActivity() { } private fun updateView() { - val nodeinfo = config.getJSON().optJSONObject("NodeInfo") + val json = config.getJSON() + val nodeinfo = json.optJSONObject("NodeInfo") if (nodeinfo != null) { deviceNameEntry.setText(nodeinfo.getString("name"), TextView.BufferType.EDITABLE) } else { deviceNameEntry.setText("", TextView.BufferType.EDITABLE) } - publicKeyLabel.text = config.getJSON().getString("PublicKey") + var key = json.optString("PrivateKey") + if (key.isNotEmpty()) { + key = key.substring(key.length / 2) + } + publicKeyLabel.text = key + } + + override fun onResume() { + super.onResume() + LocalBroadcastManager.getInstance(this).registerReceiver( + receiver, IntentFilter(PacketTunnelProvider.STATE_INTENT) + ) + (application as GlobalApplication).subscribe() + } + + override fun onPause() { + super.onPause() + (application as GlobalApplication).unsubscribe() + LocalBroadcastManager.getInstance(this).unregisterReceiver(receiver) + } + + // 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) { + val tree = intent.getStringExtra("pubkey") + if (tree != null && tree != "null") { + publicKeyLabel.text = intent.getStringExtra("pubkey") + } + } + } } } diff --git a/app/src/main/res/layout/activity_dns.xml b/app/src/main/res/layout/activity_dns.xml index eb00e02..d0061e8 100644 --- a/app/src/main/res/layout/activity_dns.xml +++ b/app/src/main/res/layout/activity_dns.xml @@ -223,6 +223,7 @@ android:layout_marginStart="16pt" android:layout_marginLeft="16pt" android:layout_marginTop="4pt" + android:layout_marginBottom="4pt" android:layout_marginEnd="8pt" android:layout_marginRight="8pt" android:alpha="0.7" diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 8ff639a..e85a344 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -52,8 +52,9 @@ android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textSize="12sp" /> - - @@ -92,9 +93,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" /> - + - + - + - + - - + - + - + - + - - - - - - - - + - - @@ -302,9 +278,9 @@ android:scaleX="1.2" android:scaleY="1.2" app:srcCompat="@drawable/ic_baseline_chevron_right_24" /> - + - @@ -339,9 +315,9 @@ android:scaleX="1.2" android:scaleY="1.2" app:srcCompat="@drawable/ic_baseline_chevron_right_24" /> - + - @@ -373,9 +349,11 @@ android:scaleY="1.2" app:srcCompat="@drawable/ic_baseline_chevron_right_24" /> - + - + - + - + + + @@ -217,6 +234,37 @@ + + + + + + + + @@ -216,8 +217,9 @@ android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textSize="12sp" /> - - @@ -242,9 +243,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/regenerate_keys" /> - + - @@ -252,9 +253,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/set_keys" /> - + - @@ -263,15 +264,16 @@ android:layout_height="wrap_content" android:text="@string/reset_configuration" android:textColor="@android:color/holo_red_dark" /> - - + + - - - Нет пиров 1 пир %d пира/пиров + Внимание + Не настроено ни одного пира. Если не будет обнаруживаемых пиров в этой сети, то вам надо будет добавить пир вручную, чтобы подключение к Yggdrasil работало как положено. Добавить пира в конфиг Добавить Убрать %s? @@ -42,11 +44,10 @@ Сброс Состояние Включить Yggdrasil - Статистика + Адрес и сеть Н/Д Адрес Подсеть - Координаты Конфигурация Пиры Серверы DNS @@ -58,7 +59,9 @@ Находимый через multicast Искать пиров через multicast Yggdrasil будет пытаться подключаться к этим пирам автоматически. Если вы добавите несколько пиров, ваше устройство может быть использовано для переноса данных между другими узлами сети. Чтобы этого избежать настройте только один пир. - Пиры могут быть найдены с помощью Multicast если они находятся в той же Wi-Fi сети, либо через USB. Трафик в мобильной сети может быть платным. Вы можете отключить мобильные данные в настройках устройства. + Вы можете найти публичные пиры по этой ссылке. + Пиры могут быть найдены с помощью Multicast если они находятся в той же Wi-Fi сети, либо через USB. У них должен быть одинаковый пароль. Трафик в мобильной сети может быть платным. Вы можете отключить мобильные данные в настройках устройства. + Пароль Об узле Название устройства Нажмите для изменения @@ -72,15 +75,15 @@ Включено (Нет подключения) Подключено Амстердам, Нидерланды - Прага, Чехия + Франкфурт, Германия Братислава, Словакия - Баффало, США + Буффало, США Сервис VPN Главный канал нотификаций сервиса Нажмите здесь чтобы включить Yggdrasil. Введите полный URI пира для добавления. Yggdrasil будет автоматически подключаться к нему при запуске. - Публичный ключ: Приватный ключ: - Установить свои ключи + Установить свой ключ Сохранить + Не найден браузер для открытия ссылки! \ 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 4f74376..2c8e64a 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -5,6 +5,7 @@ #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 96e6545..61c8633 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -29,6 +29,8 @@ 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? @@ -42,11 +44,10 @@ Reset Status Enable Yggdrasil - Statistics + Network info N/A IP Subnet - Coordinates Configuration Peers DNS servers @@ -58,7 +59,9 @@ Discoverable over multicast Search for multicast peers 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. - Multicast peers will be discovered on the same Wi-Fi network or via USB. Data charges may apply when using mobile data. You can prevent data usage in the device settings. + You can find public peers by opening this link. + 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. + Password Node Info Device Name Tap to edit @@ -72,15 +75,15 @@ Enabled (No connectivity) Connected Amsterdam, NL - Prague, CZ + Frankfurt, DE Bratislava, SK Buffalo, US VPN Service Main channel for foreground notification Tap here to enable Yggdrasil. Enter the full URI of the peer to add. Yggdrasil will automatically connect to this peer when started. - Public key: Private key: - Set your own keys + 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 ece6c2c..e48c592 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -18,4 +18,8 @@ @color/white @color/black + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 0cf859d..2f8ae41 100644 --- a/build.gradle +++ b/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.7.20' + ext.kotlin_version = '1.9.20' repositories { google() mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:4.2.2" + classpath 'com.android.tools.build:gradle:8.1.4' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/fastlane/metadata/android/en-US/changelogs/15.txt b/fastlane/metadata/android/en-US/changelogs/15.txt new file mode 100644 index 0000000..859f418 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/15.txt @@ -0,0 +1,3 @@ +* Updated core Yggdrasil library to 0.5.1 +* Updated UI to reflect changes in new version +* Fixed small bugs in UI \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/changelogs/16.txt b/fastlane/metadata/android/en-US/changelogs/16.txt new file mode 100644 index 0000000..2bf6005 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/16.txt @@ -0,0 +1 @@ +* Updated core Yggdrasil library to 0.5.4 \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/changelogs/17.txt b/fastlane/metadata/android/en-US/changelogs/17.txt new file mode 100644 index 0000000..6e775f8 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/17.txt @@ -0,0 +1 @@ +* Updated core Yggdrasil library to 0.5.6 diff --git a/fastlane/metadata/android/en-US/changelogs/18.txt b/fastlane/metadata/android/en-US/changelogs/18.txt new file mode 100644 index 0000000..7c13f7b --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/18.txt @@ -0,0 +1,14 @@ +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 diff --git a/fastlane/metadata/android/en-US/changelogs/19.txt b/fastlane/metadata/android/en-US/changelogs/19.txt new file mode 100644 index 0000000..da2178d --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/19.txt @@ -0,0 +1,23 @@ +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 new file mode 100644 index 0000000..8641cf5 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/20.txt @@ -0,0 +1,19 @@ +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/featureGraphic.png b/fastlane/metadata/android/en-US/images/featureGraphic.png index 37072bf..322635d 100644 Binary files a/fastlane/metadata/android/en-US/images/featureGraphic.png and b/fastlane/metadata/android/en-US/images/featureGraphic.png differ diff --git a/fastlane/metadata/android/en-US/images/icon.png b/fastlane/metadata/android/en-US/images/icon.png new file mode 100644 index 0000000..124727e Binary files /dev/null and b/fastlane/metadata/android/en-US/images/icon.png differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png index d88ae96..fbc6f8b 100644 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png index 6569e04..07e366e 100644 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png differ diff --git a/fastlane/metadata/android/ru/changelogs/15.txt b/fastlane/metadata/android/ru/changelogs/15.txt new file mode 100644 index 0000000..8aaecd6 --- /dev/null +++ b/fastlane/metadata/android/ru/changelogs/15.txt @@ -0,0 +1,3 @@ +* Обновлена библиотека Yggdrasil до 0.5.1 +* Обновлен интерфейс в соответствии с новой версией библиотеки +* Сделаны небольшие исправления в интерфейсе \ No newline at end of file diff --git a/fastlane/metadata/android/ru/changelogs/16.txt b/fastlane/metadata/android/ru/changelogs/16.txt new file mode 100644 index 0000000..66c5dba --- /dev/null +++ b/fastlane/metadata/android/ru/changelogs/16.txt @@ -0,0 +1 @@ +* Обновлена библиотека Yggdrasil до 0.5.4 \ No newline at end of file diff --git a/fastlane/metadata/android/ru/changelogs/17.txt b/fastlane/metadata/android/ru/changelogs/17.txt new file mode 100644 index 0000000..eb0d4a3 --- /dev/null +++ b/fastlane/metadata/android/ru/changelogs/17.txt @@ -0,0 +1 @@ +* Обновлена библиотека Yggdrasil до 0.5.6 diff --git a/fastlane/metadata/android/ru/changelogs/18.txt b/fastlane/metadata/android/ru/changelogs/18.txt new file mode 100644 index 0000000..fe1c795 --- /dev/null +++ b/fastlane/metadata/android/ru/changelogs/18.txt @@ -0,0 +1,14 @@ +Обновлена основная библиотека до версии 0.5.7, в которой представлены следующие изменения: + +Добавлено +Поддержка WebSocket для пиринга с использованием новой схемы ws:// в Listen и Peers +Кроме того, схему wss:// можно использовать для подключения к узлам WebSocket за обратным прокси-сервером HTTPS вроде Nginx + +Изменено +В Linux адаптер TUN теперь использует векторизованную чтение/запись, где это возможно, что должно сократить количество времени ЦП, затрачиваемого на системные вызовы, и потенциально повысить пропускную способность +Улучшена обработка ошибок соединения, а различные сообщения об ошибках соединения были переписаны для большей ясности +Обновление зависимостей + +Исправлено +Несколько мультикаст подключений к одной и той же удаленной машине теперь должны работать правильно +В некоторых случаях вы можете получить два подключения, одно входящее и одно исходящее, это известное поведение и не вызовет проблем \ No newline at end of file diff --git a/fastlane/metadata/android/ru/changelogs/19.txt b/fastlane/metadata/android/ru/changelogs/19.txt new file mode 100644 index 0000000..4bbe5b8 --- /dev/null +++ b/fastlane/metadata/android/ru/changelogs/19.txt @@ -0,0 +1,23 @@ +Обновлена основная библиотека до версии 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 new file mode 100644 index 0000000..ef12299 --- /dev/null +++ b/fastlane/metadata/android/ru/changelogs/20.txt @@ -0,0 +1,19 @@ +Обновлена основная библиотека до версии 0.5.12, в которой представлены следующие изменения: + +Исправлено +Исправлена регрессия синхронизации, которая приводит к более высокому уровню служебного трафика в простое + +Исправления в приложении Android +Исправления и улучшения пользовательского интерфейса +Обновлены некоторые зависимости + +Обновления с предыдущих версий: + +Изменено +Алгоритм выбора родителя теперь выбирает нового родителя только в том случае, если это дает большую экономическую выгоду, что должно помочь стабилизировать дерево +Фильтры Блума теперь периодически распространяются повторно, чтобы избежать застревания узлов в плохом состоянии + +Исправлено +Утечка памяти, вызванная пропущенной очисткой карты ответов пиров +Другие исправления ошибок с распространением фильтра Блума для фильтров вне дерева +Пиринг с использованием TLS теперь снова поддерживают TLS 1.2 \ No newline at end of file diff --git a/fastlane/metadata/android/ru/images/featureGraphic.png b/fastlane/metadata/android/ru/images/featureGraphic.png index 37072bf..322635d 100644 Binary files a/fastlane/metadata/android/ru/images/featureGraphic.png and b/fastlane/metadata/android/ru/images/featureGraphic.png differ diff --git a/fastlane/metadata/android/ru/images/phoneScreenshots/1.png b/fastlane/metadata/android/ru/images/phoneScreenshots/1.png index 3ef7c25..8447368 100644 Binary files a/fastlane/metadata/android/ru/images/phoneScreenshots/1.png and b/fastlane/metadata/android/ru/images/phoneScreenshots/1.png differ diff --git a/fastlane/metadata/android/ru/images/phoneScreenshots/2.png b/fastlane/metadata/android/ru/images/phoneScreenshots/2.png index 4dbda3a..04ec129 100644 Binary files a/fastlane/metadata/android/ru/images/phoneScreenshots/2.png and b/fastlane/metadata/android/ru/images/phoneScreenshots/2.png differ diff --git a/gradle.properties b/gradle.properties index 2521752..3feb240 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,4 +16,8 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 # https://developer.android.com/topic/libraries/support-library/androidx-rn android.useAndroidX=true # Kotlin code style for this project: "official" or "obsolete": -kotlin.code.style=official \ No newline at end of file +kotlin.code.style=official +#android.enableR8.fullMode=false +android.defaults.buildfeatures.buildconfig=true +android.nonTransitiveRClass=false +android.nonFinalResIds=false \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e148f37..7f3c09a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Jun 14 15:11:35 BST 2021 +#Mon Nov 27 01:27:23 CET 2023 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/libs/yggdrasil-go b/libs/yggdrasil-go index 14f1cd4..213f72b 160000 --- a/libs/yggdrasil-go +++ b/libs/yggdrasil-go @@ -1 +1 @@ -Subproject commit 14f1cd4696a37b0f7fdcb067fac337c46953f8af +Subproject commit 213f72b8403ff55a5e38a0fa7d1cd0a093ac4666 diff --git a/readme.md b/readme.md index 69fe52e..98e1bc2 100644 --- a/readme.md +++ b/readme.md @@ -1,4 +1,23 @@ -## build instructions +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 + +[Get it on F-Droid](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 * install gomobile