From ae31223428030a048510569c9459f8085082261a Mon Sep 17 00:00:00 2001 From: vadym Date: Thu, 14 Oct 2021 17:23:44 +0300 Subject: [PATCH 1/2] 1. Seted up extras using Yggdrasil develop branch 2. Fixed https://github.com/yggdrasil-network/yggdrasil-extras/issues/15 3. Used Neils peers list by default --- app/build.gradle | 14 +++++++------- app/src/main/AndroidManifest.xml | 7 ++++--- .../org/yggdrasil/app/crispa/PeerListActivity.kt | 2 +- .../yggdrasil/app/crispa/YggdrasilTunService.kt | 8 +++++++- build.gradle | 4 ++-- 5 files changed, 21 insertions(+), 14 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 6341f23..5852d76 100644 --- a/app/build.gradle +++ b/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 - versionName "2.0.17" + versionCode 36 + 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 'com.google.android.material:material:1.5.0-alpha02' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0' + 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' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 40c30f1..1c87422 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -52,9 +52,10 @@ + android:label="@string/app_name" + android:theme="@style/AppTheme.NoActionBar" + android:screenOrientation="portrait" + android:exported="true"> diff --git a/app/src/main/java/org/yggdrasil/app/crispa/PeerListActivity.kt b/app/src/main/java/org/yggdrasil/app/crispa/PeerListActivity.kt index b3bfe72..77fd41c 100644 --- a/app/src/main/java/org/yggdrasil/app/crispa/PeerListActivity.kt +++ b/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" diff --git a/app/src/main/java/org/yggdrasil/app/crispa/YggdrasilTunService.kt b/app/src/main/java/org/yggdrasil/app/crispa/YggdrasilTunService.kt index 088095f..290deb2 100644 --- a/app/src/main/java/org/yggdrasil/app/crispa/YggdrasilTunService.kt +++ b/app/src/main/java/org/yggdrasil/app/crispa/YggdrasilTunService.kt @@ -164,6 +164,7 @@ class YggdrasilTunService : VpnService() { config["Listen"] = arrayListOf() 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().toMutableMap() + multicastInterface["Regex"] = ".*" + multicastInterface["Beacon"] = true + multicastInterface["Listen"] = true + multicastInterface["Port"] = 0 + (config["MulticastInterfaces"] as MutableList)[0] = multicastInterface //(config["SessionFirewall"] as MutableMap)["AllowFromDirect"] = true //(config["SessionFirewall"] as MutableMap)["AllowFromRemote"] = true //(config["SessionFirewall"] as MutableMap)["AlwaysAllowOutbound"] = true //(config["SessionFirewall"] as MutableMap)["WhitelistEncryptionPublicKeys"] = whiteList //(config["SessionFirewall"] as MutableMap)["BlacklistEncryptionPublicKeys"] = blackList - //(config["SwitchOptions"] as MutableMap)["MaxTotalQueueSize"] = 4194304 if (config["AutoStart"] == null) { val tmpMap = emptyMap().toMutableMap() diff --git a/build.gradle b/build.gradle index d08a479..365c2ec 100644 --- a/build.gradle +++ b/build.gradle @@ -1,12 +1,12 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = "1.5.10" + ext.kotlin_version = "1.5.31" repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.2' + classpath 'com.android.tools.build:gradle:7.0.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong From 24428163727094ab90cc326bd5debf77c12bed91 Mon Sep 17 00:00:00 2001 From: vadym Date: Thu, 14 Oct 2021 18:09:05 +0300 Subject: [PATCH 2/2] kotlin plugin upgrade --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 2f3d35b..6b09d63 100644 --- a/build.gradle +++ b/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() @@ -24,4 +24,4 @@ allprojects { task clean(type: Delete) { delete rootProject.buildDir -} \ No newline at end of file +}