Merge pull request #50 from vikulin/master

Yggdrasil upgrade (0.3.16), vikulin#5 issue fix
This commit is contained in:
Vadym Vikulin 2021-03-21 19:31:43 +02:00 committed by GitHub
commit 12a47d2d01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 7 deletions

View File

@ -8,4 +8,7 @@ The application for connecting to Yggdrasil network on Android.
Once connected, you can access yggdrasil public services, as the application has peered automatically to default peers within the application. Once connected, you can access yggdrasil public services, as the application has peered automatically to default peers within the application.
<img src="https://user-images.githubusercontent.com/8705683/87849784-62048a80-c8fc-11ea-8eb0-908e69d7595e.png" alt="" height="500" width=""> <img src="https://user-images.githubusercontent.com/8705683/87849784-62048a80-c8fc-11ea-8eb0-908e69d7595e.png" alt="" height="500" width="">
New builds and updates here:
https://t.me/yggdrasil_android

View File

@ -3,13 +3,13 @@ apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-android-extensions'
android { android {
compileSdkVersion 30 compileSdkVersion 29
defaultConfig { defaultConfig {
applicationId "io.github.chronosx88.yggdrasil" applicationId "io.github.chronosx88.yggdrasil"
minSdkVersion 15 minSdkVersion 15
targetSdkVersion 30 targetSdkVersion 29
versionCode 16 versionCode 18
versionName "1.6" versionName "1.7"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
setProperty("archivesBaseName", project.getParent().name+"-"+versionName) setProperty("archivesBaseName", project.getParent().name+"-"+versionName)
} }

View File

@ -161,7 +161,7 @@ class YggdrasilTunService : VpnService() {
val blackList = arrayListOf<String>() val blackList = arrayListOf<String>()
blackList.add("") blackList.add("")
config["Peers"] = convertPeerInfoSet2PeerIdSet(peers) config["Peers"] = convertPeerInfoSet2PeerIdSet(peers)
config["Listen"] = "" config["Listen"] = arrayListOf<String>()
config["AdminListen"] = "tcp://localhost:9001" config["AdminListen"] = "tcp://localhost:9001"
config["IfName"] = "tun0" config["IfName"] = "tun0"
if(staticIP) { if(staticIP) {

View File

@ -8,7 +8,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.1.1' classpath 'com.android.tools.build:gradle:4.1.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files