commit 20ff7378e9529c0e7f8ede1cb4417ca5c19b3eb1 Author: Neil Alexander Date: Wed Jun 16 19:21:09 2021 +0100 Initial commit diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..59ea6c1 --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ +*.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cxx +local.properties +/app/libs/yggdrasil.aar +/app/libs/yggdrasil-sources.jar diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..c058473 --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,45 @@ +plugins { + id 'com.android.application' + id 'kotlin-android' +} + +android { + compileSdkVersion 29 + buildToolsVersion "30.0.3" + + defaultConfig { + applicationId "eu.neilalexander.yggdrasil" + minSdkVersion 21 + targetSdkVersion 29 + versionCode 1 + versionName "0.1" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } +} + +dependencies { + implementation fileTree(include: ['*.aar'], dir: 'libs') + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation 'androidx.core:core-ktx:1.5.0' + implementation 'androidx.appcompat:appcompat:1.3.0' + implementation 'com.google.android.material:material:1.3.0' + implementation 'androidx.constraintlayout:constraintlayout:2.0.4' + 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/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ 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/androidTest/java/eu/neilalexander/yggdrasil/ExampleInstrumentedTest.kt b/app/src/androidTest/java/eu/neilalexander/yggdrasil/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..e361a46 --- /dev/null +++ b/app/src/androidTest/java/eu/neilalexander/yggdrasil/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package eu.neilalexander.yggdrasil + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("eu.neilalexander.yggdrasil", appContext.packageName) + } +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..f9f16b4 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..e0a38a9 --- /dev/null +++ b/app/src/main/java/eu/neilalexander/yggdrasil/ConfigurationProxy.kt @@ -0,0 +1,47 @@ +package eu.neilalexander.yggdrasil + +import android.content.Context +import mobile.Mobile +import org.json.JSONObject +import java.io.File + +object ConfigurationProxy { + private lateinit var json: JSONObject + private lateinit var file: File + + operator fun invoke(applicationContext: Context): ConfigurationProxy { + file = File(applicationContext.filesDir, "yggdrasil.conf") + if (!file.exists()) { + val conf = Mobile.generateConfigJSON() + if (file.createNewFile()) { + file.writeBytes(conf) + } + } + fix() + return this + } + + fun updateJSON(fn: (JSONObject) -> Unit) { + json = JSONObject(file.readText(Charsets.UTF_8)) + fn(json) + val str = json.toString() + file.writeText(str, Charsets.UTF_8) + } + + private fun fix() { + updateJSON { json -> + json.put("AdminListen", "none") + json.put("IfName", "none") + json.put("IfMTU", 65535) + } + } + + fun getJSON(): JSONObject { + fix() + return json + } + + fun getJSONByteArray(): ByteArray { + return json.toString().toByteArray(Charsets.UTF_8) + } +} \ 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 new file mode 100644 index 0000000..b2af6e0 --- /dev/null +++ b/app/src/main/java/eu/neilalexander/yggdrasil/GlobalApplication.kt @@ -0,0 +1,25 @@ +package eu.neilalexander.yggdrasil + +import android.app.Application +import android.content.IntentFilter +import androidx.localbroadcastmanager.content.LocalBroadcastManager + +class GlobalApplication: Application() { + private var state = PacketTunnelState + private lateinit var config: ConfigurationProxy + + override fun onCreate() { + super.onCreate() + config = ConfigurationProxy(applicationContext) + + LocalBroadcastManager.getInstance(this).registerReceiver( + state, IntentFilter(PacketTunnelProvider.RECEIVER_INTENT) + ) + } + + override fun onTerminate() { + super.onTerminate() + + 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 new file mode 100644 index 0000000..f9545d8 --- /dev/null +++ b/app/src/main/java/eu/neilalexander/yggdrasil/MainActivity.kt @@ -0,0 +1,132 @@ +package eu.neilalexander.yggdrasil + +import android.content.BroadcastReceiver +import android.content.Context +import android.content.Intent +import android.content.IntentFilter +import android.graphics.Color +import android.net.VpnService +import android.os.Bundle +import android.widget.Switch +import android.widget.TableRow +import android.widget.TextView +import androidx.appcompat.app.AppCompatActivity +import androidx.localbroadcastmanager.content.LocalBroadcastManager +import mobile.Mobile +import org.json.JSONArray + + +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: TableRow + private lateinit var settingsRow: TableRow + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_main) + + findViewById(R.id.versionValue).text = Mobile.getVersion() + + 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) + settingsRow = findViewById(R.id.settingsTableRow) + + enabledLabel.setTextColor(Color.GRAY) + + VpnService.prepare(this) + + enabledSwitch.setOnCheckedChangeListener { _, isChecked -> + when (isChecked) { + true -> { + val vpnintent = VpnService.prepare(this) + if (vpnintent != null) { + startActivityForResult(vpnintent, 0) + } else { + onActivityResult(0, RESULT_OK, vpnintent) + } + } + false -> { + val intent = Intent(this, PacketTunnelProvider::class.java) + intent.action = PacketTunnelProvider.ACTION_STOP + startService(intent) + } + } + } + + peersRow.isClickable = true + peersRow.setOnClickListener { + val intent = Intent(this, PeersActivity::class.java) + startActivity(intent) + } + + settingsRow.isClickable = true + settingsRow.setOnClickListener { + val intent = Intent(this, SettingsActivity::class.java) + startActivity(intent) + } + } + + override fun onResume() { + super.onResume() + LocalBroadcastManager.getInstance(this).registerReceiver( + receiver, IntentFilter(PacketTunnelState.RECEIVER_INTENT) + ) + } + + private val receiver: BroadcastReceiver = object : BroadcastReceiver() { + override fun onReceive(context: Context?, intent: Intent) { + when (intent.getStringExtra("type")) { + "state" -> { + enabledLabel.text = if (intent.getBooleanExtra("started", false)) { + if (state.dhtCount() == 0) { + enabledLabel.setTextColor(Color.RED) + "No connectivity" + } else { + enabledLabel.setTextColor(Color.GREEN) + "Enabled" + } + } else { + enabledLabel.setTextColor(Color.GRAY) + "Not enabled" + } + ipAddressLabel.text = intent.getStringExtra("ip") ?: "N/A" + subnetLabel.text = intent.getStringExtra("subnet") ?: "N/A" + coordinatesLabel.text = intent.getStringExtra("coords") ?: "[]" + peersLabel.text = when (val count = state.peerCount()) { + 0 -> "No peers" + 1 -> "1 peer" + else -> "$count peers" + } + } + } + } + } + + override fun onPause() { + super.onPause() + LocalBroadcastManager.getInstance(this).unregisterReceiver(receiver) + } + + 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/PacketTunnelProvider.kt b/app/src/main/java/eu/neilalexander/yggdrasil/PacketTunnelProvider.kt new file mode 100644 index 0000000..4578bbf --- /dev/null +++ b/app/src/main/java/eu/neilalexander/yggdrasil/PacketTunnelProvider.kt @@ -0,0 +1,181 @@ +package eu.neilalexander.yggdrasil + +import android.content.Intent +import android.net.Uri +import android.net.VpnService +import android.os.Handler +import android.os.Message +import android.os.ParcelFileDescriptor +import android.util.Log +import androidx.localbroadcastmanager.content.LocalBroadcastManager +import mobile.Yggdrasil +import org.json.JSONArray +import java.io.FileInputStream +import java.io.FileOutputStream +import java.util.concurrent.atomic.AtomicBoolean +import kotlin.concurrent.thread + + +class PacketTunnelProvider: VpnService() { + companion object { + 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" + } + + private var yggdrasil = Yggdrasil() + private var started = AtomicBoolean() + + private lateinit var config: ConfigurationProxy + private lateinit var parcel: ParcelFileDescriptor + + private lateinit var readerThread: Thread + private lateinit var writerThread: Thread + private lateinit var updateThread: Thread + + private lateinit var readerStream: FileInputStream + private lateinit var writerStream: FileOutputStream + + override fun onCreate() { + super.onCreate() + config = ConfigurationProxy(applicationContext) + } + + override fun onDestroy() { + super.onDestroy() + stop() + } + + override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int { + if (intent == null) { + return START_NOT_STICKY + } + return when (intent.action ?: ACTION_STOP) { + ACTION_START -> { + start(); START_STICKY + } + ACTION_STOP -> { + stop(); START_NOT_STICKY + } + else -> { + stop(); START_NOT_STICKY + } + } + } + + private fun start() { + if (!started.compareAndSet(false, true)) { + return + } + + Log.d("PacketTunnelProvider", config.getJSON().toString()) + yggdrasil.startJSON(config.getJSONByteArray()) + + val address = yggdrasil.addressString + var builder = Builder() + .addAddress(address, 7) + .addRoute("200::", 7) + .setBlocking(true) + .setMtu(yggdrasil.mtu.toInt()) + .setSession("Yggdrasil") + + parcel = builder.establish() + if (parcel == null || !parcel.fileDescriptor.valid()) { + stop() + return + } + + readerStream = FileInputStream(parcel.fileDescriptor) + writerStream = FileOutputStream(parcel.fileDescriptor) + + readerThread = thread { + reader() + } + writerThread = thread { + writer() + } + updateThread = thread { + updater() + } + + 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) + } + + private fun stop() { + if (!started.compareAndSet(true, false)) { + return + } + if (readerThread != null) { + readerStream.close() + readerThread.interrupt() + } + if (writerThread != null) { + writerStream.close() + writerThread.interrupt() + } + if (updateThread != null) { + updateThread.interrupt() + } + parcel.close() + yggdrasil.stop() + stopSelf() + + val intent = Intent(RECEIVER_INTENT) + intent.putExtra("type", "state") + intent.putExtra("started", false) + LocalBroadcastManager.getInstance(this).sendBroadcast(intent) + } + + private fun updater() { + updates@ while (!updateThread.isInterrupted) { + 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) + + try { + Thread.sleep(2000) + } catch (e: java.lang.InterruptedException) { + return + } + } + } + + private fun writer() { + writes@ while (!writerThread.isInterrupted && writerStream.fd.valid()) { + try { + val b = yggdrasil.recv() + writerStream.write(b) + } catch (e: Exception) { + break@writes + } + } + stop() + } + + private fun reader() { + var b = ByteArray(65535) + reads@ while (!readerThread.isInterrupted && readerStream.fd.valid()) { + try { + val n = readerStream.read(b) + yggdrasil.send(b.sliceArray(0..n)) + } catch (e: Exception) { + break@reads + } + } + stop() + } +} \ 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 new file mode 100644 index 0000000..5cbccb1 --- /dev/null +++ b/app/src/main/java/eu/neilalexander/yggdrasil/PeersActivity.kt @@ -0,0 +1,158 @@ +package eu.neilalexander.yggdrasil + +import android.app.AlertDialog +import android.content.Context +import android.content.DialogInterface +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import android.text.Layout +import android.util.AttributeSet +import android.util.Log +import android.view.LayoutInflater +import android.view.View +import android.widget.* +import com.google.android.material.textfield.TextInputEditText +import org.json.JSONArray + +class PeersActivity : AppCompatActivity() { + private var state = PacketTunnelState + private lateinit var config: ConfigurationProxy + private lateinit var inflater: LayoutInflater + + private lateinit var connectedTableLayout: TableLayout + private lateinit var connectedTableLabel: TextView + private lateinit var configuredTableLayout: TableLayout + private lateinit var configuredTableLabel: TextView + private lateinit var multicastSwitch: Switch + private lateinit var addPeerButton: ImageButton + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_peers) + + config = ConfigurationProxy(applicationContext) + inflater = LayoutInflater.from(this) + + connectedTableLayout = findViewById(R.id.connectedPeersTableLayout) + connectedTableLabel = findViewById(R.id.connectedPeersLabel) + + configuredTableLayout = findViewById(R.id.configuredPeersTableLayout) + configuredTableLabel = findViewById(R.id.configuredPeersLabel) + + 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\"]")) + } + } + } + } + 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 { + 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("Add") { dialog, _ -> + config.updateJSON { json -> + json.getJSONArray("Peers").put(input.text) + } + dialog.dismiss() + updateConfiguredPeers() + } + builder.setNegativeButton("Cancel") { dialog, _ -> + dialog.cancel() + } + builder.show() + } + } + + override fun onResume() { + super.onResume() + + updateConfiguredPeers() + updateConnectedPeers() + } + + private fun updateConfiguredPeers() { + val peers = config.getJSON().getJSONArray("Peers") + + when (peers.length()) { + 0 -> { + configuredTableLayout.visibility = View.GONE + configuredTableLabel.text = "No peers currently configured" + } + else -> { + configuredTableLayout.visibility = View.VISIBLE + configuredTableLabel.text = "Configured Peers" + + configuredTableLayout.removeAllViewsInLayout() + for (i in 0 until peers.length()) { + val peer = peers[i].toString() + 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(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("Cancel") { dialog, _ -> + dialog.cancel() + } + builder.show() + } + configuredTableLayout.addView(view) + } + } + } + } + + private fun updateConnectedPeers() { + val peers = state.peersState ?: JSONArray("[]") + + when (peers.length()) { + 0 -> { + connectedTableLayout.visibility = View.GONE + connectedTableLabel.text = "No peers currently connected" + } + else -> { + connectedTableLayout.visibility = View.VISIBLE + connectedTableLabel.text = "Connected Peers" + + connectedTableLayout.removeAllViewsInLayout() + 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") + view.findViewById(R.id.addressLabel).text = ip + view.findViewById(R.id.detailsLabel).text = peer.getString("Remote") + connectedTableLayout.addView(view) + } + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/eu/neilalexander/yggdrasil/SettingsActivity.kt b/app/src/main/java/eu/neilalexander/yggdrasil/SettingsActivity.kt new file mode 100644 index 0000000..5c3382f --- /dev/null +++ b/app/src/main/java/eu/neilalexander/yggdrasil/SettingsActivity.kt @@ -0,0 +1,11 @@ +package eu.neilalexander.yggdrasil + +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle + +class SettingsActivity : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_settings) + } +} \ No newline at end of file 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/ic_baseline_add_circle_24.xml b/app/src/main/res/drawable/ic_baseline_add_circle_24.xml new file mode 100644 index 0000000..2bb63e6 --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_add_circle_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_baseline_chevron_right_24.xml b/app/src/main/res/drawable/ic_baseline_chevron_right_24.xml new file mode 100644 index 0000000..fd2878a --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_chevron_right_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_baseline_remove_circle_24.xml b/app/src/main/res/drawable/ic_baseline_remove_circle_24.xml new file mode 100644 index 0000000..2c986ca --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_remove_circle_24.xml @@ -0,0 +1,10 @@ + + + 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/rounded.xml b/app/src/main/res/drawable/rounded.xml new file mode 100644 index 0000000..96f358f --- /dev/null +++ b/app/src/main/res/drawable/rounded.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..bfc0ff4 --- /dev/null +++ b/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,432 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_peers.xml b/app/src/main/res/layout/activity_peers.xml new file mode 100644 index 0000000..ea7983f --- /dev/null +++ b/app/src/main/res/layout/activity_peers.xml @@ -0,0 +1,218 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml new file mode 100644 index 0000000..f27f5e5 --- /dev/null +++ b/app/src/main/res/layout/activity_settings.xml @@ -0,0 +1,9 @@ + + + + \ 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 new file mode 100644 index 0000000..c627c5c --- /dev/null +++ b/app/src/main/res/layout/dialog_addpeer.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..e9aff3c --- /dev/null +++ b/app/src/main/res/layout/peers_configured.xml @@ -0,0 +1,29 @@ + + + + + + + + + \ 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 new file mode 100644 index 0000000..325d3ac --- /dev/null +++ b/app/src/main/res/layout/peers_connected.xml @@ -0,0 +1,31 @@ + + + + + + + + + + \ No newline at end of file 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-night/themes.xml b/app/src/main/res/values-night/themes.xml new file mode 100644 index 0000000..ed3f9f3 --- /dev/null +++ b/app/src/main/res/values-night/themes.xml @@ -0,0 +1,19 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml new file mode 100644 index 0000000..4d1f545 --- /dev/null +++ b/app/src/main/res/values/attrs.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..4f74376 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,12 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + #F2F1F5 + #1C1C1E + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..c2e6bce --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + Yggdrasil + \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..ece6c2c --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,21 @@ + + + + \ No newline at end of file diff --git a/app/src/test/java/eu/neilalexander/yggdrasil/ExampleUnitTest.kt b/app/src/test/java/eu/neilalexander/yggdrasil/ExampleUnitTest.kt new file mode 100644 index 0000000..d53d658 --- /dev/null +++ b/app/src/test/java/eu/neilalexander/yggdrasil/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package eu.neilalexander.yggdrasil + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..b090095 --- /dev/null +++ b/build.gradle @@ -0,0 +1,27 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +buildscript { + ext.kotlin_version = "1.5.0" + repositories { + google() + mavenCentral() + } + dependencies { + 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 + // in the individual module build.gradle files + } +} + +allprojects { + repositories { + google() + mavenCentral() + jcenter() // Warning: this repository is going to shut down soon + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..2521752 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,19 @@ +# Project-wide Gradle settings. +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true +# AndroidX package structure to make it clearer which packages are bundled with the +# Android operating system, and which are packaged with your app"s APK +# https://developer.android.com/topic/libraries/support-library/androidx-rn +android.useAndroidX=true +# Kotlin code style for this project: "official" or "obsolete": +kotlin.code.style=official \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..f6b961f Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..e148f37 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Mon Jun 14 15:11:35 BST 2021 +distributionBase=GRADLE_USER_HOME +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/gradlew b/gradlew new file mode 100755 index 0000000..cccdd3d --- /dev/null +++ b/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..e95643d --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..8413a98 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name = "Yggdrasil" +include ':app'