Merge pull request #81 from vikulin/master

1. ? condition fix after Kotlin upgrade

.idea/gradle.xml

@@ -14,7 +14,6 @@
             <option value="$PROJECT_DIR$/yggdrasil" />
           </set>
         </option>
-        <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
   </component>

app/build.gradle

@@ -6,14 +6,15 @@ def acraSecretsProperties = new Properties()
 acraSecretsProperties.load(new FileInputStream(acraSecretsPropertiesFile))
 
 android {
-    compileSdkVersion 32
+    compileSdkVersion 33
     defaultConfig {
         applicationId "io.github.chronosx88.yggdrasil"
         minSdkVersion 15
-        targetSdkVersion 32
 
-        versionCode 39
+        targetSdkVersion 33
-        versionName "2.1.2"
+
+        versionCode 40
+        versionName "2.1.4"
         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-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 project(path: ':yggdrasil')
 
-    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'androidx.appcompat:appcompat:1.7.0-alpha01'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+    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.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.vincentbrison.openlibraries.android:dualcache:3.1.1'
     implementation 'com.vincentbrison.openlibraries.android:dualcache-jsonserializer:3.1.1'

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(
+        val allDNS = 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;
@@ -131,8 +117,8 @@ class DNSListActivity : AppCompatActivity() {
         val item = menu.findItem(R.id.saveItem) as MenuItem
         item.setActionView(R.layout.menu_save)
         val saveButton = item
-            .actionView.findViewById<Button>(R.id.saveButton)
+            .actionView?.findViewById<Button>(R.id.saveButton)
-        saveButton.setOnClickListener {
+        saveButton?.setOnClickListener {
             if(isLoading){
                 return@setOnClickListener
             }

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<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 {
             val intent = Intent(this@MainActivity, AboutActivity::class.java)
             startActivity(intent)

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

@@ -339,8 +339,8 @@ class PeerListActivity : AppCompatActivity() {
         val item = menu.findItem(R.id.saveItem) as MenuItem
         item.setActionView(R.layout.menu_save)
         val saveButton = item
-            .actionView.findViewById<Button>(R.id.saveButton)
+            .actionView?.findViewById<Button>(R.id.saveButton)
-        saveButton.setOnClickListener {
+        saveButton?.setOnClickListener {
             saveButton.isClickable = false
             cancelPeerListPing()
             val result = Intent(this, MainActivity::class.java)
@@ -354,8 +354,8 @@ class PeerListActivity : AppCompatActivity() {
         val editUrl = menu.findItem(R.id.editUrlItem) as MenuItem
         editUrl.setActionView(R.layout.menu_edit_url)
         val editUrlButton = editUrl
-            .actionView.findViewById<Button>(R.id.editUrlButton)
+            .actionView?.findViewById<Button>(R.id.editUrlButton)
-        editUrlButton.setOnClickListener {
+        editUrlButton?.setOnClickListener {
             editPeerListUrl()
         }
         return true

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.31"
+    ext.kotlin_version = "1.7.21"
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.0'
+        classpath 'com.android.tools.build:gradle:7.2.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong