Merge pull request #12 from anonaddy/5.4.3

5.4.3
anonaddy · Jan 6, 2025 · 38a38ce · 38a38ce
2 parents 47ede3e + 2a0c069
commit 38a38ce
Show file tree

Hide file tree

Showing 11 changed files with 55 additions and 50 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Changelog
 
+## [v5.4.3] - 2025-01-06
+
+### addy.io
+
+##### Fixed/Improved
+
+- Fixed users not being able to create rules in some cases
+
+### addy.io for Android wearables _(v1.4.9)_
+
+##### Fixed/Improved
+
+- Performance improvements and other things to make the app even smoother
+
 ## [v5.4.2] - 2024-11-17
 
 ### addy.io

diff --git a/anonaddy_shared/build.gradle.kts b/anonaddy_shared/build.gradle.kts
@@ -83,7 +83,7 @@ dependencies {
     implementation("com.github.kittinunf.fuel:fuel:2.3.1")
     implementation("com.google.code.gson:gson:2.11.0")
     implementation("com.github.kittinunf.fuel:fuel-coroutines:2.3.1")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1")
 }
 
 

diff --git a/app-wearos/build.gradle.kts b/app-wearos/build.gradle.kts
@@ -35,9 +35,9 @@ android {
         Reserve the last two digits for a multi-APK variant, 00 for app, 01 for wearOS
          */
 
-        // SDK 34 + v1.4.8 + release 01 + 01 (for wearos)
-        versionCode = 341480101
-        versionName = "1.4.8"
+        // SDK 34 + v1.4.9 + release 01 + 01 (for wearos)
+        versionCode = 341490101
+        versionName = "1.4.9"
         vectorDrawables {
             useSupportLibrary = true
         }
@@ -108,7 +108,7 @@ dependencies {
     implementation("com.google.android.material:material:1.12.0")
     implementation("androidx.compose.material3:material3:$compose_material_version")
     implementation("androidx.core:core-ktx:1.15.0")
-    implementation("com.google.android.gms:play-services-wearable:18.2.0")
+    implementation("com.google.android.gms:play-services-wearable:19.0.0")
     implementation("androidx.legacy:legacy-support-v4:1.0.0")
     implementation("androidx.recyclerview:recyclerview:1.3.2")
     implementation("androidx.wear:wear:1.3.0")
@@ -179,7 +179,7 @@ dependencies {
     // Use to fetch tiles from a tile provider in your tests
     testImplementation("androidx.wear.tiles:tiles-testing:$wear_tiles_version")
 
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-guava:1.9.0")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-guava:1.10.1")
     implementation("androidx.wear.tiles:tiles-proto:$wear_tiles_version")
 
 }
@@ -188,7 +188,7 @@ dependencies {
 // For smooth scrolling
 // https://github.com/google/horologist
 dependencies {
-    implementation("com.google.android.horologist:horologist-compose-layout:0.6.20")
+    implementation("com.google.android.horologist:horologist-compose-layout:0.6.22")
 }
 
 // Splash screen

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -18,10 +18,10 @@ android {
         Reserve the last two digits for a multi-APK variant, 00 for app, 01 for wearOS
          */
 
-        // SDK 35 + v5.4.1 + release 01 + 00 (for app)
-        versionCode = 355420100 // https://developer.android.com/training/wearables/packaging
+        // SDK 35 + v5.4.3 + release 01 + 00 (for app)
+        versionCode = 355430100 // https://developer.android.com/training/wearables/packaging
         // The "v" is important, as the updater class compares with the RSS feed on Github
-        versionName = "v5.4.2"
+        versionName = "v5.4.3"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
@@ -93,14 +93,14 @@ dependencies {
 
 dependencies {
     implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
-    implementation("org.jetbrains.kotlin:kotlin-stdlib:2.0.21")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib:2.1.0")
     implementation("androidx.core:core-ktx:1.15.0")
     implementation("androidx.appcompat:appcompat:1.7.0")
     implementation("com.google.android.material:material:1.12.0")
     implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01")
     implementation("androidx.constraintlayout:constraintlayout:2.2.0")
-    implementation("androidx.navigation:navigation-fragment-ktx:2.8.3")
-    implementation("androidx.navigation:navigation-ui-ktx:2.8.3")
+    implementation("androidx.navigation:navigation-fragment-ktx:2.8.5")
+    implementation("androidx.navigation:navigation-ui-ktx:2.8.5")
     implementation("androidx.lifecycle:lifecycle-extensions:2.2.0")
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.2.1")
@@ -111,7 +111,7 @@ dependencies {
 //https://developer.android.com/studio/write/java8-support#library-desugaring
 // For using java.time pre-oreo
 dependencies {
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.3")
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.4")
 }
 
 
@@ -164,7 +164,7 @@ dependencies {
 // Because the app has a gplayless flavor define a gplayImplementation
 val gplayImplementation by configurations
 dependencies {
-    gplayImplementation("com.google.android.gms:play-services-wearable:18.2.0")
+    gplayImplementation("com.google.android.gms:play-services-wearable:19.0.0")
     gplayImplementation("com.android.billingclient:billing-ktx:7.1.1")
     gplayImplementation("com.google.android.play:review-ktx:2.0.2")
 }

diff --git a/app/gplayless/release/app-gplayless-release.apk b/app/gplayless/release/app-gplayless-release.apk
diff --git a/app/gplayless/release/output-metadata.json b/app/gplayless/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 355420100,
-      "versionName": "v5.4.2",
+      "versionCode": 355430100,
+      "versionName": "v5.4.3",
       "outputFile": "app-gplayless-release.apk"
     }
   ],

diff --git a/app/src/main/java/host/stjin/anonaddy/ui/recipients/AddRecipientBottomDialogFragment.kt b/app/src/main/java/host/stjin/anonaddy/ui/recipients/AddRecipientBottomDialogFragment.kt
@@ -52,16 +52,6 @@ class AddRecipientBottomDialogFragment : BaseBottomSheetDialogFragment(), View.O
         listener = parentFragment as AddRecipientBottomDialogListener
 
 
-        //TODO TEST IF THIS IS INDEED NOT REQUIRED ON ANDROID 14 AND OLDER
-//        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-//            binding.bsAddrecipientRecipientDesc.text =
-//                (Html.fromHtml(requireContext().resources.getString(R.string.add_recipient_desc), Html.FROM_HTML_MODE_COMPACT))
-//        } else {
-//            binding.bsAddrecipientRecipientDesc.text =
-//                (Html.fromHtml(requireContext().resources.getString(R.string.add_recipient_desc)))
-//        }
-
-
         // 2. Setup a callback when the "Done" button is pressed on keyboard
         binding.bsAddrecipientRecipientAddRecipientButton.setOnClickListener(this)
         binding.bsAddrecipientRecipientTiet.setOnEditorActionListener { _, actionId, event ->

diff --git a/app/src/main/java/host/stjin/anonaddy/ui/rules/RulesSettingsFragment.kt b/app/src/main/java/host/stjin/anonaddy/ui/rules/RulesSettingsFragment.kt
@@ -245,29 +245,28 @@ class RulesSettingsFragment : Fragment() {
                 }
 
                 if (list != null) {
+                    setRulesAdapter(recipients, list)
+                } else {
 
-                    if (list.size == 0) {
+                    if (error == "404") {
                         binding.fragmentManageRulesLL1.visibility = View.GONE
                         binding.root.findViewById<View>(R.id.fragment_content_unavailable).visibility = View.VISIBLE
                     } else {
-                        setRulesAdapter(recipients, list)
-
-                    }
-                } else {
-                    if (requireContext().resources.getBoolean(R.bool.isTablet)) {
-                        SnackbarHelper.createSnackbar(
-                            requireContext(),
-                            requireContext().resources.getString(R.string.error_obtaining_rules) + "\n" + error,
-                            (activity as MainActivity).findViewById(R.id.main_container),
-                            LoggingHelper.LOGFILES.DEFAULT
-                        ).show()
-                    } else {
-                        SnackbarHelper.createSnackbar(
-                            requireContext(),
-                            requireContext().resources.getString(R.string.error_obtaining_rules) + "\n" + error,
-                            (activity as RulesSettingsActivity).findViewById(R.id.activity_rules_settings_CL),
-                            LoggingHelper.LOGFILES.DEFAULT
-                        ).show()
+                        if (requireContext().resources.getBoolean(R.bool.isTablet)) {
+                            SnackbarHelper.createSnackbar(
+                                requireContext(),
+                                requireContext().resources.getString(R.string.error_obtaining_rules) + "\n" + error,
+                                (activity as MainActivity).findViewById(R.id.main_container),
+                                LoggingHelper.LOGFILES.DEFAULT
+                            ).show()
+                        } else {
+                            SnackbarHelper.createSnackbar(
+                                requireContext(),
+                                requireContext().resources.getString(R.string.error_obtaining_rules) + "\n" + error,
+                                (activity as RulesSettingsActivity).findViewById(R.id.activity_rules_settings_CL),
+                                LoggingHelper.LOGFILES.DEFAULT
+                            ).show()
+                        }
                     }
 
                     // Show error animations

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -66,9 +66,9 @@
     <string name="on">On</string>
     <string name="system_default">System default</string>
     <string name="app_changelog"><![CDATA[
-<h3>What\'s new in addy.io for Android 5.4.2</h3>
+<h3>What\'s new in addy.io for Android 5.4.3</h3>
 <h4>Fixed/Improved</h4>
-<p>- Fixed crash when logging in using QR code</p>]]></string>
+<p>- Fixed users not being able to create rules in some cases</p>]]></string>
     <string name="addyio_instance_version_unsupported">The version of this addy.io instance is lower than the minimum required version to use this app. You can ignore this message and just use the app, but there is a good chance that some functions will not work.</string>
     <string name="contributors_list">Will Browning (addy.io)\nStjin (lead developer)\nJPH (designer)</string>
     <string name="delete_recipient">Delete recipient</string>

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -5,7 +5,7 @@ buildscript {
         // https://developer.android.com/jetpack/androidx/releases/wear-compose
         set("wear_compose_version", "1.4.0")
         // https://developer.android.com/jetpack/androidx/releases/compose
-        set("compose_version", "1.7.5")
+        set("compose_version", "1.7.6")
         set("compose_compiler_version", "1.5.15")
         // https://developer.android.com/jetpack/androidx/releases/activity
         set("compose_activity_version", "1.9.3")
@@ -22,7 +22,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:8.7.2")
+        classpath("com.android.tools.build:gradle:8.7.3")
         classpath(kotlin("gradle-plugin", version = "2.0.0"))
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/fastlane/metadata/android/en-US/changelogs/355430100.txt b/fastlane/metadata/android/en-US/changelogs/355430100.txt
@@ -0,0 +1,2 @@
+<h4>Fixed/Improved</h4>
+<p>- Fixed users not being able to create rules in some cases</p>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		<h4>Fixed/Improved</h4>
		<p>- Fixed users not being able to create rules in some cases</p>