From 3c9683c859cdae5abc7405b23c1baec9d5014394 Mon Sep 17 00:00:00 2001
From: vadym <vadym.vikulin@gmail.com>
Date: Mon, 3 Aug 2020 06:06:06 -0700
Subject: [PATCH 01/32] 1. Added API 15 support (Android 4.0.3)

---
 app/build.gradle | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index af555d2..53211cc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,10 +6,10 @@ android {
     compileSdkVersion 29
     defaultConfig {
         applicationId "io.github.chronosx88.yggdrasil"
-        minSdkVersion 21
+        minSdkVersion 15
         targetSdkVersion 29
-        versionCode 3
-        versionName "1.3"
+        versionCode 4
+        versionName "1.4"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         project.ext.set("archivesBaseName", project.getParent().name+"-"+versionName)
     }
@@ -38,17 +38,6 @@ android {
     }
 }
 
-task ndkBuild(type: Exec) {
-    def rootDir = project.rootDir
-    workingDir = new File(rootDir,"yggdrasil")
-    commandLine 'make'
-}
-
-gradle.projectsEvaluated {
-    tasks.compileDebugKotlin.dependsOn(ndkBuild)
-}
-
-
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(path: ':yggdrasil')

From 47d722c967ebdd36b0fe06abf38b056b861edbd6 Mon Sep 17 00:00:00 2001
From: vadym <vadym.vikulin@gmail.com>
Date: Mon, 3 Aug 2020 06:09:03 -0700
Subject: [PATCH 02/32] 1. Material design lib upgrade

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 53211cc..15fa3d8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -48,7 +48,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7'
-    implementation 'com.google.android.material:material:1.3.0-alpha01'
+    implementation 'com.google.android.material:material:1.3.0-alpha02'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.hbb20:ccp:2.4.0'
 

From 707f332b1091cea283ee58f59106260948fc0996 Mon Sep 17 00:00:00 2001
From: vadym <vadym.vikulin@gmail.com>
Date: Mon, 3 Aug 2020 06:10:29 -0700
Subject: [PATCH 03/32] 1. Rollback ndk task removal

---
 app/build.gradle | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/app/build.gradle b/app/build.gradle
index 15fa3d8..c93ff3c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -38,6 +38,16 @@ android {
     }
 }
 
+task ndkBuild(type: Exec) {
+    def rootDir = project.rootDir
+    workingDir = new File(rootDir,"yggdrasil")
+    commandLine 'make'
+}
+
+gradle.projectsEvaluated {
+    tasks.compileDebugKotlin.dependsOn(ndkBuild)
+}
+
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(path: ':yggdrasil')

From 4b8c9235b4be001d526afa461e12d9fe0a2775c6 Mon Sep 17 00:00:00 2001
From: vadym <vadym.vikulin@gmail.com>
Date: Mon, 3 Aug 2020 06:57:10 -0700
Subject: [PATCH 04/32] 1. API 15 support (Android 4.0.3)

---
 .../chronosx88/yggdrasil/PeerListActivity.kt  |  4 +-
 .../yggdrasil/YggdrasilTunService.kt          | 83 +++++++++++--------
 2 files changed, 50 insertions(+), 37 deletions(-)

diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/PeerListActivity.kt b/app/src/main/java/io/github/chronosx88/yggdrasil/PeerListActivity.kt
index 4f74ab2..bd248d7 100644
--- a/app/src/main/java/io/github/chronosx88/yggdrasil/PeerListActivity.kt
+++ b/app/src/main/java/io/github/chronosx88/yggdrasil/PeerListActivity.kt
@@ -140,7 +140,9 @@ class PeerListActivity : AppCompatActivity() {
         var schemaInput = view.findViewById<TextView>(R.id.schemaInput)
         var ipInput = view.findViewById<TextView>(R.id.ipInput)
         ipInput.requestFocus()
-        schemaInput.showSoftInputOnFocus = false
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            schemaInput.showSoftInputOnFocus = false
+        }
         schemaInput.setOnFocusChangeListener { v, _ ->
             if(schemaInput.isFocused) {
                 onClickSchemaList(v)
diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt b/app/src/main/java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt
index b0e593a..8030ed8 100644
--- a/app/src/main/java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt
+++ b/app/src/main/java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt
@@ -59,7 +59,7 @@ class YggdrasilTunService : VpnService() {
         when(intent?.getStringExtra(MainActivity.COMMAND)){
             MainActivity.STOP ->{
                 stopVpn(pi)
-                startForeground(FOREGROUND_ID, foregroundNotification("Yggdrasil service stopped"))
+                foregroundNotification(FOREGROUND_ID, "Yggdrasil service stopped")
             }
             MainActivity.START ->{
                 val peers = deserializeStringList2PeerInfoSet(intent.getStringArrayListExtra(MainActivity.CURRENT_PEERS))
@@ -67,7 +67,7 @@ class YggdrasilTunService : VpnService() {
                 val staticIP: Boolean = intent.getBooleanExtra(MainActivity.STATIC_IP, false)
                 ygg = Yggdrasil()
                 setupTunInterface(pi, peers, dns, staticIP)
-                startForeground(FOREGROUND_ID, foregroundNotification("Yggdrasil service started"))
+                foregroundNotification(FOREGROUND_ID, "Yggdrasil service started")
             }
             MainActivity.UPDATE_DNS ->{
                 val dns = deserializeStringList2DNSInfoSet(intent.getStringArrayListExtra(MainActivity.CURRENT_DNS))
@@ -84,11 +84,17 @@ class YggdrasilTunService : VpnService() {
     private fun setupIOStreams(dns: MutableSet<DNSInfo>){
         address = ygg.addressString
 
-        var builder = Builder()
-            .addAddress(address!!, 7)
-            .allowFamily(OsConstants.AF_INET)
-            .allowBypass()
-            .setMtu(MAX_PACKET_SIZE)
+        var builder = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            Builder()
+                .addAddress(address!!, 7)
+                .allowFamily(OsConstants.AF_INET)
+                .allowBypass()
+                .setMtu(MAX_PACKET_SIZE)
+        } else {
+            Builder()
+                .addAddress(address!!, 7)
+                .setMtu(MAX_PACKET_SIZE)
+        }
         if (dns.size > 0) {
             for (d in dns) {
                 builder.addDnsServer(d.address)
@@ -265,14 +271,17 @@ class YggdrasilTunService : VpnService() {
     private fun hasIpv6DefaultRoute(): Boolean {
         val cm =
             getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-        val networks = cm.allNetworks
-        for (network in networks) {
-            val linkProperties = cm.getLinkProperties(network)
-            if(linkProperties!=null) {
-                val routes = linkProperties.routes
-                for (route in routes) {
-                    if (route.isDefaultRoute && route.gateway is Inet6Address) {
-                        return true
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            val networks = cm.allNetworks
+
+            for (network in networks) {
+                val linkProperties = cm.getLinkProperties(network)
+                if(linkProperties!=null) {
+                    val routes = linkProperties.routes
+                    for (route in routes) {
+                        if (route.isDefaultRoute && route.gateway is Inet6Address) {
+                            return true
+                        }
                     }
                 }
             }
@@ -280,27 +289,29 @@ class YggdrasilTunService : VpnService() {
         return false
     }
 
-    private fun foregroundNotification(text: String): Notification? {
-        val channelId =
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                createNotificationChannel(TAG, "Yggdrasil service")
-            } else {
-                // If earlier version channel ID is not used
-                // https://developer.android.com/reference/android/support/v4/app/NotificationCompat.Builder.html#NotificationCompat.Builder(android.content.Context)
-                ""
-            }
-        var intent = Intent(this, MainActivity::class.java)
-        var stackBuilder = TaskStackBuilder.create(this)
-        stackBuilder.addNextIntentWithParentStack(intent)
-        var pi = stackBuilder.getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT)
-        val b = NotificationCompat.Builder(this, channelId)
-        b.setOngoing(true)
-            .setContentIntent(pi)
-            .setContentTitle(getString(R.string.app_name))
-            .setContentText(text)
-            .setSmallIcon(R.mipmap.ic_launcher)
-            .setTicker(text)
-        return b.build()
+    private fun foregroundNotification(FOREGROUND_ID: Int, text: String) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+            val channelId =
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    createNotificationChannel(TAG, "Yggdrasil service")
+                } else {
+                    // If earlier version channel ID is not used
+                    // https://developer.android.com/reference/android/support/v4/app/NotificationCompat.Builder.html#NotificationCompat.Builder(android.content.Context)
+                    ""
+                }
+            var intent = Intent(this, MainActivity::class.java)
+            var stackBuilder = TaskStackBuilder.create(this)
+            stackBuilder.addNextIntentWithParentStack(intent)
+            var pi = stackBuilder.getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT)
+            val b = NotificationCompat.Builder(this, channelId)
+            b.setOngoing(true)
+                .setContentIntent(pi)
+                .setContentTitle(getString(R.string.app_name))
+                .setContentText(text)
+                .setSmallIcon(R.mipmap.ic_launcher)
+                .setTicker(text)
+            startForeground(FOREGROUND_ID, b.build())
+        }
     }
 
     @RequiresApi(Build.VERSION_CODES.O)

From 4cd7cf2a0ece17d4f362777ee197395a3e9fa8ba Mon Sep 17 00:00:00 2001
From: vadym <vadym.vikulin@gmail.com>
Date: Mon, 3 Aug 2020 07:03:21 -0700
Subject: [PATCH 05/32] 1. API 15 support (Android 4.0.3)

---
 app/src/main/res/layout/activity_main.xml  | 3 ++-
 app/src/main/res/layout/host_list_item.xml | 3 ++-
 app/src/main/res/values-v21/styles.xml     | 7 +++++++
 app/src/main/res/values/styles.xml         | 2 +-
 4 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/res/values-v21/styles.xml

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 11d6687..b73ee8e 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -27,7 +27,8 @@
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
-                    app:popupTheme="@style/AppTheme.PopupOverlay" />
+                    app:popupTheme="@style/AppTheme.PopupOverlay"
+                    android:layout_marginRight="240dp" />
 
             <Switch
                     android:id="@+id/staticIP"
diff --git a/app/src/main/res/layout/host_list_item.xml b/app/src/main/res/layout/host_list_item.xml
index 5017d14..864eacf 100644
--- a/app/src/main/res/layout/host_list_item.xml
+++ b/app/src/main/res/layout/host_list_item.xml
@@ -22,5 +22,6 @@
             android:paddingEnd="20dp"
             android:minHeight="22dp"
             android:textSize="13sp"
-            android:textColor="@color/white"/>
+            android:textColor="@color/white"
+            android:paddingRight="20dp" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
new file mode 100644
index 0000000..b208867
--- /dev/null
+++ b/app/src/main/res/values-v21/styles.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="SwitchTheme" parent="Theme.AppCompat.Light">
+        <item name="android:colorControlActivated">@color/green</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d53b11f..764b9fa 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -10,7 +10,7 @@
     </style>
 
     <style name="SwitchTheme" parent="Theme.AppCompat.Light">
-        <item name="android:colorControlActivated">@color/green</item>
+
     </style>
 
     <style name="EditText.OutlinedBox" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox">

From ad47d4ca069e347771688514c6c9132e61b1c78f Mon Sep 17 00:00:00 2001
From: vadym <vadym.vikulin@gmail.com>
Date: Mon, 3 Aug 2020 07:07:15 -0700
Subject: [PATCH 06/32] 1. API 15 support (Android 4.0.3)

---
 app/src/main/res/layout/host_list_item_edit.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/host_list_item_edit.xml b/app/src/main/res/layout/host_list_item_edit.xml
index d8947e4..e6ed5ae 100644
--- a/app/src/main/res/layout/host_list_item_edit.xml
+++ b/app/src/main/res/layout/host_list_item_edit.xml
@@ -11,7 +11,8 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintStart_toEndOf="@+id/hostInfoText"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintTop_toTopOf="parent"/>
+            app:layout_constraintTop_toTopOf="parent"
+            android:layout_marginLeft="10dp" />
     <TextView
             android:id="@+id/hostInfoText"
             android:layout_width="0dp"
@@ -24,7 +25,8 @@
             app:layout_constraintEnd_toStartOf="@+id/ping"
             app:layout_constraintStart_toEndOf="@+id/countryFlag"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintTop_toTopOf="parent"/>
+            app:layout_constraintTop_toTopOf="parent"
+            android:layout_marginLeft="10dp" />
 
     <TextView
             android:id="@+id/ping"

From 77c01df982250cc6245eb830961cc77053fcd54b Mon Sep 17 00:00:00 2001
From: vadym <vadym.vikulin@gmail.com>
Date: Mon, 3 Aug 2020 08:04:53 -0700
Subject: [PATCH 07/32] 1. add route fix

---
 .../java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt b/app/src/main/java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt
index 8030ed8..4575c4a 100644
--- a/app/src/main/java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt
+++ b/app/src/main/java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt
@@ -93,6 +93,7 @@ class YggdrasilTunService : VpnService() {
         } else {
             Builder()
                 .addAddress(address!!, 7)
+                .addRoute("200::", 7)
                 .setMtu(MAX_PACKET_SIZE)
         }
         if (dns.size > 0) {

From a24e3ad645f9539a9d34ef82fd222292c4965c25 Mon Sep 17 00:00:00 2001
From: vadym <vadym.vikulin@gmail.com>
Date: Wed, 5 Aug 2020 04:11:14 -0700
Subject: [PATCH 08/32] 1. ping delay possible fix

---
 .../java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt b/app/src/main/java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt
index 4575c4a..f71d2fd 100644
--- a/app/src/main/java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt
+++ b/app/src/main/java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt
@@ -230,7 +230,7 @@ class YggdrasilTunService : VpnService() {
             if (length > 0){
                 yggConduitEndpoint.send(buffer.sliceArray(IntRange(0, length - 1)))
             } else {
-                Thread.sleep(100)
+                Thread.sleep(10)
             }
         } catch (e: IOException) {
             e.printStackTrace()

From df0733f6b66d62c52c55c864a155a07dff3a52c7 Mon Sep 17 00:00:00 2001
From: vadym <vadym.vikulin@gmail.com>
Date: Wed, 5 Aug 2020 10:59:00 -0700
Subject: [PATCH 09/32] 1. set blocking read

---
 .../io/github/chronosx88/yggdrasil/YggdrasilTunService.kt  | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt b/app/src/main/java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt
index f71d2fd..5380900 100644
--- a/app/src/main/java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt
+++ b/app/src/main/java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt
@@ -89,6 +89,7 @@ class YggdrasilTunService : VpnService() {
                 .addAddress(address!!, 7)
                 .allowFamily(OsConstants.AF_INET)
                 .allowBypass()
+                .setBlocking(true)
                 .setMtu(MAX_PACKET_SIZE)
         } else {
             Builder()
@@ -227,11 +228,7 @@ class YggdrasilTunService : VpnService() {
         try {
             // Read the outgoing packet from the input stream.
             val length = tunInputStream?.read(buffer) ?: 1
-            if (length > 0){
-                yggConduitEndpoint.send(buffer.sliceArray(IntRange(0, length - 1)))
-            } else {
-                Thread.sleep(10)
-            }
+            yggConduitEndpoint.send(buffer.sliceArray(IntRange(0, length - 1)))
         } catch (e: IOException) {
             e.printStackTrace()
         }

From 4865e16854deb4945285be89e914c58b660e4b63 Mon Sep 17 00:00:00 2001
From: vadym <vadym.vikulin@gmail.com>
Date: Wed, 5 Aug 2020 13:47:16 -0700
Subject: [PATCH 10/32] 1. set blocking read

---
 .../yggdrasil/YggdrasilTunService.kt          | 43 +++++++------------
 1 file changed, 15 insertions(+), 28 deletions(-)

diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt b/app/src/main/java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt
index 5380900..b169c74 100644
--- a/app/src/main/java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt
+++ b/app/src/main/java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt
@@ -31,6 +31,10 @@ import java.net.Inet6Address
 class YggdrasilTunService : VpnService() {
 
     private lateinit var ygg: Yggdrasil
+    private lateinit var tunInterface: ParcelFileDescriptor
+    private lateinit var tunInputStream: InputStream
+    private lateinit var tunOutputStream: OutputStream
+    private lateinit var address: String
     private var isClosed = false
 
     /** Maximum packet size is constrained by the MTU, which is given as a signed short/2 */
@@ -39,21 +43,11 @@ class YggdrasilTunService : VpnService() {
     companion object {
         private const val TAG = "Yggdrasil-service"
     }
-    private var tunInterface: ParcelFileDescriptor? = null
-    private var tunInputStream: InputStream? = null
-    private var tunOutputStream: OutputStream? = null
-    private var scope: CoroutineScope? = null
-    private var address: String? = null
 
-    private var mNotificationManager: NotificationManager? = null
+    private var scope: CoroutineScope? = null
 
     private val FOREGROUND_ID = 1338
 
-    override fun onCreate() {
-        super.onCreate()
-        mNotificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-    }
-
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
         val pi: PendingIntent? = intent?.getParcelableExtra(MainActivity.PARAM_PINTENT)
         when(intent?.getStringExtra(MainActivity.COMMAND)){
@@ -86,14 +80,14 @@ class YggdrasilTunService : VpnService() {
 
         var builder = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             Builder()
-                .addAddress(address!!, 7)
+                .addAddress(address, 7)
                 .allowFamily(OsConstants.AF_INET)
                 .allowBypass()
                 .setBlocking(true)
                 .setMtu(MAX_PACKET_SIZE)
         } else {
             Builder()
-                .addAddress(address!!, 7)
+                .addAddress(address, 7)
                 .addRoute("200::", 7)
                 .setMtu(MAX_PACKET_SIZE)
         }
@@ -108,15 +102,9 @@ class YggdrasilTunService : VpnService() {
         if(!hasIpv6DefaultRoute()){
             builder.addRoute("2000::",3)
         }
-        if(tunInterface!=null){
-            tunInterface!!.close()
-            tunInputStream!!.close()
-            tunOutputStream!!.close()
-        }
         tunInterface = builder.establish()
-        tunInputStream = FileInputStream(tunInterface!!.fileDescriptor)
-        tunOutputStream = FileOutputStream(tunInterface!!.fileDescriptor)
-
+        tunInputStream = FileInputStream(tunInterface.fileDescriptor)
+        tunOutputStream = FileOutputStream(tunInterface.fileDescriptor)
     }
 
     private fun setupTunInterface(
@@ -140,7 +128,7 @@ class YggdrasilTunService : VpnService() {
         val job = SupervisorJob()
         scope = CoroutineScope(Dispatchers.Default + job)
         scope!!.launch {
-            val buffer = ByteArray(2048)
+            val buffer = ByteArray(1024)
             while (!isClosed) {
                 readPacketsFromTun(yggConduitEndpoint, buffer)
             }
@@ -227,7 +215,7 @@ class YggdrasilTunService : VpnService() {
     private fun readPacketsFromTun(yggConduitEndpoint: ConduitEndpoint, buffer: ByteArray) {
         try {
             // Read the outgoing packet from the input stream.
-            val length = tunInputStream?.read(buffer) ?: 1
+            val length = tunInputStream.read(buffer)
             yggConduitEndpoint.send(buffer.sliceArray(IntRange(0, length - 1)))
         } catch (e: IOException) {
             e.printStackTrace()
@@ -238,7 +226,7 @@ class YggdrasilTunService : VpnService() {
         val buffer = yggConduitEndpoint.recv()
         if(buffer!=null) {
             try {
-                tunOutputStream?.write(buffer)
+                tunOutputStream.write(buffer)
             } catch (e: IOException) {
                 e.printStackTrace()
             }
@@ -248,10 +236,9 @@ class YggdrasilTunService : VpnService() {
     private fun stopVpn(pi: PendingIntent?) {
         isClosed = true;
         scope!!.coroutineContext.cancelChildren()
-        tunInputStream!!.close()
-        tunOutputStream!!.close()
-        tunInterface!!.close()
-        tunInterface = null
+        tunInputStream.close()
+        tunOutputStream.close()
+        tunInterface.close()
         Log.d(TAG,"Stop is running from service")
         ygg.stop()
         val intent: Intent = Intent()

From b2b6f2c8ef742b7b78bb2a784da8c25d27a35ada Mon Sep 17 00:00:00 2001
From: vadym <vadym.vikulin@gmail.com>
Date: Wed, 5 Aug 2020 13:55:56 -0700
Subject: [PATCH 11/32] 1. code refactoring

---
 .../io/github/chronosx88/yggdrasil/MainActivity.kt     |  6 +++---
 .../github/chronosx88/yggdrasil/YggdrasilTunService.kt | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt b/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt
index 839faef..7234558 100644
--- a/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt
+++ b/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt
@@ -62,7 +62,7 @@ class MainActivity : AppCompatActivity() {
 
         @JvmStatic var isStarted = false
         @JvmStatic var isCancelled = false
-        @JvmStatic var address = ""
+        @JvmStatic var address:String? = ""
     }
 
     private var currentPeers = setOf<PeerInfo>()
@@ -230,7 +230,7 @@ class MainActivity : AppCompatActivity() {
                 //save to shared preferences
                 val preferences =
                     PreferenceManager.getDefaultSharedPreferences(this.baseContext)
-                preferences.edit().putStringSet(CURRENT_PEERS, HashSet(currentPeers)).apply()
+                preferences.edit().putStringSet(CURRENT_PEERS, currentPeers!!.toHashSet()).apply()
                 if(isStarted){
                     //TODO implement UpdateConfig method in native interface and apply peer changes
                     stopVpn()
@@ -254,7 +254,7 @@ class MainActivity : AppCompatActivity() {
                 //save to shared preferences
                 val preferences =
                     PreferenceManager.getDefaultSharedPreferences(this.baseContext)
-                preferences.edit().putStringSet(CURRENT_DNS, HashSet(currentDNS)).apply()
+                preferences.edit().putStringSet(CURRENT_DNS, currentDNS!!.toHashSet()).apply()
                 if(isStarted){
                     updateDNS()
                 }
diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt b/app/src/main/java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt
index b169c74..60af9df 100644
--- a/app/src/main/java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt
+++ b/app/src/main/java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt
@@ -31,7 +31,6 @@ import java.net.Inet6Address
 class YggdrasilTunService : VpnService() {
 
     private lateinit var ygg: Yggdrasil
-    private lateinit var tunInterface: ParcelFileDescriptor
     private lateinit var tunInputStream: InputStream
     private lateinit var tunOutputStream: OutputStream
     private lateinit var address: String
@@ -39,6 +38,7 @@ class YggdrasilTunService : VpnService() {
 
     /** Maximum packet size is constrained by the MTU, which is given as a signed short/2 */
     private val MAX_PACKET_SIZE = Short.MAX_VALUE/2
+    private var tunInterface: ParcelFileDescriptor? = null
 
     companion object {
         private const val TAG = "Yggdrasil-service"
@@ -103,8 +103,8 @@ class YggdrasilTunService : VpnService() {
             builder.addRoute("2000::",3)
         }
         tunInterface = builder.establish()
-        tunInputStream = FileInputStream(tunInterface.fileDescriptor)
-        tunOutputStream = FileOutputStream(tunInterface.fileDescriptor)
+        tunInputStream = FileInputStream(tunInterface!!.fileDescriptor)
+        tunOutputStream = FileOutputStream(tunInterface!!.fileDescriptor)
     }
 
     private fun setupTunInterface(
@@ -144,7 +144,7 @@ class YggdrasilTunService : VpnService() {
 
     private fun sendMeshPeerStatus(pi: PendingIntent?){
         class Token : TypeToken<List<Peer>>()
-        var add = ygg.addressString
+        ygg.addressString
         var meshPeers: List<Peer> = gson.fromJson(ygg.peersJSON, Token().type)
         val intent: Intent = Intent().putStringArrayListExtra(
             MainActivity.MESH_PEERS,
@@ -238,7 +238,7 @@ class YggdrasilTunService : VpnService() {
         scope!!.coroutineContext.cancelChildren()
         tunInputStream.close()
         tunOutputStream.close()
-        tunInterface.close()
+        tunInterface!!.close()
         Log.d(TAG,"Stop is running from service")
         ygg.stop()
         val intent: Intent = Intent()

From 445683b87ee7aa33e8a5af29c35280ebdbb45a39 Mon Sep 17 00:00:00 2001
From: vadym <vadym.vikulin@gmail.com>
Date: Wed, 5 Aug 2020 14:25:14 -0700
Subject: [PATCH 12/32] 1. buffered read fix

---
 .../io/github/chronosx88/yggdrasil/YggdrasilTunService.kt   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt b/app/src/main/java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt
index 60af9df..97adb9e 100644
--- a/app/src/main/java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt
+++ b/app/src/main/java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt
@@ -215,8 +215,10 @@ class YggdrasilTunService : VpnService() {
     private fun readPacketsFromTun(yggConduitEndpoint: ConduitEndpoint, buffer: ByteArray) {
         try {
             // Read the outgoing packet from the input stream.
-            val length = tunInputStream.read(buffer)
-            yggConduitEndpoint.send(buffer.sliceArray(IntRange(0, length - 1)))
+            val length = tunInputStream.buffered().read(buffer)
+            if(length>0) {
+                yggConduitEndpoint.send(buffer.sliceArray(IntRange(0, length - 1)))
+            }
         } catch (e: IOException) {
             e.printStackTrace()
         }

From 53c945430d4519adb71a5a47ade81881e8c07161 Mon Sep 17 00:00:00 2001
From: vadym <vadym.vikulin@gmail.com>
Date: Wed, 5 Aug 2020 14:42:13 -0700
Subject: [PATCH 13/32] 1. increased buffer size

---
 .../io/github/chronosx88/yggdrasil/YggdrasilTunService.kt     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt b/app/src/main/java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt
index 97adb9e..78e11fc 100644
--- a/app/src/main/java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt
+++ b/app/src/main/java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt
@@ -128,7 +128,7 @@ class YggdrasilTunService : VpnService() {
         val job = SupervisorJob()
         scope = CoroutineScope(Dispatchers.Default + job)
         scope!!.launch {
-            val buffer = ByteArray(1024)
+            val buffer = ByteArray(MAX_PACKET_SIZE)
             while (!isClosed) {
                 readPacketsFromTun(yggConduitEndpoint, buffer)
             }
@@ -215,7 +215,7 @@ class YggdrasilTunService : VpnService() {
     private fun readPacketsFromTun(yggConduitEndpoint: ConduitEndpoint, buffer: ByteArray) {
         try {
             // Read the outgoing packet from the input stream.
-            val length = tunInputStream.buffered().read(buffer)
+            val length = tunInputStream.read(buffer)
             if(length>0) {
                 yggConduitEndpoint.send(buffer.sliceArray(IntRange(0, length - 1)))
             }

From 6f311b7213cd34f12a7714433f86318c938ae3f9 Mon Sep 17 00:00:00 2001
From: vadym <vadym.vikulin@gmail.com>
Date: Wed, 5 Aug 2020 14:48:57 -0700
Subject: [PATCH 14/32] 1. condition fix

---
 .../io/github/chronosx88/yggdrasil/YggdrasilTunService.kt     | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt b/app/src/main/java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt
index 78e11fc..8220a45 100644
--- a/app/src/main/java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt
+++ b/app/src/main/java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt
@@ -216,9 +216,7 @@ class YggdrasilTunService : VpnService() {
         try {
             // Read the outgoing packet from the input stream.
             val length = tunInputStream.read(buffer)
-            if(length>0) {
-                yggConduitEndpoint.send(buffer.sliceArray(IntRange(0, length - 1)))
-            }
+            yggConduitEndpoint.send(buffer.sliceArray(IntRange(0, length - 1)))
         } catch (e: IOException) {
             e.printStackTrace()
         }

From caa798a08db9fe12648170b96f4e06c6fbedb2b0 Mon Sep 17 00:00:00 2001
From: vadym <vadym.vikulin@gmail.com>
Date: Thu, 6 Aug 2020 22:54:14 -0700
Subject: [PATCH 15/32] 1. list of java methods

---
 .../io/github/chronosx88/yggdrasil/MainActivity.kt   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt b/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt
index 7234558..af0e46c 100644
--- a/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt
+++ b/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt
@@ -22,11 +22,7 @@ import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.deserializeS
 import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.deserializeStringSet2PeerInfoSet
 import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.serializeDNSInfoSet2StringList
 import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.serializePeerInfoSet2StringList
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import java.net.InetAddress
+import java.lang.reflect.Method
 import kotlin.concurrent.thread
 
 
@@ -143,7 +139,11 @@ class MainActivity : AppCompatActivity() {
             ipLayout.visibility = View.VISIBLE
             findViewById<TextView>(R.id.ip).text = address
         }
-
+        val c: Class<*> = dummy.Dummy::class.java
+        val methods: Array<Method> = c.declaredMethods
+        for (i in methods.indices) {
+            Log.d(TAG,"The method is: " + methods[i].toString())
+        }
     }
 
     private fun stopVpn(){

From b9d83dcad4eb1f17d8f6f2261e4a093b7afacc30 Mon Sep 17 00:00:00 2001
From: vadym <vadym.vikulin@gmail.com>
Date: Thu, 6 Aug 2020 23:07:54 -0700
Subject: [PATCH 16/32] 1. methods log

---
 .../java/io/github/chronosx88/yggdrasil/MainActivity.kt   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt b/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt
index af0e46c..3322dcc 100644
--- a/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt
+++ b/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt
@@ -141,8 +141,12 @@ class MainActivity : AppCompatActivity() {
         }
         val c: Class<*> = dummy.Dummy::class.java
         val methods: Array<Method> = c.declaredMethods
-        for (i in methods.indices) {
-            Log.d(TAG,"The method is: " + methods[i].toString())
+        if(methods.isEmpty()){
+            Log.d(TAG,"No class methods found in dummy.Dummy")
+        } else {
+            for (i in methods.indices) {
+                Log.d(TAG, "The method is: " + methods[i].toString())
+            }
         }
     }
 

From e7f5d528a96359dd7c822865f3096f49131dc05e Mon Sep 17 00:00:00 2001
From: vadym <vadym.vikulin@gmail.com>
Date: Thu, 6 Aug 2020 23:17:10 -0700
Subject: [PATCH 17/32] 1. methods list

---
 .../main/java/io/github/chronosx88/yggdrasil/MainActivity.kt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt b/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt
index 3322dcc..3ddd27a 100644
--- a/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt
+++ b/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt
@@ -141,11 +141,12 @@ class MainActivity : AppCompatActivity() {
         }
         val c: Class<*> = dummy.Dummy::class.java
         val methods: Array<Method> = c.declaredMethods
+        Log.d(TAG,"Getting dummy.Dummy class methods list")
         if(methods.isEmpty()){
             Log.d(TAG,"No class methods found in dummy.Dummy")
         } else {
-            for (i in methods.indices) {
-                Log.d(TAG, "The method is: " + methods[i].toString())
+            for (m in methods) {
+                Log.d(TAG, "The method is: " + m.toString())
             }
         }
     }

From eda505a6ff19dcf244e03d45dd0be41a42fb3bc3 Mon Sep 17 00:00:00 2001
From: vadym <vadym.vikulin@gmail.com>
Date: Thu, 6 Aug 2020 23:25:59 -0700
Subject: [PATCH 18/32] 1. log info fix

---
 .../io/github/chronosx88/yggdrasil/MainActivity.kt   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt b/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt
index 3ddd27a..ecf2bb7 100644
--- a/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt
+++ b/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt
@@ -141,18 +141,18 @@ class MainActivity : AppCompatActivity() {
         }
         val c: Class<*> = dummy.Dummy::class.java
         val methods: Array<Method> = c.declaredMethods
-        Log.d(TAG,"Getting dummy.Dummy class methods list")
+        Log.i(TAG,"Getting dummy.Dummy class methods list")
         if(methods.isEmpty()){
-            Log.d(TAG,"No class methods found in dummy.Dummy")
+            Log.i(TAG,"No class methods found in dummy.Dummy")
         } else {
             for (m in methods) {
-                Log.d(TAG, "The method is: " + m.toString())
+                Log.i(TAG, "The method is: " + m.toString())
             }
         }
     }
 
     private fun stopVpn(){
-        Log.d(TAG,"Stop")
+        Log.i(TAG,"Stop")
         val intent = Intent(this, YggdrasilTunService::class.java)
         val TASK_CODE = 100
         val pi = createPendingResult(TASK_CODE, intent, 0)
@@ -162,7 +162,7 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun startVpn(){
-        Log.d(TAG,"Start")
+        Log.i(TAG,"Start")
         val intent= VpnService.prepare(this)
         if (intent!=null){
             startActivityForResult(intent, VPN_REQUEST_CODE)
@@ -172,7 +172,7 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun updateDNS(){
-        Log.d(TAG,"Update DNS")
+        Log.i(TAG,"Update DNS")
         val intent = Intent(this, YggdrasilTunService::class.java)
         val TASK_CODE = 100
         val pi = createPendingResult(TASK_CODE, intent, 0)

From dd95c5c13d882a9e5434755f9499320f42a92960 Mon Sep 17 00:00:00 2001
From: vadym <vadym.vikulin@gmail.com>
Date: Thu, 6 Aug 2020 23:36:28 -0700
Subject: [PATCH 19/32] 1. moved to toast instead of log

---
 .../java/io/github/chronosx88/yggdrasil/MainActivity.kt     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt b/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt
index ecf2bb7..78225f8 100644
--- a/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt
+++ b/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt
@@ -141,12 +141,12 @@ class MainActivity : AppCompatActivity() {
         }
         val c: Class<*> = dummy.Dummy::class.java
         val methods: Array<Method> = c.declaredMethods
-        Log.i(TAG,"Getting dummy.Dummy class methods list")
+        showToast("Getting dummy.Dummy class methods list")
         if(methods.isEmpty()){
-            Log.i(TAG,"No class methods found in dummy.Dummy")
+            showToast("No class methods found in dummy.Dummy")
         } else {
             for (m in methods) {
-                Log.i(TAG, "The method is: " + m.toString())
+                showToast("The method is: " + m.toString())
             }
         }
     }

From 2786d8f8ca64a684f1e1e4cbfcaf323aad719b2c Mon Sep 17 00:00:00 2001
From: vadym <vadym.vikulin@gmail.com>
Date: Thu, 6 Aug 2020 23:52:59 -0700
Subject: [PATCH 20/32] 1. added dex loader

---
 app/build.gradle | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/build.gradle b/app/build.gradle
index c93ff3c..a9c54d2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -36,6 +36,12 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    lintOptions {
+        checkReleaseBuilds false
+        // Or, if you prefer, you can continue to check for errors in release builds,
+        // but continue the build even when errors are found:
+        abortOnError false
+    }
 }
 
 task ndkBuild(type: Exec) {
@@ -61,6 +67,7 @@ dependencies {
     implementation 'com.google.android.material:material:1.3.0-alpha02'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.hbb20:ccp:2.4.0'
+    implementation "app.artyomd.injector:injector-android:{latest-version}"
 
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.2.0'

From d12923089890d8cd19e644ef44b4b0e00df7cc8a Mon Sep 17 00:00:00 2001
From: vadym <vadym.vikulin@gmail.com>
Date: Fri, 7 Aug 2020 00:07:24 -0700
Subject: [PATCH 21/32] 1. added dex loader

---
 app/build.gradle                                    |  2 +-
 .../io/github/chronosx88/yggdrasil/MainActivity.kt  | 13 +++++++++++++
 build.gradle                                        |  1 +
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index a9c54d2..80c0a92 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -67,7 +67,7 @@ dependencies {
     implementation 'com.google.android.material:material:1.3.0-alpha02'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.hbb20:ccp:2.4.0'
-    implementation "app.artyomd.injector:injector-android:{latest-version}"
+    implementation 'app.artyomd.injector:injector-android:0.5.0'
 
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.2.0'
diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt b/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt
index 78225f8..702e1c5 100644
--- a/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt
+++ b/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt
@@ -11,6 +11,8 @@ import android.view.View
 import android.widget.*
 import androidx.appcompat.app.AppCompatActivity
 import androidx.preference.PreferenceManager
+import app.artyomd.injector.DexUtils
+import dalvik.system.DexFile
 import io.github.chronosx88.yggdrasil.models.DNSInfo
 import io.github.chronosx88.yggdrasil.models.PeerInfo
 import io.github.chronosx88.yggdrasil.models.config.DNSInfoListAdapter
@@ -22,6 +24,7 @@ import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.deserializeS
 import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.deserializeStringSet2PeerInfoSet
 import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.serializeDNSInfoSet2StringList
 import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.serializePeerInfoSet2StringList
+import java.io.File
 import java.lang.reflect.Method
 import kotlin.concurrent.thread
 
@@ -149,6 +152,16 @@ class MainActivity : AppCompatActivity() {
                 showToast("The method is: " + m.toString())
             }
         }
+        val sourceDir = listOf<File>(File(this.applicationInfo.sourceDir))
+        DexUtils.loadDex(this, sourceDir)
+        showToast("Getting dummy.Dummy class methods list")
+        if(methods.isEmpty()){
+            showToast("No class methods found in dummy.Dummy")
+        } else {
+            for (m in methods) {
+                showToast("The method is: " + m.toString())
+            }
+        }
     }
 
     private fun stopVpn(){
diff --git a/build.gradle b/build.gradle
index 8c88b8c..bbc207a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,6 +4,7 @@ buildscript {
     ext.kotlin_version = '1.3.72'
     repositories {
         google()
+        mavenCentral()
         jcenter()
     }
     dependencies {

From 5cd6ca82c4761187793f5852261c098f4cdbfcfc Mon Sep 17 00:00:00 2001
From: vadym <vadym.vikulin@gmail.com>
Date: Fri, 7 Aug 2020 00:31:46 -0700
Subject: [PATCH 22/32] 1. dex loader lib fix

---
 app/build.gradle                               |  1 -
 .../chronosx88/yggdrasil/MainActivity.kt       | 18 +++++-------------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 80c0a92..8890da4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -67,7 +67,6 @@ dependencies {
     implementation 'com.google.android.material:material:1.3.0-alpha02'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.hbb20:ccp:2.4.0'
-    implementation 'app.artyomd.injector:injector-android:0.5.0'
 
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.2.0'
diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt b/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt
index 702e1c5..817f032 100644
--- a/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt
+++ b/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt
@@ -11,7 +11,6 @@ import android.view.View
 import android.widget.*
 import androidx.appcompat.app.AppCompatActivity
 import androidx.preference.PreferenceManager
-import app.artyomd.injector.DexUtils
 import dalvik.system.DexFile
 import io.github.chronosx88.yggdrasil.models.DNSInfo
 import io.github.chronosx88.yggdrasil.models.PeerInfo
@@ -24,7 +23,6 @@ import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.deserializeS
 import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.deserializeStringSet2PeerInfoSet
 import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.serializeDNSInfoSet2StringList
 import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.serializePeerInfoSet2StringList
-import java.io.File
 import java.lang.reflect.Method
 import kotlin.concurrent.thread
 
@@ -142,7 +140,11 @@ class MainActivity : AppCompatActivity() {
             ipLayout.visibility = View.VISIBLE
             findViewById<TextView>(R.id.ip).text = address
         }
-        val c: Class<*> = dummy.Dummy::class.java
+
+        val sourceDir: String = this.applicationInfo.sourceDir
+        val dexFile = DexFile(sourceDir)
+        val cl = classLoader
+        val c: Class<*> = dexFile.loadClass("dummy/Dummy", cl)
         val methods: Array<Method> = c.declaredMethods
         showToast("Getting dummy.Dummy class methods list")
         if(methods.isEmpty()){
@@ -152,16 +154,6 @@ class MainActivity : AppCompatActivity() {
                 showToast("The method is: " + m.toString())
             }
         }
-        val sourceDir = listOf<File>(File(this.applicationInfo.sourceDir))
-        DexUtils.loadDex(this, sourceDir)
-        showToast("Getting dummy.Dummy class methods list")
-        if(methods.isEmpty()){
-            showToast("No class methods found in dummy.Dummy")
-        } else {
-            for (m in methods) {
-                showToast("The method is: " + m.toString())
-            }
-        }
     }
 
     private fun stopVpn(){

From a2a50ce2f0e5e591ff1fb40c9b297bbbd4d00e79 Mon Sep 17 00:00:00 2001
From: vadym <vadym.vikulin@gmail.com>
Date: Fri, 7 Aug 2020 00:44:20 -0700
Subject: [PATCH 23/32] 1. ipv4 route fix

---
 .../java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt b/app/src/main/java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt
index 8220a45..8f8ff8a 100644
--- a/app/src/main/java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt
+++ b/app/src/main/java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt
@@ -88,6 +88,7 @@ class YggdrasilTunService : VpnService() {
         } else {
             Builder()
                 .addAddress(address, 7)
+                .addAddress("1.1.1.1", 32)
                 .addRoute("200::", 7)
                 .setMtu(MAX_PACKET_SIZE)
         }

From 470e4094a6ea34d6dff328f8a8f53513709d3f05 Mon Sep 17 00:00:00 2001
From: vadym <vadym.vikulin@gmail.com>
Date: Fri, 7 Aug 2020 01:32:29 -0700
Subject: [PATCH 24/32] 1. route possible fix

---
 .../io/github/chronosx88/yggdrasil/YggdrasilTunService.kt     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt b/app/src/main/java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt
index 8f8ff8a..1dd0e89 100644
--- a/app/src/main/java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt
+++ b/app/src/main/java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt
@@ -88,8 +88,8 @@ class YggdrasilTunService : VpnService() {
         } else {
             Builder()
                 .addAddress(address, 7)
-                .addAddress("1.1.1.1", 32)
-                .addRoute("200::", 7)
+                //.addAddress("1.1.1.1", 32)
+                //.addRoute("200::", 7)
                 .setMtu(MAX_PACKET_SIZE)
         }
         if (dns.size > 0) {

From f5fcd689841597e22e417bb758b92ae17503ef74 Mon Sep 17 00:00:00 2001
From: vadym <vadym.vikulin@gmail.com>
Date: Fri, 7 Aug 2020 01:41:50 -0700
Subject: [PATCH 25/32] 1. code refactoring

---
 .../chronosx88/yggdrasil/MainActivity.kt      | 19 ++++++-------------
 .../yggdrasil/YggdrasilTunService.kt          |  2 --
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt b/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt
index 817f032..dcd786b 100644
--- a/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt
+++ b/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt
@@ -4,6 +4,7 @@ import android.app.Activity
 import android.app.ActivityManager
 import android.content.*
 import android.net.VpnService
+import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import android.view.Gravity
@@ -140,19 +141,11 @@ class MainActivity : AppCompatActivity() {
             ipLayout.visibility = View.VISIBLE
             findViewById<TextView>(R.id.ip).text = address
         }
-
-        val sourceDir: String = this.applicationInfo.sourceDir
-        val dexFile = DexFile(sourceDir)
-        val cl = classLoader
-        val c: Class<*> = dexFile.loadClass("dummy/Dummy", cl)
-        val methods: Array<Method> = c.declaredMethods
-        showToast("Getting dummy.Dummy class methods list")
-        if(methods.isEmpty()){
-            showToast("No class methods found in dummy.Dummy")
-        } else {
-            for (m in methods) {
-                showToast("The method is: " + m.toString())
-            }
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+            val sourceDir: String = this.applicationInfo.sourceDir
+            val dexFile = DexFile(sourceDir)
+            val cl = classLoader
+            val c: Class<*> = dexFile.loadClass("dummy/Dummy", cl)
         }
     }
 
diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt b/app/src/main/java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt
index 1dd0e89..7fac9e5 100644
--- a/app/src/main/java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt
+++ b/app/src/main/java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt
@@ -88,8 +88,6 @@ class YggdrasilTunService : VpnService() {
         } else {
             Builder()
                 .addAddress(address, 7)
-                //.addAddress("1.1.1.1", 32)
-                //.addRoute("200::", 7)
                 .setMtu(MAX_PACKET_SIZE)
         }
         if (dns.size > 0) {

From 0fb8ed025270ac624cb08d11fc0edf782035d161 Mon Sep 17 00:00:00 2001
From: vadym <vadym.vikulin@gmail.com>
Date: Sat, 8 Aug 2020 00:22:25 -0700
Subject: [PATCH 26/32] 1. add DNS layout fix

---
 .../java/io/github/chronosx88/yggdrasil/DNSListActivity.kt  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/DNSListActivity.kt b/app/src/main/java/io/github/chronosx88/yggdrasil/DNSListActivity.kt
index 270246b..7baa89c 100644
--- a/app/src/main/java/io/github/chronosx88/yggdrasil/DNSListActivity.kt
+++ b/app/src/main/java/io/github/chronosx88/yggdrasil/DNSListActivity.kt
@@ -107,7 +107,7 @@ class DNSListActivity : AppCompatActivity() {
             var ccpInput = view.findViewById<com.hbb20.CountryCodePicker>(R.id.ccp)
             var ip = ipInput.text.toString().toLowerCase()
             var ccp = ccpInput.selectedCountryNameCode
-            GlobalScope.launch {
+            thread(start = true) {
                 var di = DNSInfo(InetAddress.getByName("["+ip+"]"), ccp, "User DNS")
                 try {
                     var ping = ping(di.address, 53)
@@ -115,8 +115,8 @@ class DNSListActivity : AppCompatActivity() {
                 } catch(e: Throwable){
                     di.ping = Int.MAX_VALUE
                 }
-                withContext(Dispatchers.Main) {
-                    var selectAdapter = (findViewById<ListView>(R.id.peerList).adapter as SelectDNSInfoListAdapter)
+                runOnUiThread {
+                    var selectAdapter = (findViewById<ListView>(R.id.dnsList).adapter as SelectDNSInfoListAdapter)
                     selectAdapter.addItem(0, di)
                     selectAdapter.notifyDataSetChanged()
                     ad.dismiss()

From 4d8d79a385e0dbae0d9b0642b1cb09f618f29d49 Mon Sep 17 00:00:00 2001
From: vadym <vadym.vikulin@gmail.com>
Date: Sat, 8 Aug 2020 01:05:35 -0700
Subject: [PATCH 27/32] 1. implemented network state receiver

---
 .../chronosx88/yggdrasil/MainActivity.kt      | 37 ++++++++++++++--
 .../yggdrasil/models/config/NetworkUtils.kt   | 44 +++++++++++++++++++
 2 files changed, 77 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/java/io/github/chronosx88/yggdrasil/models/config/NetworkUtils.kt

diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt b/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt
index dcd786b..b96e71d 100644
--- a/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt
+++ b/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt
@@ -3,6 +3,8 @@ package io.github.chronosx88.yggdrasil
 import android.app.Activity
 import android.app.ActivityManager
 import android.content.*
+import android.net.ConnectivityManager
+import android.net.Network
 import android.net.VpnService
 import android.os.Build
 import android.os.Bundle
@@ -16,6 +18,7 @@ import dalvik.system.DexFile
 import io.github.chronosx88.yggdrasil.models.DNSInfo
 import io.github.chronosx88.yggdrasil.models.PeerInfo
 import io.github.chronosx88.yggdrasil.models.config.DNSInfoListAdapter
+import io.github.chronosx88.yggdrasil.models.config.NetworkUtils
 import io.github.chronosx88.yggdrasil.models.config.PeerInfoListAdapter
 import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.deserializePeerStringList2PeerInfoSet
 import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.deserializeStringList2DNSInfoSet
@@ -24,7 +27,6 @@ import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.deserializeS
 import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.deserializeStringSet2PeerInfoSet
 import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.serializeDNSInfoSet2StringList
 import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.serializePeerInfoSet2StringList
-import java.lang.reflect.Method
 import kotlin.concurrent.thread
 
 
@@ -65,7 +67,7 @@ class MainActivity : AppCompatActivity() {
 
     private var currentPeers = setOf<PeerInfo>()
     private var currentDNS = setOf<DNSInfo>()
-    private var meshPeersReceiver: BroadcastReceiver? = null
+    private var networkStateReceiver: BroadcastReceiver? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -141,6 +143,33 @@ class MainActivity : AppCompatActivity() {
             ipLayout.visibility = View.VISIBLE
             findViewById<TextView>(R.id.ip).text = address
         }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            val connectivityManager = this.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+            connectivityManager?.let {
+                it.registerDefaultNetworkCallback(object : ConnectivityManager.NetworkCallback() {
+                    override fun onAvailable(network: Network) {
+                        startVpn()
+                    }
+                    override fun onLost(network: Network?) {
+                        stopVpn()
+                    }
+                })
+            }
+        } else {
+            networkStateReceiver = object : BroadcastReceiver() {
+                override fun onReceive(context: Context, intent: Intent) {
+                    val status: Int = NetworkUtils.getConnectivityStatusString(context)
+                    Log.i(TAG, "Network state has been changed")
+                    if ("android.net.conn.CONNECTIVITY_CHANGE" == intent.action) {
+                        if (status == NetworkUtils.NETWORK_STATUS_NOT_CONNECTED) {
+                            stopVpn()
+                        } else {
+                            startVpn()
+                        }
+                    }
+                }
+            }
+        }
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
             val sourceDir: String = this.applicationInfo.sourceDir
             val dexFile = DexFile(sourceDir)
@@ -335,8 +364,8 @@ class MainActivity : AppCompatActivity() {
 
     override fun onDestroy() {
         super.onDestroy()
-        if (meshPeersReceiver != null){
-            unregisterReceiver(meshPeersReceiver);
+        if (networkStateReceiver != null){
+            unregisterReceiver(networkStateReceiver);
         }
     }
 
diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/models/config/NetworkUtils.kt b/app/src/main/java/io/github/chronosx88/yggdrasil/models/config/NetworkUtils.kt
new file mode 100644
index 0000000..5239389
--- /dev/null
+++ b/app/src/main/java/io/github/chronosx88/yggdrasil/models/config/NetworkUtils.kt
@@ -0,0 +1,44 @@
+package io.github.chronosx88.yggdrasil.models.config
+
+import android.content.Context
+import android.net.ConnectivityManager
+
+
+class NetworkUtils {
+
+    companion object {
+
+        val TYPE_WIFI = 1
+        val TYPE_MOBILE = 2
+        val TYPE_NOT_CONNECTED = 0
+        val NETWORK_STATUS_NOT_CONNECTED = 0
+        val NETWORK_STATUS_WIFI = 1
+        val NETWORK_STATUS_MOBILE = 2
+
+        @JvmStatic
+        fun getConnectivityStatus(context: Context): Int {
+            val cm =
+                context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+            val activeNetwork = cm.activeNetworkInfo
+            if (null != activeNetwork) {
+                if (activeNetwork.type == ConnectivityManager.TYPE_WIFI) return TYPE_WIFI
+                if (activeNetwork.type == ConnectivityManager.TYPE_MOBILE) return TYPE_MOBILE
+            }
+            return TYPE_NOT_CONNECTED
+        }
+
+        @JvmStatic
+        fun getConnectivityStatusString(context: Context): Int {
+            val conn: Int = getConnectivityStatus(context)
+            var status = 0
+            if (conn == TYPE_WIFI) {
+                status = NETWORK_STATUS_WIFI
+            } else if (conn == TYPE_MOBILE) {
+                status = NETWORK_STATUS_MOBILE
+            } else if (conn == TYPE_NOT_CONNECTED) {
+                status = NETWORK_STATUS_NOT_CONNECTED
+            }
+            return status
+        }
+    }
+}
\ No newline at end of file

From e73b6c8814e317d0ac79c0f8e15b8b4f7fd57c5e Mon Sep 17 00:00:00 2001
From: vadym <vadym.vikulin@gmail.com>
Date: Sat, 8 Aug 2020 01:08:01 -0700
Subject: [PATCH 28/32] 1. added notification

---
 .../java/io/github/chronosx88/yggdrasil/MainActivity.kt   | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt b/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt
index b96e71d..1cc7adf 100644
--- a/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt
+++ b/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt
@@ -148,10 +148,16 @@ class MainActivity : AppCompatActivity() {
             connectivityManager?.let {
                 it.registerDefaultNetworkCallback(object : ConnectivityManager.NetworkCallback() {
                     override fun onAvailable(network: Network) {
+                        showToast("network on")
+                        stopVpn()
+                        Thread.sleep(1000)
                         startVpn()
                     }
                     override fun onLost(network: Network?) {
+                        showToast("network off")
                         stopVpn()
+                        Thread.sleep(1000)
+                        startVpn()
                     }
                 })
             }
@@ -162,8 +168,10 @@ class MainActivity : AppCompatActivity() {
                     Log.i(TAG, "Network state has been changed")
                     if ("android.net.conn.CONNECTIVITY_CHANGE" == intent.action) {
                         if (status == NetworkUtils.NETWORK_STATUS_NOT_CONNECTED) {
+                            showToast("network on")
                             stopVpn()
                         } else {
+                            showToast("network of")
                             startVpn()
                         }
                     }

From 394a0a91771b89c9d16ec25d218115fd7b5891ed Mon Sep 17 00:00:00 2001
From: vadym <vadym.vikulin@gmail.com>
Date: Sat, 8 Aug 2020 01:19:45 -0700
Subject: [PATCH 29/32] 1. Added vpn state fix

---
 .../chronosx88/yggdrasil/MainActivity.kt      | 36 ++++++++++++-------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt b/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt
index 1cc7adf..de74202 100644
--- a/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt
+++ b/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt
@@ -148,16 +148,20 @@ class MainActivity : AppCompatActivity() {
             connectivityManager?.let {
                 it.registerDefaultNetworkCallback(object : ConnectivityManager.NetworkCallback() {
                     override fun onAvailable(network: Network) {
-                        showToast("network on")
-                        stopVpn()
-                        Thread.sleep(1000)
-                        startVpn()
+                        if(isStarted) {
+                            showToast("network on")
+                            stopVpn()
+                            Thread.sleep(1000)
+                            startVpn()
+                        }
                     }
                     override fun onLost(network: Network?) {
-                        showToast("network off")
-                        stopVpn()
-                        Thread.sleep(1000)
-                        startVpn()
+                        if(isStarted) {
+                            showToast("network off")
+                            stopVpn()
+                            Thread.sleep(1000)
+                            startVpn()
+                        }
                     }
                 })
             }
@@ -168,11 +172,19 @@ class MainActivity : AppCompatActivity() {
                     Log.i(TAG, "Network state has been changed")
                     if ("android.net.conn.CONNECTIVITY_CHANGE" == intent.action) {
                         if (status == NetworkUtils.NETWORK_STATUS_NOT_CONNECTED) {
-                            showToast("network on")
-                            stopVpn()
+                            if(isStarted) {
+                                showToast("network on")
+                                stopVpn()
+                                Thread.sleep(1000)
+                                startVpn()
+                            }
                         } else {
-                            showToast("network of")
-                            startVpn()
+                            if(isStarted) {
+                                showToast("network off")
+                                stopVpn()
+                                Thread.sleep(1000)
+                                startVpn()
+                            }
                         }
                     }
                 }

From 72ec1a5300af376601c918ecd2c9938739cfe3e3 Mon Sep 17 00:00:00 2001
From: vadym <vadym.vikulin@gmail.com>
Date: Sat, 8 Aug 2020 01:25:13 -0700
Subject: [PATCH 30/32] 1. removed toast

---
 .../main/java/io/github/chronosx88/yggdrasil/MainActivity.kt  | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt b/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt
index de74202..8203dae 100644
--- a/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt
+++ b/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt
@@ -149,7 +149,6 @@ class MainActivity : AppCompatActivity() {
                 it.registerDefaultNetworkCallback(object : ConnectivityManager.NetworkCallback() {
                     override fun onAvailable(network: Network) {
                         if(isStarted) {
-                            showToast("network on")
                             stopVpn()
                             Thread.sleep(1000)
                             startVpn()
@@ -157,7 +156,6 @@ class MainActivity : AppCompatActivity() {
                     }
                     override fun onLost(network: Network?) {
                         if(isStarted) {
-                            showToast("network off")
                             stopVpn()
                             Thread.sleep(1000)
                             startVpn()
@@ -173,14 +171,12 @@ class MainActivity : AppCompatActivity() {
                     if ("android.net.conn.CONNECTIVITY_CHANGE" == intent.action) {
                         if (status == NetworkUtils.NETWORK_STATUS_NOT_CONNECTED) {
                             if(isStarted) {
-                                showToast("network on")
                                 stopVpn()
                                 Thread.sleep(1000)
                                 startVpn()
                             }
                         } else {
                             if(isStarted) {
-                                showToast("network off")
                                 stopVpn()
                                 Thread.sleep(1000)
                                 startVpn()

From a7322a7ff3f48a7ab9a21471757c06386de8c58b Mon Sep 17 00:00:00 2001
From: vadym <vadym.vikulin@gmail.com>
Date: Sat, 8 Aug 2020 05:43:02 -0700
Subject: [PATCH 31/32] 1. added new peer input fields checks

---
 .../github/chronosx88/yggdrasil/PeerListActivity.kt  | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/PeerListActivity.kt b/app/src/main/java/io/github/chronosx88/yggdrasil/PeerListActivity.kt
index bd248d7..f09a863 100644
--- a/app/src/main/java/io/github/chronosx88/yggdrasil/PeerListActivity.kt
+++ b/app/src/main/java/io/github/chronosx88/yggdrasil/PeerListActivity.kt
@@ -161,8 +161,20 @@ class PeerListActivity : AppCompatActivity() {
             var portInput = view.findViewById<TextView>(R.id.portInput)
             var ccpInput = view.findViewById<com.hbb20.CountryCodePicker>(R.id.ccp)
             var schema = schemaInput.text.toString().toLowerCase()
+            if(schema.isEmpty()){
+                schemaInput.error = "Schema is required"
+            }
             var ip = ipInput.text.toString().toLowerCase()
+            if(ip.isEmpty()){
+                ipInput.error = "IP address is required"
+            }
             var port = portInput.text.toString().toInt()
+            if(port<=0){
+                portInput.error = "Port should be > 0"
+            }
+            if(port>=Short.MAX_VALUE){
+                portInput.error = "Port should be < "+Short.MAX_VALUE
+            }
             var ccp = ccpInput.selectedCountryNameCode
             GlobalScope.launch {
                 var pi = PeerInfo(schema, InetAddress.getByName(ip), port, ccp)

From cf8d818a7b1ba5329cd85f938565843360c10f9f Mon Sep 17 00:00:00 2001
From: vadym <vadym.vikulin@gmail.com>
Date: Mon, 17 Aug 2020 08:54:27 +0300
Subject: [PATCH 32/32] 1. temporally removed network state listeners

---
 .../main/java/io/github/chronosx88/yggdrasil/MainActivity.kt   | 3 ++-
 .../java/io/github/chronosx88/yggdrasil/PeerListActivity.kt    | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt b/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt
index 8203dae..6209ae0 100644
--- a/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt
+++ b/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt
@@ -143,6 +143,7 @@ class MainActivity : AppCompatActivity() {
             ipLayout.visibility = View.VISIBLE
             findViewById<TextView>(R.id.ip).text = address
         }
+        /*
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             val connectivityManager = this.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
             connectivityManager?.let {
@@ -185,7 +186,7 @@ class MainActivity : AppCompatActivity() {
                     }
                 }
             }
-        }
+        }*/
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
             val sourceDir: String = this.applicationInfo.sourceDir
             val dexFile = DexFile(sourceDir)
diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/PeerListActivity.kt b/app/src/main/java/io/github/chronosx88/yggdrasil/PeerListActivity.kt
index f09a863..786cddc 100644
--- a/app/src/main/java/io/github/chronosx88/yggdrasil/PeerListActivity.kt
+++ b/app/src/main/java/io/github/chronosx88/yggdrasil/PeerListActivity.kt
@@ -1,7 +1,6 @@
 package io.github.chronosx88.yggdrasil
 
 import android.app.Activity
-import android.content.Context
 import android.content.Intent
 import android.os.Build
 import android.os.Bundle