One fix and updates for F-Droid. (#50)

Fixed password getter (crashes for old configs). Changed publishing material for F-Droid. Incremented version.
yggdrasil-network · Oct 29, 2023 · 8dfa2f6 · 8dfa2f6
1 parent f4e1a75
commit 8dfa2f6
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 6 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "eu.neilalexander.yggdrasil"
         minSdkVersion 21
         targetSdkVersion 33
-        versionCode 14
-        versionName "0.1-014"
+        versionCode 15
+        versionName "0.1-015"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/app/src/main/java/eu/neilalexander/yggdrasil/ConfigurationProxy.kt b/app/src/main/java/eu/neilalexander/yggdrasil/ConfigurationProxy.kt
@@ -95,7 +95,7 @@ object ConfigurationProxy {
         }
 
     var multicastPassword: String
-        get() = (json.getJSONArray("MulticastInterfaces").get(0) as JSONObject).getString("Password")
+        get() = (json.getJSONArray("MulticastInterfaces").get(0) as JSONObject).optString("Password")
         set(value) {
             updateJSON { json ->
                 (json.getJSONArray("MulticastInterfaces").get(0) as JSONObject).put("Password", value)

diff --git a/app/src/main/java/eu/neilalexander/yggdrasil/DnsActivity.kt b/app/src/main/java/eu/neilalexander/yggdrasil/DnsActivity.kt
@@ -127,7 +127,7 @@ class DnsActivity : AppCompatActivity() {
                     view.findViewById<ImageButton>(R.id.deletePeerButton).tag = i
 
                     view.findViewById<ImageButton>(R.id.deletePeerButton).setOnClickListener { button ->
-                        val builder: AlertDialog.Builder = AlertDialog.Builder(this)
+                        val builder: AlertDialog.Builder = AlertDialog.Builder(ContextThemeWrapper(this, R.style.Theme_MaterialComponents_DayNight_Dialog))
                         builder.setTitle(getString(R.string.dns_remove_title, server))
                         builder.setPositiveButton(getString(R.string.remove)) { dialog, _ ->
                             servers.removeAt(button.tag as Int)
@@ -175,7 +175,7 @@ class DnsActivity : AppCompatActivity() {
                 }
             }
             view.setOnLongClickListener {
-                val builder: AlertDialog.Builder = AlertDialog.Builder(this)
+                val builder: AlertDialog.Builder = AlertDialog.Builder(ContextThemeWrapper(this, R.style.Theme_MaterialComponents_DayNight_Dialog))
                 builder.setTitle(getString(R.string.dns_server_info_dialog_title))
                 builder.setMessage("${infoPair.first}\n\n${infoPair.second}")
                 builder.setPositiveButton(getString(R.string.ok)) { dialog, _ ->

diff --git a/fastlane/metadata/android/en-US/changelogs/15.txt b/fastlane/metadata/android/en-US/changelogs/15.txt
@@ -0,0 +1,3 @@
+* Updated core Yggdrasil library to 0.5.1
+* Updated UI to reflect changes in new version
+* Fixed small bugs in UI
diff --git a/fastlane/metadata/android/en-US/images/featureGraphic.png b/fastlane/metadata/android/en-US/images/featureGraphic.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png
diff --git a/fastlane/metadata/android/ru/changelogs/15.txt b/fastlane/metadata/android/ru/changelogs/15.txt
@@ -0,0 +1,3 @@
+* Обновлена библиотека Yggdrasil до 0.5.1
+* Обновлен интерфейс в соответствии с новой версией библиотеки
+* Сделаны небольшие исправления в интерфейсе
diff --git a/fastlane/metadata/android/ru/images/featureGraphic.png b/fastlane/metadata/android/ru/images/featureGraphic.png
diff --git a/fastlane/metadata/android/ru/images/phoneScreenshots/1.png b/fastlane/metadata/android/ru/images/phoneScreenshots/1.png
diff --git a/fastlane/metadata/android/ru/images/phoneScreenshots/2.png b/fastlane/metadata/android/ru/images/phoneScreenshots/2.png
diff --git a/libs/yggdrasil-go b/libs/yggdrasil-go