Merge pull request #19 from anonaddy/5.4.4

5.5.0
anonaddy · Feb 1, 2025 · 5346b90 · 5346b90
2 parents 38a38ce + 64af1b7
commit 5346b90
Show file tree

Hide file tree

Showing 99 changed files with 761 additions and 769 deletions.
diff --git a/.idea/appInsightsSettings.xml b/.idea/appInsightsSettings.xml
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,30 @@
 # Changelog
 
+## [v5.5.0] - 2025-02-01
+
+### addy.io
+
+##### Added
+
+- Added the ability to change the default tab to open on app launch
+- Added the ability to download failed deliveries (if enabled)
+
+##### Fixed/Improved
+
+- Improve wording of dates in alias list
+- Renamed Dashboard to Home to keep consistency with the iOS app
+- Updated dependencies
+
+### addy.io for Android wearables _(v1.5.0)_
+
+##### Fixed/Improved
+
+- Performance improvements and other things to make the app even smoother
+
+##### Removed
+
+- Due to the need for watchfaces to comply with the new WFF format and the low usage of the original watchface, it has been discontinued. However, it is now available as a standalone app on Google Play under the name "Tokens watchface"
+
 ## [v5.4.3] - 2025-01-06
 
 ### addy.io

diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ Easily create and manage your addy.io aliases, recipients and more from your pho
 
 > addy.io
 
-- addy.io instance running v1.3.0 or higher (current version of the addy.io app has been tested with v1.3.0)
+- addy.io instance running v1.3.1 or higher (current version of the addy.io app has been tested with v1.3.1)
 
 > Android
 

diff --git a/anonaddy_shared/build.gradle.kts b/anonaddy_shared/build.gradle.kts
@@ -11,14 +11,6 @@ plugins {
 
 }
 
