ChronosXYZ/crispa-android
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/crispa-android.git synced 2024-11-09 20:11:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #76 from vikulin/master

Browse Source 
v2.1.3
This commit is contained in:
Vadym Vikulin 2022-11-25 15:54:18 +02:00 committed by GitHub
commit 2b2b63b85f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/build.gradle
View File

@ -6,14 +6,15 @@ def acraSecretsProperties = new Properties()
acraSecretsProperties.load(new FileInputStream(acraSecretsPropertiesFile)) acraSecretsProperties.load(new FileInputStream(acraSecretsPropertiesFile))
android { android {
compileSdkVersion 32 compileSdkVersion 29
defaultConfig { defaultConfig {
applicationId "io.github.chronosx88.yggdrasil" applicationId "io.github.chronosx88.yggdrasil"
minSdkVersion 15 minSdkVersion 15
targetSdkVersion 32 //noinspection ExpiredTargetSdkVersion
targetSdkVersion 29
versionCode 39 versionCode 40
versionName "2.1.2" versionName "2.1.3"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
setProperty("archivesBaseName", project.getParent().name+"-"+versionName) setProperty("archivesBaseName", project.getParent().name+"-"+versionName)
@ -73,19 +74,19 @@ gradle.projectsEvaluated {
dependencies { dependencies {
implementation 'ch.acra:acra-http:5.8.3' implementation 'ch.acra:acra-http:5.9.6'
implementation 'ch.acra:acra-dialog:5.8.3' implementation 'ch.acra:acra-dialog:5.9.6'
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation project(path: ':yggdrasil') implementation project(path: ':yggdrasil')
implementation 'androidx.appcompat:appcompat:1.4.1' implementation 'androidx.appcompat:appcompat:1.5.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.3' implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.preference:preference-ktx:1.2.0' implementation 'androidx.preference:preference-ktx:1.2.0'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2' implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2'
implementation 'com.google.android.material:material:1.7.0-alpha01' implementation 'com.google.android.material:material:1.8.0-alpha03'
implementation 'com.google.code.gson:gson:2.8.6' implementation 'com.google.code.gson:gson:2.9.0'
implementation 'com.hbb20:ccp:2.4.0' implementation 'com.hbb20:ccp:2.4.0'
implementation 'com.vincentbrison.openlibraries.android:dualcache:3.1.1' implementation 'com.vincentbrison.openlibraries.android:dualcache:3.1.1'
implementation 'com.vincentbrison.openlibraries.android:dualcache-jsonserializer:3.1.1' implementation 'com.vincentbrison.openlibraries.android:dualcache-jsonserializer:3.1.1'

16
app/src/main/java/org/yggdrasil/app/crispa/DNSListActivity.kt
View File

@ -22,21 +22,7 @@ import kotlin.concurrent.thread
class DNSListActivity : AppCompatActivity() { class DNSListActivity : AppCompatActivity() {
companion object { companion object {
val allDNS = arrayListOf( val allDNS = arrayListOf(emptyList<DNSInfo>())
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")
)
} }
var isLoading = true; var isLoading = true;

3
app/src/main/java/org/yggdrasil/app/crispa/MainActivity.kt
View File

@ -14,6 +14,7 @@ import androidx.appcompat.app.AppCompatActivity
import androidx.appcompat.widget.SwitchCompat import androidx.appcompat.widget.SwitchCompat
import androidx.preference.PreferenceManager import androidx.preference.PreferenceManager
import dalvik.system.DexFile import dalvik.system.DexFile
import mobile.Mobile
import org.yggdrasil.app.crispa.models.DNSInfo import org.yggdrasil.app.crispa.models.DNSInfo
import org.yggdrasil.app.crispa.models.PeerInfo import org.yggdrasil.app.crispa.models.PeerInfo
import org.yggdrasil.app.crispa.models.config.DNSInfoListAdapter import org.yggdrasil.app.crispa.models.config.DNSInfoListAdapter
@ -214,7 +215,7 @@ class MainActivity : AppCompatActivity() {
val c: Class<*> = dexFile.loadClass("dummy/Dummy", cl) val c: Class<*> = dexFile.loadClass("dummy/Dummy", cl)
} }
val versionName = findViewById<Button>(R.id.about) val versionName = findViewById<Button>(R.id.about)
versionName.text = """version:${BuildConfig.VERSION_NAME} build:${BuildConfig.VERSION_CODE}""" versionName.text = """version:${BuildConfig.VERSION_NAME} build:${BuildConfig.VERSION_CODE} core:${Mobile.getVersion()}"""
versionName.setOnClickListener { versionName.setOnClickListener {
val intent = Intent(this@MainActivity, AboutActivity::class.java) val intent = Intent(this@MainActivity, AboutActivity::class.java)
startActivity(intent) startActivity(intent)