Merge branch 'release/1.3.0' into main

Author: rafakob

app/build.gradle.kts

@@ -23,8 +23,8 @@ android {
 
     defaultConfig {
         applicationId = "com.twofasapp.pass"
-        versionName = "1.2.3"
-        versionCode = 30
+        versionName = "1.3.0"
+        versionCode = 31
     }
 
     applicationVariants.all {

app/src/main/java/com/twofasapp/pass/notifications/browserrequest/BrowserRequestNotification.kt

@@ -19,6 +19,7 @@ import com.twofasapp.core.locale.Strings
 import com.twofasapp.data.main.BrowserExtensionRepository
 import com.twofasapp.data.main.ConnectedBrowsersRepository
 import com.twofasapp.data.main.domain.BrowserRequestData
+import com.twofasapp.data.main.domain.ConnectData
 import com.twofasapp.data.push.domain.Push
 import com.twofasapp.data.push.internal.PushLogger
 import com.twofasapp.data.push.notifications.NotificationSystemChannelProvider
@@ -45,6 +46,7 @@ internal class BrowserRequestNotification(
         }
 
         val browserRequestData = BrowserRequestData(
+            version = push.scheme ?: ConnectData.CurrentSchema,
             browser = browser,
             deviceId = device.uniqueId(),
             notificationId = push.notificationId,

core/common/src/main/java/com/twofasapp/core/common/domain/ImportType.kt

@@ -23,4 +23,5 @@ enum class ImportType(val displayName: String) {
     Firefox("Firefox"),
     KeePass("KeePass"),
     KeePassXC("KeePassXC"),
+    Keeper("Keeper"),
 }

core/common/src/main/java/com/twofasapp/core/common/domain/ItemKtx.kt

@@ -14,18 +14,21 @@ fun Item.normalizeBeforeSaving(): Item {
 }
 
 private fun ItemContent.Login.filterAndNormalizeUris(): ItemContent.Login {
-    if (uris.size == 1) {
-        return this
-    }
-
-    val normalizedUris = if (uris.all { it.text.isBlank() }) {
-        uris.take(1)
-    } else {
-        uris.filter { it.text.isNotBlank() }
-    }.map { it.copy(text = it.text.trim()) }
+    return when (uris.size) {
+        0 -> copy(iconUriIndex = null)
+        1 -> copy(iconUriIndex = 0)
+        else -> {
+            val normalizedUris = if (uris.all { it.text.isBlank() }) {
+                uris.take(1)
+            } else {
+                uris.filter { it.text.isNotBlank() }
+            }
+                .map { it.copy(text = it.text.trim()) }
 
-    return copy(
-        uris = normalizedUris,
-        iconUriIndex = iconUriIndex?.let { minOf(it, normalizedUris.size - 1) },
-    )
+            copy(
+                uris = normalizedUris,
+                iconUriIndex = iconUriIndex?.let { minOf(it, normalizedUris.size - 1) },
+            )
+        }
+    }
 }

core/common/src/main/java/com/twofasapp/core/common/domain/items/ItemContent.kt

@@ -34,7 +34,7 @@ sealed interface ItemContent {
             val Empty = Login(
                 name = "",
                 username = null,
-                password = SecretField.ClearText(""),
+                password = null,
                 uris = emptyList(),
                 iconType = IconType.Icon,
                 iconUriIndex = 0,

core/design/src/main/res/drawable/external_logo_keeper.webp

@@ -415,11 +415,8 @@ class Strings(private val c: Context) {
     val setNewPasswordScreenTitle = c.getString(R.string.set_new_password_screen_title)
     val setNewPasswordScreenDescription = c.getString(R.string.set_new_password_screen_description)
     val setNewPasswordConfirmTitle = c.getString(R.string.set_new_password_confirm_title)
-    val setNewPasswordConfirmBodyPart1 = c.getString(R.string.set_new_password_confirm_body_part1)
-    val setNewPasswordConfirmBodyPart2Bold = c.getString(R.string.set_new_password_confirm_body_part2_bold)
-    val setNewPasswordConfirmBodyPart3 = c.getString(R.string.set_new_password_confirm_body_part3)
-    val setNewPasswordConfirmBodyPart4Bold = c.getString(R.string.set_new_password_confirm_body_part4_bold)
-    val setNewPasswordConfirmBodyPart5 = c.getString(R.string.set_new_password_confirm_body_part5)
+    val setNewPasswordConfirmBodyPart1 = c.getString(R.string.set_new_password_confirm_body_part1_ios)
+    val setNewPasswordConfirmBodyPart2 = c.getString(R.string.set_new_password_confirm_body_part2_ios)
 
     val uriSettingsModalHeader = c.getString(R.string.uri_settings_modal_header)
     val uriSettingsMatchingRuleHeader = c.getString(R.string.uri_settings_matching_rule_header)
@@ -487,6 +484,11 @@ class Strings(private val c: Context) {
     val requestModalRemoveItemCtaPositive = c.getString(R.string.request_modal_remove_item_cta_positive)
     val requestModalRemoveItemCtaNegative = c.getString(R.string.request_modal_remove_item_cta_negative)
 
+    val requestModalFullSyncTitle = c.getString(R.string.request_modal_full_sync_title)
+    val requestModalFullSyncSubtitle = c.getString(R.string.request_modal_full_sync_subtitle)
+    val requestModalFullSyncCtaPositive = c.getString(R.string.request_modal_full_sync_cta_positive)
+    val requestModalFullSyncCtaNegative = c.getString(R.string.request_modal_full_sync_cta_negative)
+
     val requestModalErrorGenericTitle = c.getString(R.string.request_modal_error_generic_title)
     val requestModalErrorGenericSubtitle = c.getString(R.string.request_modal_error_generic_subtitle)
     val requestModalErrorGenericCta = c.getString(R.string.request_modal_error_generic_cta)
@@ -502,7 +504,7 @@ class Strings(private val c: Context) {
     val requestModalToastCancel = c.getString(R.string.request_modal_toast_cancel)
     val requestModalToastAddLogin = c.getString(R.string.request_modal_toast_success_add_login)
     val requestModalToastUpdateLogin = c.getString(R.string.request_modal_toast_success_update_login)
-    val requestModalToastDeleteLogin = c.getString(R.string.request_modal_toast_success_delete_login)
+    val requestModalToastDeleteItem = c.getString(R.string.request_modal_toast_success_delete_login)
     val requestModalToastPasswordRequest = c.getString(R.string.request_modal_toast_success_password_request)
     val lockScreenTryAgainIn = c.getString(R.string.lock_screen_try_again__0025_0040)