Merge branch 'develop' into master

app/build.gradle

@@ -2,14 +2,14 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
     defaultConfig {
         applicationId "io.github.chronosx88.yggdrasil"
         minSdkVersion 15
-        targetSdkVersion 29
+        targetSdkVersion 31
 
-        versionCode 35
+        versionCode 36
-        versionName "2.0.17"
+        versionName "2.0.18"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         setProperty("archivesBaseName", project.getParent().name+"-"+versionName)
     }
@@ -70,12 +70,12 @@ dependencies {
     implementation project(path: ':yggdrasil')
 
     implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
     implementation 'androidx.preference:preference-ktx:1.1.1'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0'
-    implementation 'com.google.android.material:material:1.5.0-alpha02'
+    implementation 'com.google.android.material:material:1.5.0-alpha04'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.hbb20:ccp:2.4.0'
     implementation 'com.vincentbrison.openlibraries.android:dualcache:3.1.1'

app/src/main/AndroidManifest.xml

@@ -54,7 +54,8 @@
         <activity android:name="org.yggdrasil.app.crispa.MainActivity"
             android:label="@string/app_name"
             android:theme="@style/AppTheme.NoActionBar"
-                android:screenOrientation="portrait">
+            android:screenOrientation="portrait"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

app/src/main/java/org/yggdrasil/app/crispa/PeerListActivity.kt

@@ -43,7 +43,7 @@ class PeerListActivity : AppCompatActivity() {
 
     companion object {
         const val PEER_LIST = "PEER_LIST"
-        const val PEER_LIST_URL = "http://y4.rivchain.org/rest/peers.json"
+        const val PEER_LIST_URL = "https://publicpeers.neilalexander.dev/publicnodes.json"
         const val CACHE_NAME = "PEER_LIST_CACHE"
         const val ONLINE_PEERINFO_LIST = "online_peer_info_list"
         const val OFFLINE_PEERINFO_LIST = "offline_peer_info_list"

app/src/main/java/org/yggdrasil/app/crispa/YggdrasilTunService.kt

@@ -164,6 +164,7 @@ class YggdrasilTunService : VpnService() {
         config["Listen"] = arrayListOf<String>()
         config["AdminListen"] = "tcp://localhost:9001"
         config["IfName"] = "tun0"
+        config["IfMTU"] = 65535
         if(staticIP) {
             val preferences =
                 PreferenceManager.getDefaultSharedPreferences(this.baseContext)
@@ -182,12 +183,17 @@ class YggdrasilTunService : VpnService() {
                 config["PublicKey"] = publicKey
             }
         }
+        var multicastInterface = emptyMap<String, Any>().toMutableMap()
+        multicastInterface["Regex"] = ".*"
+        multicastInterface["Beacon"] = true
+        multicastInterface["Listen"] = true
+        multicastInterface["Port"] = 0
+        (config["MulticastInterfaces"] as MutableList<Any>)[0] = multicastInterface
         //(config["SessionFirewall"] as MutableMap<Any, Any>)["AllowFromDirect"] = true
         //(config["SessionFirewall"] as MutableMap<Any, Any>)["AllowFromRemote"] = true
         //(config["SessionFirewall"] as MutableMap<Any, Any>)["AlwaysAllowOutbound"] = true
         //(config["SessionFirewall"] as MutableMap<Any, Any>)["WhitelistEncryptionPublicKeys"] = whiteList
         //(config["SessionFirewall"] as MutableMap<Any, Any>)["BlacklistEncryptionPublicKeys"] = blackList
-
         //(config["SwitchOptions"] as MutableMap<Any, Any>)["MaxTotalQueueSize"] = 4194304
         if (config["AutoStart"] == null) {
             val tmpMap = emptyMap<String, Boolean>().toMutableMap()

build.gradle

@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "1.5.10"
+    ext.kotlin_version = "1.5.31"
     repositories {
         google()
         mavenCentral()