aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/java/org/pacien/tincapp/activities/status
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/java/org/pacien/tincapp/activities/status')
-rw-r--r--app/src/main/java/org/pacien/tincapp/activities/status/StatusActivity.kt2
-rw-r--r--app/src/main/java/org/pacien/tincapp/activities/status/networkinfo/VpnInterfaceConfigurationFormatter.kt2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/src/main/java/org/pacien/tincapp/activities/status/StatusActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/status/StatusActivity.kt
index 3815bc9..152ed83 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/status/StatusActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/status/StatusActivity.kt
@@ -104,7 +104,7 @@ class StatusActivity : BaseActivity() {
104 } 104 }
105 105
106 private fun stopVpn() { 106 private fun stopVpn() {
107 shutdownDialog = ProgressModal.show(this, getString(R.string.message_disconnecting_vpn)) 107 shutdownDialog = ProgressModal.show(this, getString(R.string.status_activity_disconnecting_vpn))
108 vpnService.disconnect() 108 vpnService.disconnect()
109 } 109 }
110 110
diff --git a/app/src/main/java/org/pacien/tincapp/activities/status/networkinfo/VpnInterfaceConfigurationFormatter.kt b/app/src/main/java/org/pacien/tincapp/activities/status/networkinfo/VpnInterfaceConfigurationFormatter.kt
index a519d07..568714e 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/status/networkinfo/VpnInterfaceConfigurationFormatter.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/status/networkinfo/VpnInterfaceConfigurationFormatter.kt
@@ -30,7 +30,7 @@ object VpnInterfaceConfigurationFormatter {
30 30
31 fun formatList(list: List<Any>) = when { 31 fun formatList(list: List<Any>) = when {
32 list.isNotEmpty() -> list.joinToString("\n", transform = this::formatListElement) 32 list.isNotEmpty() -> list.joinToString("\n", transform = this::formatListElement)
33 else -> resources.getString(R.string.status_network_info_none_value)!! 33 else -> resources.getString(R.string.status_network_info_value_none)!!
34 } 34 }
35 35
36 private fun formatListElement(element: Any) = when (element) { 36 private fun formatListElement(element: Any) = when (element) {