Merge branch 'release/5.0.2' into main

twofas · Nov 11, 2023 · a678fca · a678fca
2 parents ce45d16 + c1d4b72
commit a678fca
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -17,8 +17,8 @@ android {
 
     defaultConfig {
         applicationId = "com.twofasapp"
-        versionName = "5.0.1"
-        versionCode = 5000004
+        versionName = "5.0.2"
+        versionCode = 5000005
 
         val versionCodeOffset = 5000000
 

diff --git a/data/services/src/main/java/com/twofasapp/data/services/mapper/ServiceMapper.kt b/data/services/src/main/java/com/twofasapp/data/services/mapper/ServiceMapper.kt
@@ -117,7 +117,6 @@ internal fun List<Service>.asBackup(): List<BackupService> {
                 iconCollection = BackupService.IconCollection(id = s.iconCollectionId)
             ),
             groupId = s.groupId
-
         )
     }
 }
@@ -134,14 +133,14 @@ internal fun BackupService.asDomain(
         secret = secret,
         name = name,
         info = otp.account ?: otp.label,
-        authType = otp.tokenType?.let { enumValueOf<Service.AuthType>(it) } ?: Service.AuthType.TOTP,
+        authType = otp.tokenType?.let { enumValueOrNull<Service.AuthType>(it) } ?: Service.AuthType.TOTP,
         link = otp.link,
         issuer = otp.issuer,
         period = otp.period,
         digits = otp.digits,
         hotpCounter = otp.counter,
         hotpCounterTimestamp = null,
-        algorithm = otp.algorithm?.let { enumValueOf<Service.Algorithm>(it) },
+        algorithm = otp.algorithm?.let { enumValueOrNull<Service.Algorithm>(it) },
         groupId = groupId,
         imageType = when (icon?.selected) {
             BackupService.IconType.Brand -> Service.ImageType.IconCollection
@@ -153,11 +152,15 @@ internal fun BackupService.asDomain(
         iconLight = ServiceIcons.getIcon(iconCollectionId, false),
         iconDark = ServiceIcons.getIcon(iconCollectionId, true),
         labelText = icon?.label?.text,
-        labelColor = icon?.label?.backgroundColor?.let { enumValueOf<Service.Tint>(it) },
-        badgeColor = badge?.color?.let { enumValueOf<Service.Tint>(it) },
+        labelColor = icon?.label?.backgroundColor?.let { enumValueOrNull<Service.Tint>(it) },
+        badgeColor = badge?.color?.let { enumValueOrNull<Service.Tint>(it) },
         isDeleted = false,
         updatedAt = updatedAt,
-        source = otp.source?.let { enumValueOf<Service.Source>(it) } ?: Service.Source.Manual,
+        source = when (otp.source?.lowercase()) {
+            "manual" -> Service.Source.Manual
+            "link" -> Service.Source.Link
+            else -> Service.Source.Manual
+        },
         assignedDomains = listOf(),
         backupSyncStatus = BackupSyncStatus.NOT_SYNCED,
         tags = emptyList(),