diff --git a/app/build.gradle b/app/build.gradle index 33cea73..61e8d57 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,14 +6,15 @@ def acraSecretsProperties = new Properties() acraSecretsProperties.load(new FileInputStream(acraSecretsPropertiesFile)) android { - compileSdkVersion 32 + compileSdkVersion 29 defaultConfig { applicationId "io.github.chronosx88.yggdrasil" minSdkVersion 15 - targetSdkVersion 32 + //noinspection ExpiredTargetSdkVersion + targetSdkVersion 29 - versionCode 39 - versionName "2.1.2" + versionCode 40 + versionName "2.1.3" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" setProperty("archivesBaseName", project.getParent().name+"-"+versionName) @@ -73,19 +74,19 @@ gradle.projectsEvaluated { dependencies { - implementation 'ch.acra:acra-http:5.8.3' - implementation 'ch.acra:acra-dialog:5.8.3' + implementation 'ch.acra:acra-http:5.9.6' + implementation 'ch.acra:acra-dialog:5.9.6' implementation fileTree(dir: 'libs', include: ['*.jar']) implementation project(path: ':yggdrasil') - implementation 'androidx.appcompat:appcompat:1.4.1' - implementation 'androidx.constraintlayout:constraintlayout:2.1.3' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.preference:preference-ktx:1.2.0' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2' - implementation 'com.google.android.material:material:1.7.0-alpha01' - implementation 'com.google.code.gson:gson:2.8.6' + implementation 'com.google.android.material:material:1.8.0-alpha03' + implementation 'com.google.code.gson:gson:2.9.0' implementation 'com.hbb20:ccp:2.4.0' implementation 'com.vincentbrison.openlibraries.android:dualcache:3.1.1' implementation 'com.vincentbrison.openlibraries.android:dualcache-jsonserializer:3.1.1' diff --git a/app/src/main/java/org/yggdrasil/app/crispa/DNSListActivity.kt b/app/src/main/java/org/yggdrasil/app/crispa/DNSListActivity.kt index 2c468c3..4e3f2b9 100644 --- a/app/src/main/java/org/yggdrasil/app/crispa/DNSListActivity.kt +++ b/app/src/main/java/org/yggdrasil/app/crispa/DNSListActivity.kt @@ -22,21 +22,7 @@ import kotlin.concurrent.thread class DNSListActivity : AppCompatActivity() { companion object { - val allDNS = arrayListOf( - DNSInfo( - InetAddress.getByName("[301:2522::53]"), - "CZ", - "DNS implementation for Yggdrasil. https://github.com/Revertron/wyrd"), - DNSInfo(InetAddress.getByName("[301:2923::53]"), - "SK", - "DNS implementation for Yggdrasil. https://github.com/Revertron/wyrd"), - DNSInfo(InetAddress.getByName("[300:4523::53]"), - "DE", - "DNS implementation for Yggdrasil. https://github.com/Revertron/wyrd"), - DNSInfo(InetAddress.getByName("[303:8b1a::53]"), - "RU", - "DNS implementation for Yggdrasil. https://github.com/Revertron/wyrd") - ) + val allDNS = arrayListOf(emptyList()) } var isLoading = true; diff --git a/app/src/main/java/org/yggdrasil/app/crispa/MainActivity.kt b/app/src/main/java/org/yggdrasil/app/crispa/MainActivity.kt index 7324dbc..d9e8d23 100644 --- a/app/src/main/java/org/yggdrasil/app/crispa/MainActivity.kt +++ b/app/src/main/java/org/yggdrasil/app/crispa/MainActivity.kt @@ -14,6 +14,7 @@ import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.widget.SwitchCompat import androidx.preference.PreferenceManager import dalvik.system.DexFile +import mobile.Mobile import org.yggdrasil.app.crispa.models.DNSInfo import org.yggdrasil.app.crispa.models.PeerInfo import org.yggdrasil.app.crispa.models.config.DNSInfoListAdapter @@ -214,7 +215,7 @@ class MainActivity : AppCompatActivity() { val c: Class<*> = dexFile.loadClass("dummy/Dummy", cl) } val versionName = findViewById