diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml deleted file mode 100644 index a929523..0000000 --- a/.github/workflows/android.yml +++ /dev/null @@ -1,90 +0,0 @@ -name: Build - -on: - push: - branches: [ "main" ] - pull_request: - branches: [ "main" ] - workflow_dispatch: - release: - types: [published] - -jobs: - build: - name: Build - runs-on: ubuntu-latest - - steps: - - name: Check out - uses: actions/checkout@v3 - - - name: Check out Yggdrasil - uses: actions/checkout@v3 - with: - repository: yggdrasil-network/yggdrasil-go - path: yggdrasil-go - ref: master - fetch-depth: 0 - - - name: Setup Go environment - uses: actions/setup-go@v3.3.1 - - - name: Install gomobile - run: | - go install golang.org/x/mobile/cmd/gomobile@latest - ~/go/bin/gomobile init - - - name: Set up JDK 17 - uses: actions/setup-java@v3 - with: - java-version: '17' - distribution: 'temurin' - cache: gradle - - - name: Install NDK - uses: nttld/setup-ndk@v1 - id: setup-ndk - with: - ndk-version: r21e - add-to-path: false - - - name: Build Yggdrasil - run: | - mkdir app/libs - cd yggdrasil-go - PATH=$PATH:~/go/bin/ ./contrib/mobile/build -a - cp {yggdrasil.aar,yggdrasil-sources.jar} ../app/libs - env: - ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }} - - - name: Gradle build - if: github.event_name != 'release' && github.ref_name != 'main' - run: | - chmod +x gradlew - ./gradlew buildRelease - - - name: Gradle signed build - if: github.event_name == 'release' || github.ref_name == 'main' - run: | - echo "${{ secrets.RELEASE_KEYSTORE }}" > app/gha.keystore.asc - gpg -d --passphrase "${{ secrets.RELEASE_KEYSTORE_PASSWORD }}" --batch app/gha.keystore.asc > app/gha.jks - chmod +x gradlew - ./gradlew assembleYggdrasil - - - name: Upload build artifact - if: github.event_name == 'release' || github.ref_name == 'main' - uses: actions/upload-artifact@v3 - with: - name: yggdrasil-android - path: app/build/outputs/apk/yggdrasil/app-yggdrasil.apk - - - name: Upload release artifact - if: github.event_name == 'release' - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ github.event.release.upload_url }} - asset_path: app/build/outputs/apk/yggdrasil/app-yggdrasil.apk - asset_name: yggdrasil-android.apk - asset_content_type: application/vnd.android.package-archive diff --git a/.gitignore b/.gitignore index 2595523..52ead0e 100644 --- a/.gitignore +++ b/.gitignore @@ -16,5 +16,3 @@ local.properties /app/libs/yggdrasil.aar /app/libs/yggdrasil-sources.jar -/app/release/* -/app/release diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 3340ab4..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "libs/yggdrasil-go"] - path = libs/yggdrasil-go - url = https://github.com/yggdrasil-network/yggdrasil-go diff --git a/LICENSE b/LICENSE deleted file mode 100644 index e43f3b3..0000000 --- a/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2021 Yggdrasil Developers - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/app/build.gradle b/app/build.gradle index 1a38c8d..e0333ee 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,39 +4,24 @@ plugins { } android { - compileSdkVersion 34 + compileSdkVersion 29 + buildToolsVersion "30.0.3" defaultConfig { applicationId "eu.neilalexander.yggdrasil" minSdkVersion 21 - targetSdkVersion 34 - versionCode 20 - versionName "0.1-020" + targetSdkVersion 29 + versionCode 2 + versionName "0.1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } - signingConfigs { - create("yggdrasil") { - // You need to specify either an absolute path or include the - // keystore file in the same directory as the build.gradle file. - storeFile = file("gha.jks") - storePassword = "g1thub4ct10n34yggdr4s1l4ndr01d" - keyAlias = "yggdrasil-android" - keyPassword = "g1thub4ct10n34yggdr4s1l4ndr01d" - } - } - buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } - yggdrasil { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - signingConfig = signingConfigs.getByName("yggdrasil") - } } compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 @@ -45,18 +30,16 @@ 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.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' -} + 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' + testImplementation 'junit:junit:4.+' + androidTestImplementation 'androidx.test.ext:junit:1.1.2' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' +} \ No newline at end of file diff --git a/app/release/app-release.apk b/app/release/app-release.apk new file mode 100644 index 0000000..308acc1 Binary files /dev/null and b/app/release/app-release.apk differ diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json new file mode 100644 index 0000000..03e0490 --- /dev/null +++ b/app/release/output-metadata.json @@ -0,0 +1,18 @@ +{ + "version": 2, + "artifactType": { + "type": "APK", + "kind": "Directory" + }, + "applicationId": "eu.neilalexander.yggdrasil", + "variantName": "release", + "elements": [ + { + "type": "SINGLE", + "filters": [], + "versionCode": 1, + "versionName": "1.0", + "outputFile": "app-release.apk" + } + ] +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ebf9dd1..f9f16b4 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,72 +1,37 @@ - + + - - - - - - + android:theme="@style/Theme.Yggdrasil"> + + + - - - - - - - - + android:permission="android.permission.BIND_VPN_SERVICE"> - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/java/eu/neilalexander/yggdrasil/BootUpReceiver.kt b/app/src/main/java/eu/neilalexander/yggdrasil/BootUpReceiver.kt deleted file mode 100644 index 2ca3629..0000000 --- a/app/src/main/java/eu/neilalexander/yggdrasil/BootUpReceiver.kt +++ /dev/null @@ -1,40 +0,0 @@ -package eu.neilalexander.yggdrasil - -import android.app.NotificationManager -import android.content.BroadcastReceiver -import android.content.Context -import android.content.Intent -import android.net.VpnService -import android.util.Log -import androidx.preference.PreferenceManager - -class BootUpReceiver : BroadcastReceiver() { - - companion object { - const val TAG = "BootUpReceiver" - } - - override fun onReceive(context: Context, intent: Intent) { - if (intent.action != Intent.ACTION_BOOT_COMPLETED) { - Log.w(TAG, "Wrong action: ${intent.action}") - } - val preferences = PreferenceManager.getDefaultSharedPreferences(context) - if (!preferences.getBoolean(PREF_KEY_ENABLED, false)) { - Log.i(TAG, "Yggdrasil disabled, not starting service") - return - } - Log.i(TAG, "Yggdrasil enabled, starting service") - val serviceIntent = Intent(context, PacketTunnelProvider::class.java) - serviceIntent.action = PacketTunnelProvider.ACTION_START - - val vpnIntent = VpnService.prepare(context) - if (vpnIntent != null) { - Log.i(TAG, "Need to ask for VPN permission") - val notification = createPermissionMissingNotification(context) - val manager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager - manager.notify(444, notification) - } else { - context.startService(serviceIntent) - } - } -} \ No newline at end of file diff --git a/app/src/main/java/eu/neilalexander/yggdrasil/ConfigurationProxy.kt b/app/src/main/java/eu/neilalexander/yggdrasil/ConfigurationProxy.kt index 2eca90a..e0a38a9 100644 --- a/app/src/main/java/eu/neilalexander/yggdrasil/ConfigurationProxy.kt +++ b/app/src/main/java/eu/neilalexander/yggdrasil/ConfigurationProxy.kt @@ -2,7 +2,6 @@ package eu.neilalexander.yggdrasil import android.content.Context import mobile.Mobile -import org.json.JSONArray import org.json.JSONObject import java.io.File @@ -22,25 +21,6 @@ object ConfigurationProxy { return this } - fun resetJSON() { - val conf = Mobile.generateConfigJSON() - file.writeBytes(conf) - fix() - } - - fun resetKeys() { - val newJson = JSONObject(String(Mobile.generateConfigJSON())) - updateJSON { json -> - json.put("PrivateKey", newJson.getString("PrivateKey")) - } - } - - fun setKeys(privateKey: String) { - updateJSON { json -> - json.put("PrivateKey", privateKey) - } - } - fun updateJSON(fn: (JSONObject) -> Unit) { json = JSONObject(file.readText(Charsets.UTF_8)) fn(json) @@ -53,19 +33,6 @@ object ConfigurationProxy { json.put("AdminListen", "none") json.put("IfName", "none") json.put("IfMTU", 65535) - - if (json.getJSONArray("MulticastInterfaces").get(0) is String) { - val ar = JSONArray() - ar.put(0, JSONObject(""" - { - "Regex": ".*", - "Beacon": true, - "Listen": true, - "Password": "" - } - """.trimIndent())) - json.put("MulticastInterfaces", ar) - } } } @@ -77,28 +44,4 @@ object ConfigurationProxy { fun getJSONByteArray(): ByteArray { return json.toString().toByteArray(Charsets.UTF_8) } - - var multicastListen: Boolean - get() = (json.getJSONArray("MulticastInterfaces").get(0) as JSONObject).getBoolean("Listen") - set(value) { - updateJSON { json -> - (json.getJSONArray("MulticastInterfaces").get(0) as JSONObject).put("Listen", value) - } - } - - var multicastBeacon: Boolean - get() = (json.getJSONArray("MulticastInterfaces").get(0) as JSONObject).getBoolean("Beacon") - set(value) { - updateJSON { json -> - (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 deleted file mode 100644 index bd50644..0000000 --- a/app/src/main/java/eu/neilalexander/yggdrasil/DnsActivity.kt +++ /dev/null @@ -1,192 +0,0 @@ -package eu.neilalexander.yggdrasil - -import android.annotation.SuppressLint -import android.app.AlertDialog -import android.content.SharedPreferences -import androidx.appcompat.app.AppCompatActivity -import android.os.Bundle -import android.view.ContextThemeWrapper -import android.view.LayoutInflater -import android.view.View -import android.widget.* -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() { - private lateinit var config: ConfigurationProxy - private lateinit var inflater: LayoutInflater - - private lateinit var serversTableLayout: TableLayout - private lateinit var serversTableLabel: TextView - private lateinit var serversTableHint: TextView - private lateinit var addServerButton: ImageButton - private lateinit var enableChromeFix: Switch - - private lateinit var servers: MutableList - private lateinit var preferences: SharedPreferences - - private lateinit var defaultDnsServers: HashMap> - - @SuppressLint("ApplySharedPref") - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContentView(R.layout.activity_dns) - - config = ConfigurationProxy(applicationContext) - inflater = LayoutInflater.from(this) - - 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), - ) - - serversTableLayout = findViewById(R.id.configuredDnsTableLayout) - serversTableLabel = findViewById(R.id.configuredDnsLabel) - serversTableHint = findViewById(R.id.configuredDnsHint) - enableChromeFix = findViewById(R.id.enableChromeFix) - - addServerButton = findViewById(R.id.addServerButton) - 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)) - builder.setTitle(getString(R.string.dns_add_server_dialog_title)) - builder.setView(view) - builder.setPositiveButton(getString(R.string.add)) { _, _ -> - val server = input.text.toString() - if (!servers.contains(server)) { - servers.add(server) - preferences.edit().apply { - putString(KEY_DNS_SERVERS, servers.joinToString(",")) - commit() - } - updateConfiguredServers() - } else { - Toast.makeText(this, R.string.dns_already_added_server, Toast.LENGTH_SHORT).show() - } - } - builder.setNegativeButton(getString(R.string.cancel)) { dialog, _ -> - dialog.cancel() - } - builder.show() - } - - enableChromeFix.setOnCheckedChangeListener { _, isChecked -> - preferences.edit().apply { - putBoolean(KEY_ENABLE_CHROME_FIX, isChecked) - commit() - } - } - - val enableChromeFixPanel = findViewById(R.id.enableChromeFixPanel) - enableChromeFixPanel.setOnClickListener { - enableChromeFix.toggle() - } - - preferences = PreferenceManager.getDefaultSharedPreferences(this.baseContext) - val serverString = preferences.getString(KEY_DNS_SERVERS, "") - servers = if (serverString!!.isNotEmpty()) { - serverString.split(",").toMutableList() - } else { - mutableListOf() - } - updateUsableServers() - } - - override fun onResume() { - super.onResume() - updateConfiguredServers() - enableChromeFix.isChecked = preferences.getBoolean(KEY_ENABLE_CHROME_FIX, false) - } - - @SuppressLint("ApplySharedPref") - private fun updateConfiguredServers() { - when (servers.size) { - 0 -> { - serversTableLayout.visibility = View.GONE - serversTableLabel.text = getString(R.string.dns_no_configured_servers) - serversTableHint.text = getText(R.string.dns_configured_servers_hint_empty) - } - else -> { - serversTableLayout.visibility = View.VISIBLE - serversTableLabel.text = getString(R.string.dns_configured_servers) - serversTableHint.text = getText(R.string.dns_configured_servers_hint) - - serversTableLayout.removeAllViewsInLayout() - for (i in servers.indices) { - val server = servers[i] - val view = inflater.inflate(R.layout.peers_configured, null) - view.findViewById(R.id.addressValue).text = server - 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)) - builder.setTitle(getString(R.string.dns_remove_title, server)) - builder.setPositiveButton(getString(R.string.remove)) { dialog, _ -> - servers.removeAt(button.tag as Int) - preferences.edit().apply { - this.putString(KEY_DNS_SERVERS, servers.joinToString(",")) - this.commit() - } - dialog.dismiss() - updateConfiguredServers() - } - builder.setNegativeButton(getString(R.string.cancel)) { dialog, _ -> - dialog.cancel() - } - builder.show() - } - serversTableLayout.addView(view) - } - } - } - } - - @SuppressLint("ApplySharedPref") - private fun updateUsableServers() { - val usableTableLayout: TableLayout = findViewById(R.id.usableDnsTableLayout) - - defaultDnsServers.forEach { - val server = it.key - val infoPair = it.value - val view = inflater.inflate(R.layout.dns_server_usable, null) - view.findViewById(R.id.serverValue).text = server - val addButton = view.findViewById(R.id.addButton) - addButton.tag = server - - addButton.setOnClickListener { button -> - val serverString = button.tag as String - if (!servers.contains(serverString)) { - servers.add(serverString) - preferences.edit().apply { - this.putString(KEY_DNS_SERVERS, servers.joinToString(",")) - this.commit() - } - updateConfiguredServers() - } else { - Toast.makeText(this, R.string.dns_already_added_server, Toast.LENGTH_SHORT).show() - } - } - view.setOnLongClickListener { - 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, _ -> - dialog.dismiss() - } - builder.show() - true - } - - usableTableLayout.addView(view) - } - } -} \ No newline at end of file diff --git a/app/src/main/java/eu/neilalexander/yggdrasil/GlobalApplication.kt b/app/src/main/java/eu/neilalexander/yggdrasil/GlobalApplication.kt index 0431d12..b2af6e0 100644 --- a/app/src/main/java/eu/neilalexander/yggdrasil/GlobalApplication.kt +++ b/app/src/main/java/eu/neilalexander/yggdrasil/GlobalApplication.kt @@ -1,157 +1,25 @@ package eu.neilalexander.yggdrasil -import android.app.* -import android.content.ComponentName -import android.content.Context -import android.content.Intent -import android.os.Build -import android.service.quicksettings.TileService -import androidx.annotation.RequiresApi -import androidx.core.app.NotificationCompat -import androidx.preference.PreferenceManager +import android.app.Application +import android.content.IntentFilter +import androidx.localbroadcastmanager.content.LocalBroadcastManager -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 { +class GlobalApplication: Application() { + private var state = PacketTunnelState private lateinit var config: ConfigurationProxy - private var currentState: State = State.Disabled - private var updaterConnections: Int = 0 override fun onCreate() { super.onCreate() config = ConfigurationProxy(applicationContext) - val callback = NetworkStateCallback(this) - callback.register() - val receiver = YggStateReceiver(this) - receiver.register(this) - migrateDnsServers(this) + + LocalBroadcastManager.getInstance(this).registerReceiver( + state, IntentFilter(PacketTunnelProvider.RECEIVER_INTENT) + ) } - fun subscribe() { - updaterConnections++ - } + override fun onTerminate() { + super.onTerminate() - fun unsubscribe() { - if (updaterConnections > 0) { - updaterConnections-- - } - } - - fun needUiUpdates(): Boolean { - return updaterConnections > 0 - } - - fun getCurrentState(): State { - return currentState - } - - @RequiresApi(Build.VERSION_CODES.N) - override fun onStateChange(state: State) { - if (state != currentState) { - 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) - val notificationManager: NotificationManager = - this.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager - notificationManager.notify(SERVICE_NOTIFICATION_ID, notification) - } - - currentState = state - } - } -} - -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 - } - 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) - State.Enabled -> context.getText(R.string.tile_enabled) - State.Connected -> context.getText(R.string.tile_connected) - else -> context.getText(R.string.tile_disabled) - } - - return NotificationCompat.Builder(context, MAIN_CHANNEL_ID) - .setShowWhen(false) - .setContentTitle(text) - .setSmallIcon(R.drawable.ic_tile_icon) - .setContentIntent(pendingIntent) - .setPriority(NotificationCompat.PRIORITY_MIN) - .build() -} - -fun createPermissionMissingNotification(context: Context): Notification { - createNotificationChannels(context) - val intent = Intent(context, MainActivity::class.java).apply { - this.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK - } - 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) - .setContentTitle(context.getText(R.string.app_name)) - .setContentText(context.getText(R.string.permission_notification_text)) - .setSmallIcon(R.drawable.ic_tile_icon) - .setContentIntent(pendingIntent) - .setAutoCancel(true) - .setPriority(NotificationCompat.PRIORITY_DEFAULT) - .build() -} - -private fun createNotificationChannels(context: Context) { - // Create the NotificationChannel, but only on API 26+ because - // the NotificationChannel class is new and not in the support library - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - val name = context.getString(R.string.channel_name) - val descriptionText = context.getString(R.string.channel_description) - val importance = NotificationManager.IMPORTANCE_MIN - val channel = NotificationChannel(MAIN_CHANNEL_ID, name, importance).apply { - description = descriptionText - } - // Register the channel with the system - val notificationManager: NotificationManager = - context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager - notificationManager.createNotificationChannel(channel) + LocalBroadcastManager.getInstance(this).unregisterReceiver(state) } } \ No newline at end of file diff --git a/app/src/main/java/eu/neilalexander/yggdrasil/MainActivity.kt b/app/src/main/java/eu/neilalexander/yggdrasil/MainActivity.kt index befdbe3..f9545d8 100644 --- a/app/src/main/java/eu/neilalexander/yggdrasil/MainActivity.kt +++ b/app/src/main/java/eu/neilalexander/yggdrasil/MainActivity.kt @@ -1,51 +1,32 @@ package eu.neilalexander.yggdrasil -import android.app.Activity -import android.app.AlertDialog -import android.content.* +import android.content.BroadcastReceiver +import android.content.Context +import android.content.Intent +import android.content.IntentFilter 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 -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 var state = PacketTunnelState + 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: 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) - intent.action = PacketTunnelProvider.ACTION_START - startService(intent) - } - - private var startVpnActivity = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result -> - if (result.resultCode == Activity.RESULT_OK) { - start() - } - } + private lateinit var peersRow: TableRow + private lateinit var settingsRow: TableRow override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -53,28 +34,27 @@ class MainActivity : AppCompatActivity() { findViewById(R.id.versionValue).text = Mobile.getVersion() - enabledSwitch = findViewById(R.id.enableYggdrasil) + enabledSwitch = findViewById(R.id.enableMulticastSwitch) 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) + VpnService.prepare(this) + enabledSwitch.setOnCheckedChangeListener { _, isChecked -> when (isChecked) { true -> { - val vpnIntent = VpnService.prepare(this) - if (vpnIntent != null) { - startVpnActivity.launch(vpnIntent) + val vpnintent = VpnService.prepare(this) + if (vpnintent != null) { + startActivityForResult(vpnintent, 0) } else { - start() - enabledSwitch.isEnabled = false + onActivityResult(0, RESULT_OK, vpnintent) } } false -> { @@ -83,13 +63,6 @@ class MainActivity : AppCompatActivity() { startService(intent) } } - val preferences = PreferenceManager.getDefaultSharedPreferences(this.baseContext) - preferences.edit(commit = true) { putBoolean(PREF_KEY_ENABLED, isChecked) } - } - - val enableYggdrasilPanel = findViewById(R.id.enableYggdrasilPanel) - enableYggdrasilPanel.setOnClickListener { - enabledSwitch.toggle() } peersRow.isClickable = true @@ -98,140 +71,62 @@ class MainActivity : AppCompatActivity() { startActivity(intent) } - dnsRow.isClickable = true - dnsRow.setOnClickListener { - val intent = Intent(this, DnsActivity::class.java) - startActivity(intent) - } - settingsRow.isClickable = true settingsRow.setOnClickListener { val intent = Intent(this, SettingsActivity::class.java) 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) - clipboard.setPrimaryClip(clip) - Toast.makeText(applicationContext,R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show() - true - } - - subnetLabel.setOnLongClickListener { - val clipboard: ClipboardManager = getSystemService(CLIPBOARD_SERVICE) as ClipboardManager - val clip = ClipData.newPlainText("subnet", subnetLabel.text) - clipboard.setPrimaryClip(clip) - Toast.makeText(applicationContext,R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show() - true - } } override fun onResume() { super.onResume() LocalBroadcastManager.getInstance(this).registerReceiver( - receiver, IntentFilter(STATE_INTENT) + receiver, IntentFilter(PacketTunnelState.RECEIVER_INTENT) ) - val preferences = PreferenceManager.getDefaultSharedPreferences(this.baseContext) - enabledSwitch.isChecked = preferences.getBoolean(PREF_KEY_ENABLED, false) - val serverString = preferences.getString(KEY_DNS_SERVERS, "") - if (serverString!!.isNotEmpty()) { - val servers = serverString.split(",") - dnsLabel.text = when (servers.size) { - 0 -> getString(R.string.dns_no_servers) - 1 -> getString(R.string.dns_one_server) - else -> getString(R.string.dns_many_servers, servers.size) - } - } else { - dnsLabel.text = getString(R.string.dns_no_servers) - } - (application as GlobalApplication).subscribe() - } - - override fun onPause() { - super.onPause() - (application as GlobalApplication).unsubscribe() - LocalBroadcastManager.getInstance(this).unregisterReceiver(receiver) } private val receiver: BroadcastReceiver = object : BroadcastReceiver() { 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 + coordinatesLabel.text = intent.getStringExtra("coords") ?: "[]" + peersLabel.text = when (val count = state.peerCount()) { + 0 -> "No peers" + 1 -> "1 peer" + else -> "$count peers" } } } } } - 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() - } - } + override fun onPause() { + super.onPause() + LocalBroadcastManager.getInstance(this).unregisterReceiver(receiver) } - 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() + override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { + super.onActivityResult(requestCode, resultCode, data) + when (resultCode) { + RESULT_OK -> { + val intent = Intent(this, PacketTunnelProvider::class.java) + intent.action = PacketTunnelProvider.ACTION_START + startService(intent) + } } } -} +} \ No newline at end of file diff --git a/app/src/main/java/eu/neilalexander/yggdrasil/NetworkStateCallback.kt b/app/src/main/java/eu/neilalexander/yggdrasil/NetworkStateCallback.kt deleted file mode 100644 index 7775308..0000000 --- a/app/src/main/java/eu/neilalexander/yggdrasil/NetworkStateCallback.kt +++ /dev/null @@ -1,52 +0,0 @@ -package eu.neilalexander.yggdrasil - -import android.content.Context -import android.content.Intent -import android.net.* -import android.os.Build -import android.util.Log -import androidx.preference.PreferenceManager - - -private const val TAG = "Network" - -class NetworkStateCallback(val context: Context) : ConnectivityManager.NetworkCallback() { - - override fun onAvailable(network: Network) { - super.onAvailable(network) - Log.d(TAG, "onAvailable") - - val preferences = PreferenceManager.getDefaultSharedPreferences(context) - if (preferences.getBoolean(PREF_KEY_ENABLED, false)) { - Thread { - // The message often arrives before the connection is fully established - Thread.sleep(1000) - val intent = Intent(context, PacketTunnelProvider::class.java) - intent.action = PacketTunnelProvider.ACTION_CONNECT - try { - context.startService(intent) - } catch (e: IllegalStateException) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - context.startForegroundService(intent) - } - } - }.start() - } - } - - override fun onLost(network: Network) { - super.onLost(network) - Log.d(TAG, "onLost") - } - - fun register() { - val request = NetworkRequest.Builder() - .addTransportType(NetworkCapabilities.TRANSPORT_WIFI) - .addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR) - .addTransportType(NetworkCapabilities.TRANSPORT_ETHERNET) - .build() - - val manager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager - manager.registerNetworkCallback(request, this) - } -} \ No newline at end of file diff --git a/app/src/main/java/eu/neilalexander/yggdrasil/PacketTunnelProvider.kt b/app/src/main/java/eu/neilalexander/yggdrasil/PacketTunnelProvider.kt index aa84803..3c3dfb8 100644 --- a/app/src/main/java/eu/neilalexander/yggdrasil/PacketTunnelProvider.kt +++ b/app/src/main/java/eu/neilalexander/yggdrasil/PacketTunnelProvider.kt @@ -1,15 +1,14 @@ package eu.neilalexander.yggdrasil import android.content.Intent +import android.net.Uri import android.net.VpnService -import android.net.wifi.WifiManager -import android.os.Build +import android.os.Handler +import android.os.Message import android.os.ParcelFileDescriptor import android.system.OsConstants import android.util.Log import androidx.localbroadcastmanager.content.LocalBroadcastManager -import androidx.preference.PreferenceManager -import eu.neilalexander.yggdrasil.YggStateReceiver.Companion.YGG_STATE_INTENT import mobile.Yggdrasil import org.json.JSONArray import java.io.FileInputStream @@ -18,17 +17,12 @@ import java.util.concurrent.atomic.AtomicBoolean import kotlin.concurrent.thread -private const val TAG = "PacketTunnelProvider" -const val SERVICE_NOTIFICATION_ID = 1000 - -open class PacketTunnelProvider: VpnService() { +class PacketTunnelProvider: VpnService() { companion object { - const val STATE_INTENT = "eu.neilalexander.yggdrasil.PacketTunnelProvider.STATE_MESSAGE" + const val RECEIVER_INTENT = "eu.neilalexander.yggdrasil.PacketTunnelProvider.MESSAGE" const val ACTION_START = "eu.neilalexander.yggdrasil.PacketTunnelProvider.START" const val ACTION_STOP = "eu.neilalexander.yggdrasil.PacketTunnelProvider.STOP" - const val ACTION_TOGGLE = "eu.neilalexander.yggdrasil.PacketTunnelProvider.TOGGLE" - const val ACTION_CONNECT = "eu.neilalexander.yggdrasil.PacketTunnelProvider.CONNECT" } private var yggdrasil = Yggdrasil() @@ -43,7 +37,6 @@ 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() @@ -57,40 +50,17 @@ open class PacketTunnelProvider: VpnService() { override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int { if (intent == null) { - Log.d(TAG, "Intent is null") return START_NOT_STICKY } - val preferences = PreferenceManager.getDefaultSharedPreferences(this.baseContext) - val enabled = preferences.getBoolean(PREF_KEY_ENABLED, false) return when (intent.action ?: ACTION_STOP) { + ACTION_START -> { + start(); START_STICKY + } ACTION_STOP -> { - Log.d(TAG, "Stopping...") stop(); START_NOT_STICKY } - ACTION_CONNECT -> { - Log.d(TAG, "Connecting...") - if (started.get()) { - connect() - } else { - start() - } - START_STICKY - } - ACTION_TOGGLE -> { - Log.d(TAG, "Toggling...") - if (started.get()) { - stop(); START_NOT_STICKY - } else { - start(); START_STICKY - } - } else -> { - if (!enabled) { - Log.d(TAG, "Service is disabled") - return START_NOT_STICKY - } - Log.d(TAG, "Starting...") - start(); START_STICKY + stop(); START_NOT_STICKY } } } @@ -100,57 +70,18 @@ open class PacketTunnelProvider: VpnService() { return } - 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()) + Log.d("PacketTunnelProvider", config.getJSON().toString()) yggdrasil.startJSON(config.getJSONByteArray()) val address = yggdrasil.addressString - val builder = Builder() + var builder = Builder() .addAddress(address, 7) .addRoute("200::", 7) - // We do this to trick the DNS-resolver into thinking that we have "regular" IPv6, - // and therefore we need to resolve AAAA DNS-records. - // See: https://android.googlesource.com/platform/bionic/+/refs/heads/master/libc/dns/net/getaddrinfo.c#1935 - // and: https://android.googlesource.com/platform/bionic/+/refs/heads/master/libc/dns/net/getaddrinfo.c#365 - // If we don't do this the DNS-resolver just doesn't do DNS-requests with record type AAAA, - // and we can't use DNS with Yggdrasil addresses. - .addRoute("2000::", 128) - .allowFamily(OsConstants.AF_INET) .allowBypass() + .allowFamily(OsConstants.AF_INET) .setBlocking(true) .setMtu(yggdrasil.mtu.toInt()) .setSession("Yggdrasil") - // On Android API 29+ apps can opt-in/out to using metered networks. - // If we don't set metered status of VPN it is considered as metered. - // If we set it to false, then it will inherit this status from underlying network. - // See: https://developer.android.com/reference/android/net/VpnService.Builder#setMetered(boolean) - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { - builder.setMetered(false) - } - - val preferences = PreferenceManager.getDefaultSharedPreferences(this.baseContext) - val serverString = preferences.getString(KEY_DNS_SERVERS, "") - if (serverString!!.isNotEmpty()) { - val servers = serverString.split(",") - if (servers.isNotEmpty()) { - servers.forEach { - Log.i(TAG, "Using DNS server $it") - builder.addDnsServer(it) - } - } - } - if (preferences.getBoolean(KEY_ENABLE_CHROME_FIX, false)) { - builder.addRoute("2001:4860:4860::8888", 128) - } parcel = builder.establish() val parcel = parcel @@ -172,8 +103,13 @@ open class PacketTunnelProvider: VpnService() { updater() } - var intent = Intent(YGG_STATE_INTENT) - intent.putExtra("state", STATE_ENABLED) + val intent = Intent(RECEIVER_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", JSONArray(yggdrasil.peersJSON).length()) LocalBroadcastManager.getInstance(this).sendBroadcast(intent) } @@ -210,105 +146,50 @@ open class PacketTunnelProvider: VpnService() { updateThread = null } - var intent = Intent(STATE_INTENT) + val intent = Intent(RECEIVER_INTENT) intent.putExtra("type", "state") intent.putExtra("started", false) LocalBroadcastManager.getInstance(this).sendBroadcast(intent) - intent = Intent(YGG_STATE_INTENT) - intent.putExtra("state", STATE_DISABLED) - LocalBroadcastManager.getInstance(this).sendBroadcast(intent) - - stopForeground(true) stopSelf() - multicastLock?.release() - } - - private fun connect() { - if (!started.get()) { - return - } - yggdrasil.retryPeersNow() } 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("pubkey", yggdrasil.publicKeyString) - intent.putExtra("peers", yggdrasil.peersJSON) - LocalBroadcastManager.getInstance(this).sendBroadcast(intent) - } - val curTime = System.currentTimeMillis() - if (lastStateUpdate + 10000 < curTime) { - val intent = Intent(YGG_STATE_INTENT) - var state = STATE_ENABLED - 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 - } - intent.putExtra("state", state) - LocalBroadcastManager.getInstance(this).sendBroadcast(intent) - lastStateUpdate = curTime - } - + val intent = Intent(RECEIVER_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) + intent.putExtra("dht", yggdrasil.dhtjson) + LocalBroadcastManager.getInstance(this).sendBroadcast(intent) if (Thread.currentThread().isInterrupted) { break@updates } - if (sleep()) return + try { + Thread.sleep(2000) + } catch (e: java.lang.InterruptedException) { + return + } } } - private fun sleep(): Boolean { - try { - Thread.sleep(1000) - } catch (e: InterruptedException) { - return true - } - return false - } - private fun writer() { - val buf = ByteArray(65535) writes@ while (started.get()) { val writerStream = writerStream val writerThread = writerThread if (writerThread == null || writerStream == null) { - Log.i(TAG, "Write thread or stream is null") break@writes } if (Thread.currentThread().isInterrupted || !writerStream.fd.valid()) { - Log.i(TAG, "Write thread interrupted or file descriptor is invalid") break@writes } try { - val len = yggdrasil.recvBuffer(buf) - if (len > 0) { - writerStream.write(buf, 0, len.toInt()) - } + val b = yggdrasil.recv() + writerStream.write(b) } catch (e: Exception) { - Log.i(TAG, "Error in write: $e") - if (e.toString().contains("ENOBUFS")) { - //TODO Check this by some error code - //More info about this: https://github.com/AdguardTeam/AdguardForAndroid/issues/724 - continue - } break@writes } } @@ -319,23 +200,20 @@ open class PacketTunnelProvider: VpnService() { } private fun reader() { - val b = ByteArray(65535) + var b = ByteArray(65535) reads@ while (started.get()) { val readerStream = readerStream val readerThread = readerThread if (readerThread == null || readerStream == null) { - Log.i(TAG, "Read thread or stream is null") break@reads } if (Thread.currentThread().isInterrupted ||!readerStream.fd.valid()) { - Log.i(TAG, "Read thread interrupted or file descriptor is invalid") break@reads } try { val n = readerStream.read(b) - yggdrasil.sendBuffer(b, n.toLong()) + yggdrasil.send(b.sliceArray(0..n)) } catch (e: Exception) { - Log.i(TAG, "Error in sendBuffer: $e") break@reads } } @@ -344,4 +222,4 @@ open class PacketTunnelProvider: VpnService() { readerStream = null } } -} +} \ No newline at end of file diff --git a/app/src/main/java/eu/neilalexander/yggdrasil/PacketTunnelState.kt b/app/src/main/java/eu/neilalexander/yggdrasil/PacketTunnelState.kt new file mode 100644 index 0000000..5d05231 --- /dev/null +++ b/app/src/main/java/eu/neilalexander/yggdrasil/PacketTunnelState.kt @@ -0,0 +1,53 @@ +package eu.neilalexander.yggdrasil + +import android.content.BroadcastReceiver +import android.content.Context +import android.content.Intent +import androidx.localbroadcastmanager.content.LocalBroadcastManager +import org.json.JSONArray + +object PacketTunnelState: BroadcastReceiver() { + var dhtState: JSONArray? = null + private set + + var peersState: JSONArray? = null + private set + + const val RECEIVER_INTENT = "eu.neilalexander.yggdrasil.PacketTunnelState.MESSAGE" + + fun peerCount(): Int { + if (peersState == null) { + return 0 + } + return peersState!!.length() + } + + fun dhtCount(): Int { + if (dhtState == null) { + return 0 + } + return dhtState!!.length() + } + + override fun onReceive(context: Context?, intent: Intent) { + when (intent.getStringExtra("type")) { + "state" -> { + var dht = intent.getStringExtra("dht") + var peers = intent.getStringExtra("peers") + + if (dht == null || dht == "null") { + dht = "[]" + } + if (peers == null || peers == "null") { + peers = "[]" + } + + peersState = JSONArray(peers) + dhtState = JSONArray(dht) + + intent.action = RECEIVER_INTENT + LocalBroadcastManager.getInstance(context!!).sendBroadcast(intent) + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/eu/neilalexander/yggdrasil/PeersActivity.kt b/app/src/main/java/eu/neilalexander/yggdrasil/PeersActivity.kt index 55e2817..5cbccb1 100644 --- a/app/src/main/java/eu/neilalexander/yggdrasil/PeersActivity.kt +++ b/app/src/main/java/eu/neilalexander/yggdrasil/PeersActivity.kt @@ -1,43 +1,29 @@ package eu.neilalexander.yggdrasil import android.app.AlertDialog -import android.content.BroadcastReceiver import android.content.Context -import android.content.Intent -import android.content.IntentFilter +import android.content.DialogInterface +import androidx.appcompat.app.AppCompatActivity import android.os.Bundle -import android.text.method.LinkMovementMethod +import android.text.Layout +import android.util.AttributeSet 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 androidx.core.widget.doOnTextChanged -import androidx.localbroadcastmanager.content.LocalBroadcastManager +import android.widget.* import com.google.android.material.textfield.TextInputEditText import org.json.JSONArray -import org.json.JSONObject - class PeersActivity : AppCompatActivity() { + private var state = PacketTunnelState private lateinit var config: ConfigurationProxy private lateinit var inflater: LayoutInflater - private lateinit var peers: Array private lateinit var connectedTableLayout: TableLayout private lateinit var connectedTableLabel: TextView private lateinit var configuredTableLayout: TableLayout private lateinit var configuredTableLabel: TextView - private lateinit var multicastListenSwitch: Switch - private lateinit var multicastBeaconSwitch: Switch - private lateinit var passwordEdit: EditText + private lateinit var multicastSwitch: Switch private lateinit var addPeerButton: ImageButton override fun onCreate(savedInstanceState: Bundle?) { @@ -46,7 +32,6 @@ class PeersActivity : AppCompatActivity() { config = ConfigurationProxy(applicationContext) inflater = LayoutInflater.from(this) - peers = emptyArray() connectedTableLayout = findViewById(R.id.connectedPeersTableLayout) connectedTableLabel = findViewById(R.id.connectedPeersLabel) @@ -54,68 +39,45 @@ 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 - } - multicastBeaconSwitch = findViewById(R.id.enableMulticastBeacon) - multicastBeaconSwitch.setOnCheckedChangeListener { button, _ -> - config.multicastBeacon = button.isChecked - } - multicastListenSwitch.isChecked = config.multicastListen - multicastBeaconSwitch.isChecked = config.multicastBeacon - - val multicastBeaconPanel = findViewById(R.id.enableMulticastBeaconPanel) - multicastBeaconPanel.setOnClickListener { - multicastBeaconSwitch.toggle() - } - val multicastListenPanel = findViewById(R.id.enableMulticastListenPanel) - 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 + multicastSwitch = findViewById(R.id.enableMulticastSwitch) + multicastSwitch.setOnCheckedChangeListener { button, _ -> + when (button.isChecked) { + true -> { + config.updateJSON { json -> + json.put("MulticastInterfaces", JSONArray("[\"lo\", \".*\"]")) + } + } + false -> { + config.updateJSON { json -> + json.put("MulticastInterfaces", JSONArray("[\"lo\"]")) + } } - } else { - false } } + var multicastInterfaceFound = false + val multicastInterfaces = config.getJSON().getJSONArray("MulticastInterfaces") + (0 until multicastInterfaces.length()).forEach { + if (multicastInterfaces[it] == ".*") { + multicastInterfaceFound = true + } + } + multicastSwitch.isChecked = multicastInterfaceFound 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.YggdrasilDialogs)) - builder.setTitle(getString(R.string.peers_add_peer)) + var view = inflater.inflate(R.layout.dialog_addpeer, null) + var input = view.findViewById(R.id.addPeerInput) + val builder: AlertDialog.Builder = AlertDialog.Builder(this) + builder.setTitle("Add Configured Peer") builder.setView(view) - builder.setPositiveButton(getString(R.string.peers_add)) { dialog, _ -> + builder.setPositiveButton("Add") { dialog, _ -> config.updateJSON { json -> - json.getJSONArray("Peers").put(input.text.toString().trim()) + json.getJSONArray("Peers").put(input.text) } dialog.dismiss() updateConfiguredPeers() } - builder.setNegativeButton(getString(R.string.cancel)) { dialog, _ -> + builder.setNegativeButton("Cancel") { dialog, _ -> dialog.cancel() } builder.show() @@ -124,51 +86,41 @@ class PeersActivity : AppCompatActivity() { override fun onResume() { super.onResume() - LocalBroadcastManager.getInstance(this).registerReceiver( - receiver, IntentFilter(PacketTunnelProvider.STATE_INTENT) - ) - (application as GlobalApplication).subscribe() updateConfiguredPeers() updateConnectedPeers() } - override fun onPause() { - super.onPause() - (application as GlobalApplication).unsubscribe() - LocalBroadcastManager.getInstance(this).unregisterReceiver(receiver) - } - private fun updateConfiguredPeers() { val peers = config.getJSON().getJSONArray("Peers") when (peers.length()) { 0 -> { configuredTableLayout.visibility = View.GONE - configuredTableLabel.text = getString(R.string.peers_no_configured_title) + configuredTableLabel.text = "No peers currently configured" } else -> { configuredTableLayout.visibility = View.VISIBLE - configuredTableLabel.text = getString(R.string.peers_configured_title) + configuredTableLabel.text = "Configured Peers" configuredTableLayout.removeAllViewsInLayout() for (i in 0 until peers.length()) { val peer = peers[i].toString() - val view = inflater.inflate(R.layout.peers_configured, null) + var view = inflater.inflate(R.layout.peers_configured, null) view.findViewById(R.id.addressValue).text = peer 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)) - builder.setTitle(getString(R.string.peers_remove_title, peer)) - builder.setPositiveButton(getString(R.string.peers_remove)) { dialog, _ -> + val builder: AlertDialog.Builder = AlertDialog.Builder(this) + builder.setTitle("Remove ${peer}?") + builder.setPositiveButton("Remove") { dialog, _ -> config.updateJSON { json -> json.getJSONArray("Peers").remove(button.tag as Int) } dialog.dismiss() updateConfiguredPeers() } - builder.setNegativeButton(getString(R.string.cancel)) { dialog, _ -> + builder.setNegativeButton("Cancel") { dialog, _ -> dialog.cancel() } builder.show() @@ -180,52 +132,25 @@ class PeersActivity : AppCompatActivity() { } private fun updateConnectedPeers() { - when (peers.size) { + val peers = state.peersState ?: JSONArray("[]") + + when (peers.length()) { 0 -> { connectedTableLayout.visibility = View.GONE - connectedTableLabel.text = getString(R.string.peers_no_connected_title) + connectedTableLabel.text = "No peers currently connected" } else -> { - var connected = false + connectedTableLayout.visibility = View.VISIBLE + connectedTableLabel.text = "Connected Peers" + connectedTableLayout.removeAllViewsInLayout() - for (peer in peers) { - val view = inflater.inflate(R.layout.peers_connected, null) + for (i in 0 until peers.length()) { + val peer = peers.getJSONObject(i) + var 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) - } - } - } - } - - private val receiver: BroadcastReceiver = object : BroadcastReceiver() { - override fun onReceive(context: Context?, intent: Intent) { - when (intent.getStringExtra("type")) { - "state" -> { - if (intent.hasExtra("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) - } - array.sortWith(compareBy { it.getString("IP") }) - peers = array - - updateConnectedPeers() - } + view.findViewById(R.id.addressLabel).text = ip + view.findViewById(R.id.detailsLabel).text = peer.getString("Remote") + 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..5c3382f 100644 --- a/app/src/main/java/eu/neilalexander/yggdrasil/SettingsActivity.kt +++ b/app/src/main/java/eu/neilalexander/yggdrasil/SettingsActivity.kt @@ -1,162 +1,11 @@ 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() { - private lateinit var config: ConfigurationProxy - private lateinit var inflater: LayoutInflater - - 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) setContentView(R.layout.activity_settings) - - config = ConfigurationProxy(applicationContext) - inflater = LayoutInflater.from(this) - - deviceNameEntry = findViewById(R.id.deviceNameEntry) - publicKeyLabel = findViewById(R.id.publicKeyLabel) - resetConfigurationRow = findViewById(R.id.resetConfigurationRow) - - deviceNameEntry.doOnTextChanged { text, _, _, _ -> - config.updateJSON { cfg -> - val nodeInfo = cfg.optJSONObject("NodeInfo") - if (nodeInfo == null) { - cfg.put("NodeInfo", JSONObject("{}")) - } - cfg.getJSONObject("NodeInfo").put("name", text) - } - } - - 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.YggdrasilDialogs)) - builder.setTitle(getString(R.string.settings_warning_title)) - builder.setView(view) - builder.setPositiveButton(getString(R.string.settings_reset)) { dialog, _ -> - config.resetJSON() - updateView() - dialog.dismiss() - } - builder.setNegativeButton(getString(R.string.cancel)) { dialog, _ -> - dialog.cancel() - } - builder.show() - } - - 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 privateKey = view.findViewById(R.id.private_key) - builder.setTitle(getString(R.string.set_keys)) - builder.setView(view) - builder.setPositiveButton(getString(R.string.save)) { dialog, _ -> - config.setKeys(privateKey.text.toString()) - updateView() - dialog.dismiss() - } - builder.setNegativeButton(getString(R.string.cancel)) { dialog, _ -> - dialog.cancel() - } - builder.show() - } - - publicKeyLabel.setOnLongClickListener { - val clipboard: ClipboardManager = getSystemService(CLIPBOARD_SERVICE) as ClipboardManager - val clip = ClipData.newPlainText("public key", publicKeyLabel.text) - clipboard.setPrimaryClip(clip) - Toast.makeText(applicationContext,R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show() - true - } - - updateView() } - - private fun updateView() { - 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) - } - - 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") - } - } - } - } -} +} \ No newline at end of file diff --git a/app/src/main/java/eu/neilalexander/yggdrasil/TileServiceActivity.kt b/app/src/main/java/eu/neilalexander/yggdrasil/TileServiceActivity.kt deleted file mode 100644 index a4f71cc..0000000 --- a/app/src/main/java/eu/neilalexander/yggdrasil/TileServiceActivity.kt +++ /dev/null @@ -1,17 +0,0 @@ -package eu.neilalexander.yggdrasil - -import android.app.Activity -import android.content.Intent -import android.os.Bundle - -class TileServiceActivity : Activity() { - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - - // Just starting MainActivity - val intent = Intent(this, MainActivity::class.java) - startService(intent) - finish() - } -} \ No newline at end of file diff --git a/app/src/main/java/eu/neilalexander/yggdrasil/YggStateReceiver.kt b/app/src/main/java/eu/neilalexander/yggdrasil/YggStateReceiver.kt deleted file mode 100644 index f6745f8..0000000 --- a/app/src/main/java/eu/neilalexander/yggdrasil/YggStateReceiver.kt +++ /dev/null @@ -1,53 +0,0 @@ -package eu.neilalexander.yggdrasil - -import android.content.BroadcastReceiver -import android.content.Context -import android.content.Intent -import android.content.IntentFilter -import androidx.localbroadcastmanager.content.LocalBroadcastManager - -const val STATE_ENABLED = "enabled" -const val STATE_DISABLED = "disabled" -const val STATE_CONNECTED = "connected" -const val STATE_RECONNECTING = "reconnecting" - -class YggStateReceiver(var receiver: StateReceiver): BroadcastReceiver() { - - companion object { - const val YGG_STATE_INTENT = "eu.neilalexander.yggdrasil.YggStateReceiver.STATE" - } - - override fun onReceive(context: Context?, intent: Intent?) { - if (context == null) return - - val state = when (intent?.getStringExtra("state")) { - STATE_ENABLED -> State.Enabled - STATE_DISABLED -> State.Disabled - STATE_CONNECTED -> State.Connected - STATE_RECONNECTING -> State.Reconnecting - else -> State.Unknown - } - receiver.onStateChange(state) - } - - fun register(context: Context) { - LocalBroadcastManager.getInstance(context).registerReceiver( - this, IntentFilter(YGG_STATE_INTENT) - ) - } - - fun unregister(context: Context) { - LocalBroadcastManager.getInstance(context).unregisterReceiver(this) - } - - interface StateReceiver { - fun onStateChange(state: State) - } -} - -/** - * A class-supporter with an Yggdrasil state - */ -enum class State { - Unknown, Disabled, Enabled, Connected, Reconnecting; -} \ No newline at end of file diff --git a/app/src/main/java/eu/neilalexander/yggdrasil/YggTileService.kt b/app/src/main/java/eu/neilalexander/yggdrasil/YggTileService.kt deleted file mode 100644 index 4725bd4..0000000 --- a/app/src/main/java/eu/neilalexander/yggdrasil/YggTileService.kt +++ /dev/null @@ -1,113 +0,0 @@ -package eu.neilalexander.yggdrasil - -import android.content.Intent -import android.graphics.drawable.Icon -import android.os.Build -import android.os.IBinder -import android.service.quicksettings.Tile -import android.service.quicksettings.TileService -import android.util.Log -import androidx.annotation.RequiresApi -import androidx.core.content.edit -import androidx.preference.PreferenceManager - -private const val TAG = "TileService" - -@RequiresApi(Build.VERSION_CODES.N) -class YggTileService: TileService(), YggStateReceiver.StateReceiver { - - private lateinit var receiver: YggStateReceiver - - override fun onCreate() { - super.onCreate() - receiver = YggStateReceiver(this) - } - - /** - * We need to override the method onBind to avoid crashes that were detected on Android 8 - * - * The possible reason of crashes is described here: - * https://github.com/aosp-mirror/platform_frameworks_base/commit/ee68fd889c2dfcd895b8e73fc39d7b97826dc3d8 - */ - override fun onBind(intent: Intent?): IBinder? { - return try { - super.onBind(intent) - } catch (th: Throwable) { - null - } - } - - override fun onTileAdded() { - super.onTileAdded() - updateTileState((application as GlobalApplication).getCurrentState()) - } - - override fun onTileRemoved() { - super.onTileRemoved() - updateTileState((application as GlobalApplication).getCurrentState()) - } - - override fun onStartListening() { - super.onStartListening() - receiver.register(this) - updateTileState((application as GlobalApplication).getCurrentState()) - } - - override fun onStopListening() { - super.onStopListening() - receiver.unregister(this) - } - - override fun onDestroy() { - super.onDestroy() - receiver.unregister(this) - } - - override fun onClick() { - super.onClick() - // Saving new state - val preferences = PreferenceManager.getDefaultSharedPreferences(this.baseContext) - val enabled = preferences.getBoolean(PREF_KEY_ENABLED, false) - preferences.edit(commit = true) { putBoolean(PREF_KEY_ENABLED, !enabled) } - // Starting or stopping VPN service - val intent = Intent(this, PacketTunnelProvider::class.java) - intent.action = PacketTunnelProvider.ACTION_TOGGLE - startService(intent) - } - - private fun updateTileState(state: State) { - val tile = qsTile ?: return - val oldState = tile.state - val preferences = PreferenceManager.getDefaultSharedPreferences(this.baseContext) - val enabled = preferences.getBoolean(PREF_KEY_ENABLED, false) - tile.state = when (enabled) { - false -> Tile.STATE_INACTIVE - true -> Tile.STATE_ACTIVE - } - var changed = oldState != tile.state - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { - val oldText = tile.subtitle - tile.subtitle = when (state) { - State.Enabled -> getText(R.string.tile_enabled) - State.Connected -> getText(R.string.tile_connected) - else -> getText(R.string.tile_disabled) - } - changed = changed || (oldText != tile.subtitle) - } - - // Update tile if changed state - if (changed) { - Log.i(TAG, "Updating tile, old state: $oldState, new state: ${tile.state}") - /* - Force set the icon in the tile, because there is a problem on icon tint in the Android Oreo. - Issue: https://github.com/AdguardTeam/AdguardForAndroid/issues/1996 - */ - tile.icon = Icon.createWithResource(applicationContext, R.drawable.ic_tile_icon) - tile.updateTile() - } - } - - override fun onStateChange(state: State) { - updateTileState(state) - } -} \ No newline at end of file diff --git a/app/src/main/res/drawable-hdpi/ic_launcher.png b/app/src/main/res/drawable-hdpi/ic_launcher.png deleted file mode 100644 index 8ccaf85..0000000 Binary files a/app/src/main/res/drawable-hdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_launcher_round.png b/app/src/main/res/drawable-hdpi/ic_launcher_round.png deleted file mode 100644 index e164e1f..0000000 Binary files a/app/src/main/res/drawable-hdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_launcher.png b/app/src/main/res/drawable-mdpi/ic_launcher.png deleted file mode 100644 index df8fde0..0000000 Binary files a/app/src/main/res/drawable-mdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_launcher_round.png b/app/src/main/res/drawable-mdpi/ic_launcher_round.png deleted file mode 100644 index 17bb387..0000000 Binary files a/app/src/main/res/drawable-mdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable-xhdpi/ic_launcher.png b/app/src/main/res/drawable-xhdpi/ic_launcher.png deleted file mode 100644 index 527672f..0000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_launcher_round.png b/app/src/main/res/drawable-xhdpi/ic_launcher_round.png deleted file mode 100644 index de7193a..0000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxhdpi/ic_launcher.png deleted file mode 100644 index 0abfb9b..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_launcher_round.png b/app/src/main/res/drawable-xxhdpi/ic_launcher_round.png deleted file mode 100644 index b9e1e59..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxxhdpi/ic_launcher.png deleted file mode 100644 index 124727e..0000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_launcher_round.png b/app/src/main/res/drawable-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index 5e9f4b2..0000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..07d5da9 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_tile_icon.xml b/app/src/main/res/drawable/ic_tile_icon.xml deleted file mode 100644 index fae8232..0000000 --- a/app/src/main/res/drawable/ic_tile_icon.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - diff --git a/app/src/main/res/layout/activity_dns.xml b/app/src/main/res/layout/activity_dns.xml deleted file mode 100644 index d0061e8..0000000 --- a/app/src/main/res/layout/activity_dns.xml +++ /dev/null @@ -1,241 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index e85a344..bfc0ff4 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -22,382 +22,411 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8pt" - android:text="@string/app_name" + android:text="Yggdrasil" android:textColor="?attr/textDefault" android:textSize="24sp" android:textStyle="bold" /> - + android:layout_height="wrap_content" + android:layout_marginStart="16pt" + android:layout_marginLeft="16pt" + android:layout_marginTop="8pt" + android:layout_marginEnd="8pt" + android:layout_marginRight="8pt" + android:layout_marginBottom="2pt" + android:alpha="0.7" + android:text="Status" + android:textAllCaps="true" + android:textAppearance="@style/TextAppearance.AppCompat.Small" + android:textSize="12sp" /> - + + + android:layout_marginStart="4pt" + android:layout_marginLeft="4pt" + android:layout_marginTop="6pt" + android:layout_marginEnd="4pt" + android:layout_marginRight="4pt" + android:layout_marginBottom="6pt"> - - - - - - - - - - - - - - - - - - - - + android:text="Enable Yggdrasil" + android:textColor="?attr/textDefault" + android:textSize="14sp" /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="2" /> + + + + + + + android:text="Not enabled" + android:textSize="14sp" + android:textStyle="bold" /> - + + + + + + + + + + + + + android:layout_weight="0" + android:text="IP" + android:textColor="?attr/textDefault" /> - + + - + - - + - + - + - + - + - + + + + + + + + + + + + + + + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="2" /> + android:alpha="0.5" + android:text="No peers" + android:textAlignment="textEnd" /> - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + android:text="Settings" + android:textColor="?attr/textDefault" /> - - + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_peers.xml b/app/src/main/res/layout/activity_peers.xml index 3b77480..ea7983f 100644 --- a/app/src/main/res/layout/activity_peers.xml +++ b/app/src/main/res/layout/activity_peers.xml @@ -27,7 +27,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8pt" - android:text="@string/main_peers" + android:text="Peers" android:textColor="?attr/textDefault" android:textSize="24sp" android:textStyle="bold" /> @@ -47,243 +47,171 @@ app:srcCompat="@drawable/ic_baseline_add_circle_24" /> - + android:layout_height="wrap_content" + android:layout_marginStart="16pt" + android:layout_marginLeft="16pt" + android:layout_marginTop="8pt" + android:layout_marginEnd="8pt" + android:layout_marginRight="8pt" + android:layout_marginBottom="2pt" + android:alpha="0.7" + android:text="Connected Peers" + android:textAllCaps="true" + android:textAppearance="@style/TextAppearance.AppCompat.Small" + android:textSize="12sp" /> - + + + + + + + + + + + + + + + android:layout_height="match_parent" + android:clickable="true" + android:paddingStart="4pt" + android:paddingTop="2pt" + android:paddingEnd="4pt" + android:paddingBottom="2pt"> - - - - - - - - - - + android:text="Search for multicast peers" + android:textColor="?attr/textDefault" /> - - + android:layout_weight="2" /> - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 65c7378..f27f5e5 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -1,291 +1,9 @@ - + tools:context=".SettingsActivity"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_add_dns_server.xml b/app/src/main/res/layout/dialog_add_dns_server.xml deleted file mode 100644 index f779d30..0000000 --- a/app/src/main/res/layout/dialog_add_dns_server.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_addpeer.xml b/app/src/main/res/layout/dialog_addpeer.xml index d75a471..c627c5c 100644 --- a/app/src/main/res/layout/dialog_addpeer.xml +++ b/app/src/main/res/layout/dialog_addpeer.xml @@ -16,7 +16,7 @@ android:id="@+id/textView2" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/add_peer_help" /> + android:text="Enter the full URI of the peer to add. Yggdrasil will automatically connect to this peer when started." /> diff --git a/app/src/main/res/layout/dialog_resetconfig.xml b/app/src/main/res/layout/dialog_resetconfig.xml deleted file mode 100644 index 92e00b9..0000000 --- a/app/src/main/res/layout/dialog_resetconfig.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_set_keys.xml b/app/src/main/res/layout/dialog_set_keys.xml deleted file mode 100644 index d534492..0000000 --- a/app/src/main/res/layout/dialog_set_keys.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/dns_server_usable.xml b/app/src/main/res/layout/dns_server_usable.xml deleted file mode 100644 index 9ca6628..0000000 --- a/app/src/main/res/layout/dns_server_usable.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/peers_configured.xml b/app/src/main/res/layout/peers_configured.xml index 1c92236..e9aff3c 100644 --- a/app/src/main/res/layout/peers_configured.xml +++ b/app/src/main/res/layout/peers_configured.xml @@ -1,40 +1,29 @@ - + android:layout_height="wrap_content" + android:padding="4pt"> + android:layout_gravity="center_vertical" + android:text="TextView" + android:textColor="?attr/textDefault" /> + + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/peers_connected.xml b/app/src/main/res/layout/peers_connected.xml index 5981d39..325d3ac 100644 --- a/app/src/main/res/layout/peers_connected.xml +++ b/app/src/main/res/layout/peers_connected.xml @@ -16,8 +16,6 @@ android:id="@+id/addressLabel" android:layout_width="match_parent" android:layout_height="wrap_content" - android:ellipsize="end" - android:singleLine="true" android:text="(unknown)" android:textColor="?attr/textDefault" /> @@ -26,8 +24,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:alpha="0.5" - android:ellipsize="end" - android:singleLine="true" android:text="TCP peer on unknown" android:textColor="?attr/textDefault" android:textSize="12sp" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..a571e60 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..61da551 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..c41dd28 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..db5080a Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..6dba46d Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..da31a87 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..15ac681 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..b216f2d Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..f25a419 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..e96783c Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml deleted file mode 100644 index f0c0310..0000000 --- a/app/src/main/res/values-ru/strings.xml +++ /dev/null @@ -1,89 +0,0 @@ - - Yggdrasil - Скопировано в буфер - Эти серверы DNS будут использоваться при включении Yggdrasil. Заметьте, что все запросы в DNS, даже о доменах не в Yggdrasil, будут отправляться на эти серверы. - Yggdrasil не будет переопределять серверы DNS при старте. Все запросы DNS будут разрешаться серверами по умолчанию. - Эти серверы DNS предоставляются членами коммюнити. Нажмите кнопку + чтобы добавить их в список выше. Долгое нажатие чтобы посмотреть информацию. - Серверы не настроены - Настроенные серверы - Этот сервер поддерживает работу с обычными доменами ICANN, системой ALFIS, доменами OpenNIC.\n\nКроме того, он блокирует рекламу, системы слежения и зловредные домены.\n\nАдминистратор сервера Revertron. - О сервере - Ок - Отмена - Убрать - Добавить - Добавить сервер DNS - DNS - Рекомендуемые серверы - Обхитрить браузеры на основе Chrome - Если у вас нет обычного подключения по IPv6, эта опция должна заставить браузеры на движке Chrome всё равно запрашивать записи IPv6. - DNS трюки - Нет серверов - 1 сервер - %d сервера/серверов - Убрать %s? - Этот сервер уже добавлен. - Включено (Нет подключения) - Подключено - Выключено - Нет пиров - 1 пир - %d пира/пиров - Внимание - Не настроено ни одного пира. Если не будет обнаруживаемых пиров в этой сети, то вам надо будет добавить пир вручную, чтобы подключение к Yggdrasil работало как положено. - Добавить пира в конфиг - Добавить - Убрать %s? - Убрать - Пиры не добавлены - Добавленные пиры - Нет подключенных пиров - Подключенные пиры - Внимание - Конфигурация - Сброс - Состояние - Включить Yggdrasil - Адрес и сеть - Н/Д - Адрес - Подсеть - Конфигурация - Пиры - Серверы DNS - Настройки - Версия - Не известно - Вы должны перезапустить Yggdrasil после изменения пиров, серверов DNS или настроек, чтобы изменения вступили в силу. - Подключения пиров - Находимый через multicast - Искать пиров через multicast - Yggdrasil будет пытаться подключаться к этим пирам автоматически. Если вы добавите несколько пиров, ваше устройство может быть использовано для переноса данных между другими узлами сети. Чтобы этого избежать настройте только один пир. - Вы можете найти публичные пиры по этой ссылке. - Пиры могут быть найдены с помощью Multicast если они находятся в той же Wi-Fi сети, либо через USB. У них должен быть одинаковый пароль. Трафик в мобильной сети может быть платным. Вы можете отключить мобильные данные в настройках устройства. - Пароль - Об узле - Название устройства - Нажмите для изменения - Эта информация публична и может появиться на картах сети. - Публичный ключ - Ваш публичный ключ идентифицирует вас в сети. Его распространение безопасно. - Сбросить ключи (и адрес IPv6) - Сбросить настройки - Сброс создаст полностью новые настройки. Это изменит ваш публичный ключ и адрес IP. - Выключено - Включено (Нет подключения) - Подключено - Амстердам, Нидерланды - Франкфурт, Германия - Братислава, Словакия - Буффало, США - Сервис 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 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..c2e6bce 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,89 +1,3 @@ Yggdrasil - Copied to clipboard - Use these DNS servers while Yggdrasil is running. Note that all DNS requests, including for non-Yggdrasil internet hostnames, will be sent to these servers. - Yggdrasil will not configure any DNS servers when the service starts. All DNS requests will be resolved by the default resolver. - These DNS servers are provided by community members. Click the + button to add them to the list above. Long-tap to see more info. - No servers configured - Configured servers - The server supports resolving regular ICANN domains, ALFIS domains, OpenNIC domains.\n\nAlso, it blocks ads, analytics and malware websites.\n\nThe server is run by Revertron. - Server info - OK - Cancel - Remove - Add - Add DNS server - DNS - Usable servers - Fix Chrome-based browsers - If you do not have IPv6 internet connectivity, this option should help Chrome-based browsers to resolve Yggdrasil domain names correctly. - DNS fixes - No servers - 1 server - %d servers - Remove %s? - This server is already added. - Enabled (No connectivity) - Connected - Not enabled - 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? - Remove - No peers currently configured - Configured Peers - No peers currently connected - Connected Peers - Warning - Config - Reset - Status - Enable Yggdrasil - Network info - N/A - IP - Subnet - Configuration - Peers - DNS servers - Settings - Version - Unknown - You must re-enable Yggdrasil after modifying Peers, DNS servers or Settings to make any changes effective. - Peer Connectivity - 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. - 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 - Information entered here is public and may be shown on network maps. - Public Key - Your public key forms your identity on the network. It is safe to be shared. - Regenerate keys (and IPv6-address) - Reset configuration - Resetting will overwrite with newly generated configuration. Your public keys and IP address on the network will change. - Disabled - Enabled (No connectivity) - Connected - Amsterdam, NL - 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. - 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/styles.xml b/app/src/main/res/values/styles.xml deleted file mode 100644 index a5123f8..0000000 --- a/app/src/main/res/values/styles.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - \ 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..b090095 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.9.20' + ext.kotlin_version = "1.5.0" repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.1.4' + classpath "com.android.tools.build:gradle:4.2.1" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong @@ -18,6 +18,7 @@ allprojects { repositories { google() mavenCentral() + jcenter() // Warning: this repository is going to shut down soon } } diff --git a/fastlane/metadata/android/en-US/changelogs/11.txt b/fastlane/metadata/android/en-US/changelogs/11.txt deleted file mode 100644 index eeabdf8..0000000 --- a/fastlane/metadata/android/en-US/changelogs/11.txt +++ /dev/null @@ -1,4 +0,0 @@ -* Added quick-settings tile for fast on/off switching -* Added notification with the connection status (it is needed for quick-settings tile) -* Fixed small UI bugs -* Updated Yggdrasil library to 0.4.7 \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/changelogs/15.txt b/fastlane/metadata/android/en-US/changelogs/15.txt deleted file mode 100644 index 859f418..0000000 --- a/fastlane/metadata/android/en-US/changelogs/15.txt +++ /dev/null @@ -1,3 +0,0 @@ -* 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 deleted file mode 100644 index 2bf6005..0000000 --- a/fastlane/metadata/android/en-US/changelogs/16.txt +++ /dev/null @@ -1 +0,0 @@ -* 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 deleted file mode 100644 index 6e775f8..0000000 --- a/fastlane/metadata/android/en-US/changelogs/17.txt +++ /dev/null @@ -1 +0,0 @@ -* 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 deleted file mode 100644 index 7c13f7b..0000000 --- a/fastlane/metadata/android/en-US/changelogs/18.txt +++ /dev/null @@ -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 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/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt deleted file mode 100644 index 13f6a6a..0000000 --- a/fastlane/metadata/android/en-US/full_description.txt +++ /dev/null @@ -1,9 +0,0 @@ -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. \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/images/featureGraphic.png b/fastlane/metadata/android/en-US/images/featureGraphic.png deleted file mode 100644 index 322635d..0000000 Binary files a/fastlane/metadata/android/en-US/images/featureGraphic.png and /dev/null differ 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/en-US/images/phoneScreenshots/1.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png deleted file mode 100644 index fbc6f8b..0000000 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png and /dev/null differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png deleted file mode 100644 index 07e366e..0000000 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png and /dev/null differ diff --git a/fastlane/metadata/android/en-US/short_description.txt b/fastlane/metadata/android/en-US/short_description.txt deleted file mode 100644 index f580d9c..0000000 --- a/fastlane/metadata/android/en-US/short_description.txt +++ /dev/null @@ -1 +0,0 @@ -Official implementation for connecting to the Yggdrasil Network from Android \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/title.txt b/fastlane/metadata/android/en-US/title.txt deleted file mode 100644 index f8c32ce..0000000 --- a/fastlane/metadata/android/en-US/title.txt +++ /dev/null @@ -1 +0,0 @@ -Yggdrasil \ No newline at end of file diff --git a/fastlane/metadata/android/ru/changelogs/11.txt b/fastlane/metadata/android/ru/changelogs/11.txt deleted file mode 100644 index 54138a2..0000000 --- a/fastlane/metadata/android/ru/changelogs/11.txt +++ /dev/null @@ -1,4 +0,0 @@ -* Добавлена кнопка в шторку для быстрого включения/выключения -* Добавлена компактная нотификация со статусом подключения (требуется для работы кнопки в шторке) -* Исправлены некоторые баги в интерфейсе -* Обновлена библиотека Yggdrasil до 0.4.7 \ No newline at end of file diff --git a/fastlane/metadata/android/ru/changelogs/15.txt b/fastlane/metadata/android/ru/changelogs/15.txt deleted file mode 100644 index 8aaecd6..0000000 --- a/fastlane/metadata/android/ru/changelogs/15.txt +++ /dev/null @@ -1,3 +0,0 @@ -* Обновлена библиотека 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 deleted file mode 100644 index 66c5dba..0000000 --- a/fastlane/metadata/android/ru/changelogs/16.txt +++ /dev/null @@ -1 +0,0 @@ -* Обновлена библиотека 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 deleted file mode 100644 index eb0d4a3..0000000 --- a/fastlane/metadata/android/ru/changelogs/17.txt +++ /dev/null @@ -1 +0,0 @@ -* Обновлена библиотека Yggdrasil до 0.5.6 diff --git a/fastlane/metadata/android/ru/changelogs/18.txt b/fastlane/metadata/android/ru/changelogs/18.txt deleted file mode 100644 index fe1c795..0000000 --- a/fastlane/metadata/android/ru/changelogs/18.txt +++ /dev/null @@ -1,14 +0,0 @@ -Обновлена основная библиотека до версии 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 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/fastlane/metadata/android/ru/full_description.txt b/fastlane/metadata/android/ru/full_description.txt deleted file mode 100644 index 1b4f408..0000000 --- a/fastlane/metadata/android/ru/full_description.txt +++ /dev/null @@ -1,9 +0,0 @@ -Yggdrasil это рабочая реализация полностью зашифрованной сети IPv6. -Она лёгкая, само-организующаяся, поддерживающая множество платформ, и позволяющая любому ПО, способному работать с IPv6, свободно коммуницировать с другими узлами сети Yggdrasil. -Yggdrasil не требует Интернет-подключения по IPv6 - она работает и поверх IPv4. - -Это приложение позволяет вам подключиться к Yggdrasil Network и пользоваться любыми сервисами, расположенными в этой сети. Оно работает как сервис VPN, но весь ваш обычный Интернет-трафик будет идти через вашего провайдера, не через сеть Yggdrasil. - -Заметьте, что анонимность не является целью Yggdrasil. Прямые пиры через Интернет смогут видеть ваш настоящий адрес IP и смогут использовать эту информацию для определения вашего местоположения или идентификации. Пиры, подключающиеся с помощью multicast, скорее всего смогут узнать ваш MAC-адрес. Некоторые узлы в сети могут вычислить через какие узлы вы входите в сеть Yggdrasil. - -Весь трафик, пересылаемый через сеть Yggdrasil зашифрован от точки к точке. Предполагая, что наше шифрование реализовано правильно, трафик не может быть расшифрован или прочитан промежуточными узлами, иможет быть расшифрован только адресатом. Однако, просим заметить, что Yggdrasil не подвергался официальному внешнему аудиту. \ No newline at end of file diff --git a/fastlane/metadata/android/ru/images/featureGraphic.png b/fastlane/metadata/android/ru/images/featureGraphic.png deleted file mode 100644 index 322635d..0000000 Binary files a/fastlane/metadata/android/ru/images/featureGraphic.png and /dev/null differ diff --git a/fastlane/metadata/android/ru/images/phoneScreenshots/1.png b/fastlane/metadata/android/ru/images/phoneScreenshots/1.png deleted file mode 100644 index 8447368..0000000 Binary files a/fastlane/metadata/android/ru/images/phoneScreenshots/1.png and /dev/null differ diff --git a/fastlane/metadata/android/ru/images/phoneScreenshots/2.png b/fastlane/metadata/android/ru/images/phoneScreenshots/2.png deleted file mode 100644 index 04ec129..0000000 Binary files a/fastlane/metadata/android/ru/images/phoneScreenshots/2.png and /dev/null differ diff --git a/fastlane/metadata/android/ru/short_description.txt b/fastlane/metadata/android/ru/short_description.txt deleted file mode 100644 index a1078ae..0000000 --- a/fastlane/metadata/android/ru/short_description.txt +++ /dev/null @@ -1 +0,0 @@ -Официальный клиент для подключения к Yggdrasil Network с устройств Android \ No newline at end of file diff --git a/fastlane/metadata/android/ru/title.txt b/fastlane/metadata/android/ru/title.txt deleted file mode 100644 index f8c32ce..0000000 --- a/fastlane/metadata/android/ru/title.txt +++ /dev/null @@ -1 +0,0 @@ -Yggdrasil \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 3feb240..2521752 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,8 +16,4 @@ 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 -#android.enableR8.fullMode=false -android.defaults.buildfeatures.buildconfig=true -android.nonTransitiveRClass=false -android.nonFinalResIds=false \ No newline at end of file +kotlin.code.style=official \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7f3c09a..e148f37 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Nov 27 01:27:23 CET 2023 +#Mon Jun 14 15:11:35 BST 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME 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 deleted file mode 100644 index 98e1bc2..0000000 --- a/readme.md +++ /dev/null @@ -1,56 +0,0 @@ -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 - -```bash -go install golang.org/x/mobile/cmd/gomobile@latest -``` - -* build yggdrasil-go for android: - -``` -git clone https://github.com/yggdrasil-network/yggdrasil-go /tmp/yggdrasil-go -cd /tmp/yggdrasil-go -./contrib/mobile/build -a -``` - -* clone yggdrasil for android and copy over the built go library - -``` -git clone https://github.com/yggdrasil-network/yggdrasil-android /tmp/yggdrasil-android -mkdir /tmp/yggdrasil-android/app/libs -cp /tmp/yggdrasil-go/yggdrasil.aar /tmp/yggdrasil-android/app/libs/ -``` - -* build yggdrasil-android - -``` -cd /tmp/yggdrasil-android -./gradlew assembleRelease -``` - -note: you will need to use jdk-11 as jdk-16 `"doesn't work" ™` - -on debian/ubuntu you can set which jdk used with the `JAVA_HOME` env var: -``` -export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64/ -```