-composeCompiler {
-    enableStrongSkippingMode = true
-
-
-    reportsDestination = layout.buildDirectory.dir("compose_compiler")
-    //stabilityConfigurationFile = rootProject.layout.projectDirectory.file("stability_config.conf")
-}
-
 android {
     namespace = "host.stjin.anonaddy_shared"
     compileSdk = 35
@@ -62,7 +54,7 @@ dependencies {
 }
 
 dependencies {
-    implementation("com.google.code.gson:gson:2.11.0")
+    implementation("com.google.code.gson:gson:2.12.0")
 
     // Preferences for storing settings (and crypto settings)
     implementation("androidx.preference:preference-ktx:1.2.1")
@@ -81,7 +73,7 @@ dependencies {
 // Fuel, network requests
 dependencies {
     implementation("com.github.kittinunf.fuel:fuel:2.3.1")
-    implementation("com.google.code.gson:gson:2.11.0")
+    implementation("com.google.code.gson:gson:2.12.0")
     implementation("com.github.kittinunf.fuel:fuel-coroutines:2.3.1")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1")
 }

diff --git a/anonaddy_shared/src/main/java/host/stjin/anonaddy_shared/AddyIo.kt b/anonaddy_shared/src/main/java/host/stjin/anonaddy_shared/AddyIo.kt
@@ -9,10 +9,10 @@ object AddyIo {
     // The versioncode is a combination of MAJOR MINOR PATCH
     //TODO Update on every release
 
-    // 1.3.0
+    // 1.3.1
     var MINIMUMVERSIONCODEMAJOR = 1
     var MINIMUMVERSIONCODEMINOR = 3
-    var MINIMUMVERSIONCODEPATCH = 0
+    var MINIMUMVERSIONCODEPATCH = 1
 
     var VERSIONMAJOR = 0
     var VERSIONMINOR = 0

diff --git a/anonaddy_shared/src/main/java/host/stjin/anonaddy_shared/NetworkHelper.kt b/anonaddy_shared/src/main/java/host/stjin/anonaddy_shared/NetworkHelper.kt
@@ -3,6 +3,7 @@
 package host.stjin.anonaddy_shared
 
 import android.content.Context
+import android.os.Environment
 import android.os.Handler
 import android.os.Looper
 import android.util.Log
@@ -12,6 +13,7 @@ import com.einmalfel.earl.Feed
 import com.github.kittinunf.fuel.Fuel
 import com.github.kittinunf.fuel.core.Headers
 import com.github.kittinunf.fuel.core.Response
+import com.github.kittinunf.fuel.coroutines.awaitByteArrayResponseResult
 import com.github.kittinunf.fuel.coroutines.awaitStringResponseResult
 import com.google.gson.Gson
 import host.stjin.anonaddy_shared.AddyIo.API_BASE_URL
@@ -89,6 +91,8 @@ import host.stjin.anonaddy_shared.models.Version
 import host.stjin.anonaddy_shared.utils.LoggingHelper
 import org.json.JSONArray
 import org.json.JSONObject
+import java.io.File
+import java.io.FileOutputStream
 import java.io.InputStream
 
 
@@ -800,7 +804,7 @@ class NetworkHelper(private val context: Context) {
         domain: String,
         description: String,
         format: String,
-        local_part: String,
+        aliasLocalPart: String,
         recipients: ArrayList<String>?
     ) {
 
@@ -820,7 +824,7 @@ class NetworkHelper(private val context: Context) {
         json.put("domain", domain)
         json.put("description", description)
         json.put("format", format)
-        json.put("local_part", local_part)
+        json.put("local_part", aliasLocalPart)
         json.put("recipient_ids", array)
 
 
@@ -5000,6 +5004,73 @@ class NetworkHelper(private val context: Context) {
         }
     }
 
+    suspend fun downloadSpecificFailedDelivery(
+        context: Context,
+        callback: (File?, String?) -> Unit,
+        id: String
+    ) {
+        if (BuildConfig.DEBUG) {
+            println("${object {}.javaClass.enclosingMethod?.name} called from ${Thread.currentThread().stackTrace[3].className};${Thread.currentThread().stackTrace[3].methodName}")
+        }
+
+        val (_, response, result) = Fuel.get("${API_URL_FAILED_DELIVERIES}/$id/download")
+            .appendHeader(
+                *getHeaders()
+            )
+            .awaitByteArrayResponseResult()
+
+
+        when (response.statusCode) {
+            200 -> {
+                val directory = context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS)
+                val file = File(directory, "$id.eml")
+                try {
+                    FileOutputStream(file).use { fileOut ->
+                        fileOut.write(result.get())
+                    }
+                    callback(file, null)
+                } catch (e: Exception) {
+                    loggingHelper.addLog(
+                        LOGIMPORTANCE.CRITICAL.int,
+                        e.message ?: "Unknown error",
+                        "downloadSpecificFailedDelivery",
+                        ErrorHelper.getErrorMessage(e.toString().toByteArray())
+                    )
+                    callback(null, "Error saving file: ${e.message}")
+                }
+            }
+
+            401 -> {
+                invalidApiKey()
+                Handler(Looper.getMainLooper()).postDelayed({
+                    // Unauthenticated, clear settings
+                    SettingsManager(true, context).clearSettingsAndCloseApp()
+                }, 5000)
+                callback(null, null)
+            }
+
+            else -> {
+                val ex = result.component2()?.message
+                val fuelResponse = getFuelResponse(response) ?: ex.toString().toByteArray()
+                Log.e("AFA", "${response.statusCode} - $ex")
+                loggingHelper.addLog(
+                    LOGIMPORTANCE.CRITICAL.int,
+                    ex.toString(),
+                    "downloadSpecificFailedDelivery",
+                    ErrorHelper.getErrorMessage(
+                        fuelResponse
+                    )
+                )
+                callback(
+                    null,
+                    ErrorHelper.getErrorMessage(
+                        fuelResponse
+                    )
+                )
+            }
+        }
+    }
+
     suspend fun deleteFailedDelivery(
         callback: (String?) -> Unit,
         id: String

diff --git a/anonaddy_shared/src/main/java/host/stjin/anonaddy_shared/managers/SettingsManager.kt b/anonaddy_shared/src/main/java/host/stjin/anonaddy_shared/managers/SettingsManager.kt
@@ -41,6 +41,7 @@ class SettingsManager(encrypt: Boolean, private val context: Context) {
         NOTIFY_SUBSCRIPTION_EXPIRY(false, PREFTYPES.BOOLEAN, "notify_subscription_expiry"),
         MAILTO_ACTIVITY_SHOW_SUGGESTIONS(false, PREFTYPES.BOOLEAN, "mailto_activity_show_suggestions"),
         TIMES_THE_APP_HAS_BEEN_OPENED(false, PREFTYPES.INT, "times_the_app_has_been_opened"),
+        STARTUP_PAGE(false, PREFTYPES.STRING, "startup_page"),
 
         // Sorting and Filtering for aliasFragment
         ALIAS_SORT_FILTER(false, PREFTYPES.STRING, "alias_sort_filter"),
@@ -150,8 +151,8 @@ class SettingsManager(encrypt: Boolean, private val context: Context) {
         prefs.edit().putString(key.key, string).apply()
     }
 
-    fun getSettingsString(key: PREFS): String? {
-        return prefs.getString(key.key, null)
+    fun getSettingsString(key: PREFS, default: String? = null): String? {
+        return prefs.getString(key.key, default)
     }
 
     fun putSettingsInt(key: PREFS, int: Int) {

diff --git a/anonaddy_shared/src/main/java/host/stjin/anonaddy_shared/models/AccountNotifications.kt b/anonaddy_shared/src/main/java/host/stjin/anonaddy_shared/models/AccountNotifications.kt
@@ -4,6 +4,7 @@ data class AccountNotificationsArray(
     val `data`: List<AccountNotifications>
 )
 
+@Suppress("PropertyName", "PropertyName")
 data class AccountNotifications(
     val category: String,
     val created_at: String,

diff --git a/anonaddy_shared/src/main/java/host/stjin/anonaddy_shared/models/Aliases.kt b/anonaddy_shared/src/main/java/host/stjin/anonaddy_shared/models/Aliases.kt
@@ -14,6 +14,8 @@ data class SingleAlias(
     val `data`: Aliases
 )
 
+
+@Suppress("PropertyName", "PropertyName")
 data class Aliases(
     val id: String,
     val user_id: String,
@@ -40,6 +42,7 @@ data class Aliases(
     var deleted_at: String?
 )
 
+@Suppress("PropertyName", "PropertyName")
 data class Meta(
     val current_page: Int,
     val from: Int?,

diff --git a/anonaddy_shared/src/main/java/host/stjin/anonaddy_shared/models/ApiTokenDetails.kt b/anonaddy_shared/src/main/java/host/stjin/anonaddy_shared/models/ApiTokenDetails.kt
@@ -1,5 +1,6 @@
 package host.stjin.anonaddy_shared.models
 
+@Suppress("PropertyName", "PropertyName")
 data class ApiTokenDetails(
     val created_at: String,
     val expires_at: String?,

diff --git a/anonaddy_shared/src/main/java/host/stjin/anonaddy_shared/models/Domains.kt b/anonaddy_shared/src/main/java/host/stjin/anonaddy_shared/models/Domains.kt
@@ -8,6 +8,7 @@ data class SingleDomain(
     val `data`: Domains
 )
 
+@Suppress("PropertyName", "PropertyName")
 data class Domains(
     val id: String,
     val user_id: String,

diff --git a/anonaddy_shared/src/main/java/host/stjin/anonaddy_shared/models/FailedDeliveries.kt b/anonaddy_shared/src/main/java/host/stjin/anonaddy_shared/models/FailedDeliveries.kt
@@ -9,6 +9,7 @@ data class SingleFailedDelivery(
     val `data`: FailedDeliveries
 )
 
+@Suppress("PropertyName", "PropertyName")
 data class FailedDeliveries(
     val id: String,
     val user_id: String,
@@ -22,6 +23,7 @@ data class FailedDeliveries(
     val email_type: String,
     val status: String,
     val code: String,
+    val is_stored: Boolean,
     val attempted_at: String,
     val created_at: String,
     val updated_at: String

diff --git a/anonaddy_shared/src/main/java/host/stjin/anonaddy_shared/models/Login.kt b/anonaddy_shared/src/main/java/host/stjin/anonaddy_shared/models/Login.kt
@@ -1,6 +1,7 @@
 package host.stjin.anonaddy_shared.models
 
 
+@Suppress("PropertyName", "PropertyName")
 // Login data class representing the successful login response
 data class Login(
     val api_key: String,
@@ -9,6 +10,7 @@ data class Login(
     val expires_at: String?
 )
 
+@Suppress("PropertyName", "PropertyName")
 // LoginMfaRequired data class for when MFA is required
 data class LoginMfaRequired(
     val message: String,

diff --git a/anonaddy_shared/src/main/java/host/stjin/anonaddy_shared/models/Recipients.kt b/anonaddy_shared/src/main/java/host/stjin/anonaddy_shared/models/Recipients.kt
@@ -8,6 +8,7 @@ data class SingleRecipient(
     val `data`: Recipients
 )
 
+@Suppress("PropertyName", "PropertyName")
 data class Recipients(
     val id: String,
     val user_id: String,

diff --git a/anonaddy_shared/src/main/java/host/stjin/anonaddy_shared/models/Rules.kt b/anonaddy_shared/src/main/java/host/stjin/anonaddy_shared/models/Rules.kt
@@ -21,6 +21,7 @@ data class RulesArray(
     val `data`: List<Rules>
 )
 
+@Suppress("PropertyName", "PropertyName")
 data class Rules(
     val id: String,
     val user_id: String,