Merge branch 'release/5.4.7' into main

SECURITY.md

@@ -0,0 +1,25 @@
+# Security
+
+At 2FAS, the security is a top priority. If you encounter a potential security issue please report it following the guidelines below.
+
+## Reporting Security Issues
+
+If you believe you've discovered a security vulnerability in Android mobile application, please do not post it publicly on GitHub. Instead, contact our security team directly by emailing [email protected]. If possible, please encrypt your message using our PGP key ([here](https://keys.openpgp.org/search?q=security%402fas.com))
+
+To help us address the issue quickly, please include the following information:
+
+- The specific product affected (e.g., iOS app, Android app, Browser Extension, API server, etc.)
+- Type of issue (e.g., unauthorized data access, privilege escalation, etc.)
+- Detailed steps to reproduce the issue
+- Any relevant details about the affected environment (e.g., device model, OS version)
+- Potential impact and any proof-of-concept code, if available
+
+You should expect a response within 72 hours. If you don't receive a confirmation, please follow up to ensure we received your report.
+
+## Communication Language
+
+We prefer all communications to be in English.
+
+## Policy
+
+2FAS adheres to the principles of Coordinated Vulnerability Disclosure.

app/build.gradle.kts

@@ -15,8 +15,8 @@ android {
 
     defaultConfig {
         applicationId = "com.twofasapp"
-        versionName = "5.4.6"
-        versionCode = 5000025
+        versionName = "5.4.7"
+        versionCode = 5000028
     }
 
     applicationVariants.all {

app/src/main/res/xml/locales_config.xml

@@ -14,4 +14,5 @@
     <locale android:name="tr" />
     <locale android:name="zh" />
     <locale android:name="el" />
+    <locale android:name="ja" />
 </locale-config>

core/locale/src/main/res/values-de-rDE/strings.xml

@@ -4,7 +4,7 @@
  Project: 2FAS App
  Locale: de-DE, German (Germany)
  Exported by: rafakob
- Exported at: Tue, 03 Sep 2024 14:27:02 -0700
+ Exported at: Mon, 07 Oct 2024 09:37:26 -0700
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- InfoPlist.strings

core/locale/src/main/res/values-el-rGR/strings.xml

@@ -4,7 +4,7 @@
  Project: 2FAS App
  Locale: el-GR, Greek (Greece)
  Exported by: rafakob
- Exported at: Tue, 03 Sep 2024 14:27:02 -0700
+ Exported at: Mon, 07 Oct 2024 09:37:26 -0700
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- InfoPlist.strings
@@ -721,7 +721,7 @@
     <string name="settings__enable_crashlytics">Στείλτε ανώνυμες αναφορές κρασαρίσματος.</string>
     <string name="settings__enable_crashlytics_description">Στείλτε ανώνυμες αναφορές κρασαρίσματος για να βοηθήσετε το 2FAS να εντοπίσει και να λύσει προβλήματα στην εφαρμογή (απαιτείται επανεκκίνηση της εφαρμογής).</string>
     <string name="tokens__manage_list">Διαχείριση λίστας.</string>
-    <string name="settings__appearance">Εμφάνιση.</string>
+    <string name="settings__appearance">Εμφάνιση</string>
     <string name="settings__show_next_token_desc">Εμφανίστε το επόμενο token όταν το τρέχον είναι έτοιμο να λήξει.</string>
     <string name="settings__list_style">Στυλ λίστας.</string>
     <string name="backup__reminder_msg">Δεν έχει πραγματοποιηθεί συγχρονισμός με το Google Drive.</string>

core/locale/src/main/res/values-es-rES/strings.xml

@@ -4,7 +4,7 @@
  Project: 2FAS App
  Locale: es-ES, Spanish (Spain)
  Exported by: rafakob
- Exported at: Tue, 03 Sep 2024 14:27:02 -0700
+ Exported at: Mon, 07 Oct 2024 09:37:26 -0700
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- InfoPlist.strings

core/locale/src/main/res/values-fr-rFR/strings.xml

@@ -4,7 +4,7 @@
  Project: 2FAS App
  Locale: fr-FR, French (France)
  Exported by: rafakob
- Exported at: Tue, 03 Sep 2024 14:27:02 -0700
+ Exported at: Mon, 07 Oct 2024 09:37:26 -0700
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- InfoPlist.strings

core/locale/src/main/res/values-it-rIT/strings.xml

@@ -4,7 +4,7 @@
  Project: 2FAS App
  Locale: it-IT, Italian (Italy)
  Exported by: rafakob
- Exported at: Tue, 03 Sep 2024 14:27:02 -0700
+ Exported at: Mon, 07 Oct 2024 09:37:26 -0700
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- InfoPlist.strings

core/locale/src/main/res/values-nl-rNL/strings.xml

@@ -4,7 +4,7 @@
  Project: 2FAS App
  Locale: nl-NL, Dutch (Netherlands)
  Exported by: rafakob
- Exported at: Tue, 03 Sep 2024 14:27:02 -0700
+ Exported at: Mon, 07 Oct 2024 09:37:26 -0700
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- InfoPlist.strings

core/locale/src/main/res/values-pl-rPL/strings.xml

@@ -4,7 +4,7 @@
  Project: 2FAS App
  Locale: pl-PL, Polish (Poland)
  Exported by: rafakob
- Exported at: Tue, 03 Sep 2024 14:27:02 -0700
+ Exported at: Mon, 07 Oct 2024 09:37:26 -0700
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- InfoPlist.strings

core/locale/src/main/res/values-pt-rBR/strings.xml

@@ -4,7 +4,7 @@
  Project: 2FAS App
  Locale: pt-BR, Brazilian Portuguese
  Exported by: rafakob
- Exported at: Tue, 03 Sep 2024 14:27:02 -0700
+ Exported at: Mon, 07 Oct 2024 09:37:26 -0700
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- InfoPlist.strings

core/locale/src/main/res/values-pt-rPT/strings.xml

@@ -4,7 +4,7 @@
  Project: 2FAS App
  Locale: pt-PT, Portuguese (Portugal)
  Exported by: rafakob
- Exported at: Tue, 03 Sep 2024 14:27:02 -0700
+ Exported at: Mon, 07 Oct 2024 09:37:26 -0700
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- InfoPlist.strings

core/locale/src/main/res/values-tr-rTR/strings.xml

@@ -4,7 +4,7 @@
  Project: 2FAS App
  Locale: tr-TR, Turkish (Turkey)
  Exported by: rafakob
- Exported at: Tue, 03 Sep 2024 14:27:02 -0700
+ Exported at: Mon, 07 Oct 2024 09:37:26 -0700
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- InfoPlist.strings

core/locale/src/main/res/values-uk-rUA/strings.xml

@@ -4,7 +4,7 @@
  Project: 2FAS App
  Locale: uk-UA, Ukrainian (Ukraine)
  Exported by: rafakob
- Exported at: Tue, 03 Sep 2024 14:27:02 -0700
+ Exported at: Mon, 07 Oct 2024 09:37:26 -0700
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- InfoPlist.strings

core/locale/src/main/res/values-zh/strings.xml

@@ -4,7 +4,7 @@
  Project: 2FAS App
  Locale: zh-Hans, Simplified Chinese
  Exported by: rafakob
- Exported at: Tue, 03 Sep 2024 14:27:02 -0700
+ Exported at: Mon, 07 Oct 2024 09:37:26 -0700
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- InfoPlist.strings

core/locale/src/main/res/values/strings.xml

@@ -4,7 +4,7 @@
  Project: 2FAS App
  Locale: en, English
  Exported by: rafakob
- Exported at: Tue, 03 Sep 2024 14:27:02 -0700
+ Exported at: Mon, 07 Oct 2024 09:37:26 -0700
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- InfoPlist.strings

feature/about/src/main/java/com/twofasapp/feature/about/ui/about/AboutScreen.kt

@@ -43,7 +43,6 @@ internal fun AboutScreen(
 
     ScreenContent(
         uiState = uiState,
-        versionName = viewModel.versionName,
         onLicensesClick = openLicenses,
         onReviewClick = { viewModel.reviewDone() },
         onSendCrashLogsToggle = { viewModel.toggleSendCrashLogs() }
@@ -53,7 +52,6 @@ internal fun AboutScreen(
 @Composable
 private fun ScreenContent(
     uiState: AboutUiState,
-    versionName: String,
     onLicensesClick: () -> Unit,
     onReviewClick: () -> Unit,
     onSendCrashLogsToggle: () -> Unit,
@@ -207,7 +205,7 @@ private fun ScreenContent(
                             .padding(start = 24.dp, end = 16.dp)
                     ) {
                         Text(
-                            text = stringResource(id = R.string.settings__version, versionName),
+                            text = stringResource(id = R.string.settings__version, uiState.versionName),
                             color = TwTheme.color.onSurfaceSecondary,
                             style = TwTheme.typo.body3
                         )

feature/about/src/main/java/com/twofasapp/feature/about/ui/about/AboutUiState.kt

@@ -4,4 +4,5 @@ import com.twofasapp.data.session.domain.AppSettings
 
 data class AboutUiState(
     val appSettings: AppSettings = AppSettings(),
+    val versionName: String = ""
 )

feature/about/src/main/java/com/twofasapp/feature/about/ui/about/AboutViewModel.kt

@@ -29,14 +29,17 @@ internal class AboutViewModel(
                     uiState.update { it.copy(appSettings = appSettings) }
                 }
         }
-    }
 
-    val versionName =
-        if (appBuild.buildVariant != BuildVariant.Release) {
-            "${appBuild.versionName} (${appBuild.buildVariant.name.camelCaseBeginLower()})"
-        } else {
-            appBuild.versionName
+        uiState.update {
+            it.copy(
+                versionName = if (appBuild.buildVariant != BuildVariant.Release) {
+                    "${appBuild.versionName} (${appBuild.buildVariant.name.camelCaseBeginLower()})"
+                } else {
+                    appBuild.versionName
+                }
+            )
         }
+    }
 
     fun reviewDone() {
         viewModelScope.launch(dispatchers.io) {