chore: bump android deps (#1974)

* bump android deps * change wg title copy
nymtech · Jan 22, 2025 · 413ff50 · 413ff50
1 parent 355ac40
commit 413ff50
Show file tree

Hide file tree

Showing 19 changed files with 24 additions and 38 deletions.
diff --git a/...n-android/app/src/main/java/net/nymtech/nymvpn/manager/shortcut/DynamicShortcutManager.kt b/...n-android/app/src/main/java/net/nymtech/nymvpn/manager/shortcut/DynamicShortcutManager.kt
@@ -36,9 +36,9 @@ class DynamicShortcutManager(val context: Context) : ShortcutManager {
 				shortcutIcon = R.drawable.visibility_off,
 			),
 			buildShortcut(
-				context.getString(R.string.two_hop_mixnet),
-				context.getString(R.string.two_hop_mixnet),
-				context.getString(R.string.two_hop_mixnet),
+				context.getString(R.string.two_hop_title),
+				context.getString(R.string.two_hop_title),
+				context.getString(R.string.two_hop_title),
 				intent = Intent(context, ShortcutActivity::class.java).apply {
 					action = ShortcutAction.START_WG.name
 				},

diff --git a/nym-vpn-android/app/src/main/java/net/nymtech/nymvpn/ui/screens/main/MainScreen.kt b/nym-vpn-android/app/src/main/java/net/nymtech/nymvpn/ui/screens/main/MainScreen.kt
@@ -268,7 +268,7 @@ fun MainScreen(appViewModel: AppViewModel, appUiState: AppUiState, autoStart: Bo
 				Column(verticalArrangement = Arrangement.spacedBy(24.dp.scaledHeight(), Alignment.Bottom)) {
 					IconSurfaceButton(
 						leadingIcon = Icons.Outlined.Speed,
-						title = stringResource(R.string.two_hop_mixnet),
+						title = stringResource(R.string.two_hop_title),
 						description = stringResource(R.string.two_hop_description),
 						onClick = {
 							if (uiState.connectionState == ConnectionState.Disconnected) {

diff --git a/nym-vpn-android/app/src/main/java/net/nymtech/nymvpn/ui/screens/main/ModeModalBody.kt b/nym-vpn-android/app/src/main/java/net/nymtech/nymvpn/ui/screens/main/ModeModalBody.kt
@@ -51,7 +51,7 @@ fun ModeModalBody(onClick: () -> Unit) {
 			val icon = Icons.Outlined.Speed
 			Icon(icon, icon.name, tint = MaterialTheme.colorScheme.onSurface)
 			Text(
-				text = stringResource(id = R.string.two_hop_mixnet),
+				text = stringResource(id = R.string.two_hop_title),
 				style = MaterialTheme.typography.labelLarge,
 				color = MaterialTheme.colorScheme.onSurface,
 			)

diff --git a/nym-vpn-android/app/src/main/res/values-ar/strings.xml b/nym-vpn-android/app/src/main/res/values-ar/strings.xml
@@ -47,7 +47,6 @@
     <string name="exit_location">موقع الخروج</string>
     <string name="language">اللغة</string>
     <string name="gateway_modal_description">نستنتج مواقع الخوادم بناءً على عناوين IP الخاصة بها، ولكن المواقع الفعلية قد تختلف قليلاً.</string>
-    <string name="two_hop_mixnet">سريع(wireGuard)</string>
     <string name="first_hop">موقع الدخول</string>
     <string name="fastest">الأسرع</string>
     <string name="connection_time">وقت الاتصال</string>
@@ -61,4 +60,4 @@
     <string name="dark_theme">نمط داكن</string>
     <string name="auto_connect">اتصال تلقائي</string>
     <string name="support">دعم</string>
-</resources>
+</resources>
diff --git a/nym-vpn-android/app/src/main/res/values-de/strings.xml b/nym-vpn-android/app/src/main/res/values-de/strings.xml
@@ -6,8 +6,7 @@
     <string name="disconnecting">Trennen</string>
     <string name="connecting">Verbinden</string>
     <string name="five_hop_mixnet">Anonym (Mixnet)</string>
-    <string name="two_hop_mixnet">Schnell (Wireguard)</string>
-    <string name="two_hop_description">Ideal zum browsen, streamen, file-sharing</string>
+	<string name="two_hop_description">Ideal zum browsen, streamen, file-sharing</string>
     <string name="app_name">NymVPN</string>
     <string name="five_hop_description">Für Zahlungen, E-Mails, Nachrichten</string>
     <string name="first_hop">Eintrittsregion</string>

diff --git a/nym-vpn-android/app/src/main/res/values-es/strings.xml b/nym-vpn-android/app/src/main/res/values-es/strings.xml
@@ -8,8 +8,7 @@
     <string name="connecting">Conectando</string>
     <string name="five_hop_mixnet">Anónimo (mixnet)</string>
     <string name="five_hop_description">Para pagos, correos electrónicos, mensajes</string>
-    <string name="two_hop_mixnet">Rápido (WireGuard)</string>
-    <string name="two_hop_description">Mejor para navegar, streaming, compartir</string>
+	<string name="two_hop_description">Mejor para navegar, streaming, compartir</string>
     <string name="first_hop">Ubicación de entrada</string>
     <string name="last_hop">Ubicación de salida</string>
     <string name="connect">Conectar</string>

diff --git a/nym-vpn-android/app/src/main/res/values-fa/strings.xml b/nym-vpn-android/app/src/main/res/values-fa/strings.xml
@@ -45,8 +45,7 @@
     <string name="feature_in_progress">این قابلیت هنوز در حال تکمیل است.</string>
     <string name="sentry_url">https://sentry.io</string>
     <string name="anonymous_analytics">تحلیل‌های ناشناس</string>
-    <string name="two_hop_mixnet">سریع (WireGuard)</string>
-    <string name="device_theme">استفاده از طرح دستگاه</string>
+	<string name="device_theme">استفاده از طرح دستگاه</string>
     <string name="two_hop_description">ایده‌آل برای وب‌گردی، پخش زنده و اشتراک‌گذاری</string>
     <string name="disconnect">قطع</string>
     <string name="last_hop_selection">موقعیت خروجی</string>

diff --git a/nym-vpn-android/app/src/main/res/values-fr/strings.xml b/nym-vpn-android/app/src/main/res/values-fr/strings.xml
@@ -8,8 +8,7 @@
     <string name="connecting">Connexion</string>
     <string name="five_hop_mixnet">Anonyme</string>
     <string name="five_hop_description">Pour les paiements, emails et messages</string>
-    <string name="two_hop_mixnet">Rapide</string>
-    <string name="two_hop_description">Pour la navigation, le streaming et les téléchargements</string>
+	<string name="two_hop_description">Pour la navigation, le streaming et les téléchargements</string>
     <string name="first_hop">Nœud d\'entrée</string>
     <string name="last_hop">Nœud de sortie</string>
     <string name="connect">Connecter</string>

diff --git a/nym-vpn-android/app/src/main/res/values-hi/strings.xml b/nym-vpn-android/app/src/main/res/values-hi/strings.xml
@@ -9,8 +9,7 @@
     <string name="disconnecting">डिसकनेक्ट हो रहा है</string>
     <string name="five_hop_mixnet">"अनाम  (mixnet)"</string>
     <string name="five_hop_description">भुगतान, ईमेल और मेसेज के लिए</string>
-    <string name="two_hop_mixnet">तेज़ (WireGuard)</string>
-    <string name="first_hop">उद्भव स्थान</string>
+	<string name="first_hop">उद्भव स्थान</string>
     <string name="last_hop">VPN आखरी स्थान</string>
     <string name="connect">कनेक्ट</string>
     <string name="last_hop_selection">VPN आखरी स्थान</string>

diff --git a/nym-vpn-android/app/src/main/res/values-it/strings.xml b/nym-vpn-android/app/src/main/res/values-it/strings.xml
@@ -8,8 +8,7 @@
     <string name="disconnected">Disconnesso</string>
     <string name="connecting">Connessione</string>
     <string name="five_hop_mixnet">Anonimo</string>
-    <string name="two_hop_mixnet">Veloce</string>
-    <string name="first_hop">Posizione d\'entrata</string>
+	<string name="first_hop">Posizione d\'entrata</string>
     <string name="last_hop">Località d\'uscita</string>
     <string name="connect">Connetti</string>
     <string name="disconnect">Disconnetti</string>

diff --git a/nym-vpn-android/app/src/main/res/values-ja/strings.xml b/nym-vpn-android/app/src/main/res/values-ja/strings.xml
@@ -12,8 +12,7 @@
     <string name="disconnecting">接続解除中</string>
     <string name="connecting">接続中</string>
     <string name="five_hop_description">支払い、Eメール、メッセージに最適</string>
-    <string name="two_hop_mixnet">高速(WireGuard)</string>
-    <string name="first_hop">エントリーロケーション</string>
+	<string name="first_hop">エントリーロケーション</string>
     <string name="last_hop">出口ロケーション</string>
     <string name="connect">接続</string>
     <string name="disconnect">接続解除</string>

diff --git a/nym-vpn-android/app/src/main/res/values-pt-rBR/strings.xml b/nym-vpn-android/app/src/main/res/values-pt-rBR/strings.xml
@@ -93,8 +93,7 @@
     <string name="app_shortcuts">Atalhos do aplicativo</string>
     <string name="enable_shortcuts">Ativar atalhos do aplicativo</string>
     <string name="five_hop_mixnet">Anônimo (mixnet)</string>
-    <string name="two_hop_mixnet">Rápido (WireGuard)</string>
-    <string name="last_hop_selection">Local de saída</string>
+	<string name="last_hop_selection">Local de saída</string>
     <string name="privacy_policy">Declaração de privacidade</string>
     <string name="licenses">Licenças</string>
     <string name="open_github">Abrir um problema no GitHub</string>

diff --git a/nym-vpn-android/app/src/main/res/values-pt-rPT/strings.xml b/nym-vpn-android/app/src/main/res/values-pt-rPT/strings.xml
@@ -8,8 +8,7 @@
     <string name="connecting">Conectando</string>
     <string name="five_hop_mixnet">Anônimo (mixnet)</string>
     <string name="five_hop_description">Para pagamentos, e-mails e mensagens</string>
-    <string name="two_hop_mixnet">Rápido (WireGuard)</string>
-    <string name="two_hop_description">Melhor para navegação, transmissão e compartilhamento</string>
+	<string name="two_hop_description">Melhor para navegação, transmissão e compartilhamento</string>
     <string name="first_hop">Primeiro salto</string>
     <string name="last_hop">Último salto</string>
     <string name="connect">Conectar</string>

diff --git a/nym-vpn-android/app/src/main/res/values-ru/strings.xml b/nym-vpn-android/app/src/main/res/values-ru/strings.xml
@@ -4,8 +4,7 @@
     <string name="connected">Подключено</string>
     <string name="connecting">Подключение</string>
     <string name="five_hop_mixnet">Анонимный (микснет)</string>
-    <string name="two_hop_mixnet">Быстрый (WireGuard)</string>
-    <string name="first_hop">Локация входа</string>
+	<string name="first_hop">Локация входа</string>
     <string name="last_hop">Локация выхода</string>
     <string name="connect">Подключиться</string>
     <string name="disconnect">Отключиться</string>

diff --git a/nym-vpn-android/app/src/main/res/values-tr/strings.xml b/nym-vpn-android/app/src/main/res/values-tr/strings.xml
@@ -10,8 +10,7 @@
     <string name="five_hop_mixnet">Anonim (mixnet)</string>
     <string name="disconnecting">Bağlantı koptu</string>
     <string name="first_hop">Giriş lokasyonu</string>
-    <string name="two_hop_mixnet">Hızlı (WireGuard)</string>
-    <string name="disconnected">Bağlantı kesildi</string>
+	<string name="disconnected">Bağlantı kesildi</string>
     <string name="init_client">İstemci başlatılıyor…</string>
     <string name="establishing_connection">Bağlantı kuruluyor</string>
     <string name="connection_time">Bağlantı süresi</string>

diff --git a/nym-vpn-android/app/src/main/res/values-uk/strings.xml b/nym-vpn-android/app/src/main/res/values-uk/strings.xml
@@ -6,8 +6,7 @@
     <string name="disconnected">Від\'єднано</string>
     <string name="connecting">Підключення</string>
     <string name="five_hop_mixnet">Анонімний (мікснет)</string>
-    <string name="two_hop_mixnet">Швидкий (WireGuard)</string>
-    <string name="first_hop">Перша ланка</string>
+	<string name="first_hop">Перша ланка</string>
     <string name="last_hop">Остання ланка</string>
     <string name="connect">Підключитись</string>
     <string name="disconnect">Від\'єднати</string>

diff --git a/nym-vpn-android/app/src/main/res/values-zh-rCN/strings.xml b/nym-vpn-android/app/src/main/res/values-zh-rCN/strings.xml
@@ -18,8 +18,7 @@
     <string name="enable_shortcuts">启用app快捷方式</string>
     <string name="alpha_help_message">在 alpha 阶段帮助我们完善应用程序！您的反馈对于发现和解决问题至关重要。</string>
     <string name="notification_permission_message">需要在应用程序关闭时保持 VPN 服务运行。</string>
-    <string name="two_hop_mixnet">快速</string>
-    <string name="disconnected">未连接</string>
+	<string name="disconnected">未连接</string>
     <string name="disconnecting">断开连接</string>
     <string name="connecting">正在连接</string>
     <string name="five_hop_mixnet">匿名</string>

diff --git a/nym-vpn-android/app/src/main/res/values/strings.xml b/nym-vpn-android/app/src/main/res/values/strings.xml
@@ -9,8 +9,7 @@
     <string name="connecting">Connecting</string>
     <string name="five_hop_mixnet">Anonymous (mixnet)</string>
     <string name="five_hop_description">For payments, emails, messages</string>
-    <string name="two_hop_mixnet">Fast (WireGuard)</string>
-    <string name="two_hop_description">Best for browsing, streaming, sharing</string>
+	<string name="two_hop_description">Best for browsing, streaming, sharing</string>
     <string name="first_hop">Entry location</string>
     <string name="last_hop">Exit location</string>
     <string name="connect">Connect</string>
@@ -213,4 +212,5 @@
 	<string name="no_internet">Your device has no internet connection</string>
 	<string name="waiting_for_connection">Will connect once the device goes online</string>
 	<string name="two_hop_explanation">Experience maximum speed with 2-server connectivity. This mode leverages AmneziaWG, a censorship-resistant version of WireGuard, ideal for fast browsing, streaming, and file sharing.</string>
+	<string name="two_hop_title">Fast (WireGuard<small>*</small>)</string>
 </resources>
diff --git a/nym-vpn-android/gradle/libs.versions.toml b/nym-vpn-android/gradle/libs.versions.toml
@@ -16,9 +16,9 @@ materialIconsExtended = "1.7.6"
 navigationCompose = "2.8.5"
 hiltNavigationCompose = "1.2.0"
 lifecycle-compose = "2.8.7"
-activityCompose = "1.9.3"
-composeBom = "2024.12.01"
-datastorePreferences = "1.1.1"
+activityCompose = "1.10.0"
+composeBom = "2025.01.00"
+datastorePreferences = "1.1.2"
 relinker = "1.4.5"
 securityCrypto = "1.1.0-alpha06"
 timber = "5.0.1"