22 files changed, 221 insertions, 279 deletions

diff --git a/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt
index d9d549b..975d4cf 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt
@@ -85,12 +85,12 @@ abstract class BaseActivity : AppCompatActivity() {
   fun aboutDialog(m: MenuItem) {
     AlertDialog.Builder(this)
       .setTitle(resources.getString(R.string.app_name))
-      .setMessage(resources.getString(R.string.app_short_desc) + "\n\n" +
-        resources.getString(R.string.app_copyright) + " " +
-        resources.getString(R.string.app_license) + "\n\n" +
+      .setMessage(resources.getString(R.string.about_app_short_desc) + "\n\n" +
+        resources.getString(R.string.about_app_copyright) + " " +
+        resources.getString(R.string.about_app_license) + "\n\n" +
         AppInfo.all())
-      .setNeutralButton(R.string.action_open_project_website) { _, _ -> App.openURL(resources.getString(R.string.app_website_url)) }
-      .setPositiveButton(R.string.action_close) { _, _ -> Unit }
+      .setNeutralButton(R.string.about_app_open_project_website) { _, _ -> App.openURL(resources.getString(R.string.about_app_website_url)) }
+      .setPositiveButton(R.string.generic_action_close) { _, _ -> Unit }
       .show()
   }
 
@@ -103,18 +103,18 @@ abstract class BaseActivity : AppCompatActivity() {
     CrashRecorder.dismissPreviousCrash()
 
     AlertDialog.Builder(this)
-      .setTitle(R.string.title_app_crash)
+      .setTitle(R.string.crash_modal_title)
       .setMessage(listOf(
-        resources.getString(R.string.message_app_crash),
-        resources.getString(R.string.message_crash_logged, AppPaths.appLogFile().absolutePath)
+        resources.getString(R.string.crash_modal_message),
+        resources.getString(R.string.crash_modal_crash_logged, AppPaths.appLogFile().absolutePath)
       ).joinToString("\n\n"))
-      .setNeutralButton(R.string.action_send_report) { _, _ ->
+      .setNeutralButton(R.string.crash_modal_action_send_report) { _, _ ->
         App.sendMail(
-          resources.getString(R.string.app_dev_email),
-          listOf(R.string.app_name, R.string.title_app_crash).joinToString(" / ", transform = resources::getString),
+          resources.getString(R.string.crash_modal_dev_email),
+          listOf(R.string.app_name, R.string.crash_modal_title).joinToString(" / ", transform = resources::getString),
           AppPaths.appLogFile().let { if (it.exists()) it.readText() else "" })
       }
-      .setPositiveButton(R.string.action_close) { _, _ -> Unit }
+      .setPositiveButton(R.string.generic_action_close) { _, _ -> Unit }
       .show()
   }
 
@@ -125,6 +125,6 @@ abstract class BaseActivity : AppCompatActivity() {
   fun notify(msg: String) = Snackbar.make(base_activity_frame, msg, Snackbar.LENGTH_LONG).show()
 
   fun showErrorDialog(msg: String): AlertDialog = AlertDialog.Builder(this)
-    .setTitle(R.string.title_error).setMessage(msg)
-    .setPositiveButton(R.string.action_close) { _, _ -> Unit }.show()
+    .setTitle(R.string.generic_title_error).setMessage(msg)
+    .setPositiveButton(R.string.generic_action_close) { _, _ -> Unit }.show()
 }
diff --git a/app/src/main/java/org/pacien/tincapp/activities/configure/tools/ConfigurationTool.kt b/app/src/main/java/org/pacien/tincapp/activities/configure/tools/ConfigurationTool.kt
index 41d1f55..4fa85f8 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/configure/tools/ConfigurationTool.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/configure/tools/ConfigurationTool.kt
@@ -43,7 +43,7 @@ abstract class ConfigurationTool(private val parentActivity: BaseActivity) {
       .setTitle(title)
       .setView(view)
       .setPositiveButton(applyButton) { _, _ -> applyAction(view) }
-      .setNegativeButton(R.string.action_cancel) { _, _ -> Unit }
+      .setNegativeButton(R.string.generic_action_cancel) { _, _ -> Unit }
       .show()
   }
 
@@ -51,7 +51,7 @@ abstract class ConfigurationTool(private val parentActivity: BaseActivity) {
     ProgressModal.show(parentActivity, parentActivity.getString(label)).let { progressDialog ->
       action
         .whenComplete { _, _ -> progressDialog.dismiss() }
-        .thenAccept { parentActivity.notify(R.string.message_network_configuration_written) }
+        .thenAccept { parentActivity.notify(R.string.configure_tools_message_network_configuration_written) }
         .exceptionallyAccept { parentActivity.runOnUiThread { parentActivity.showErrorDialog(it.cause!!.localizedMessage) } }
     }
   }
@@ -60,5 +60,5 @@ abstract class ConfigurationTool(private val parentActivity: BaseActivity) {
     if (networkNamePattern.matcher(netName).matches())
       CompletableFuture.completedFuture(Unit)
     else
-      CompletableFuture.failedFuture(IllegalArgumentException(parentActivity.getString(R.string.message_invalid_network_name)))
+      CompletableFuture.failedFuture(IllegalArgumentException(parentActivity.getString(R.string.configure_tools_message_invalid_network_name)))
 }
diff --git a/app/src/main/java/org/pacien/tincapp/activities/start/ConnectionStarter.kt b/app/src/main/java/org/pacien/tincapp/activities/start/ConnectionStarter.kt
index 06046e9..d1ccd3f 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/start/ConnectionStarter.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/start/ConnectionStarter.kt
@@ -55,10 +55,10 @@ class ConnectionStarter(private val parentActivity: StartActivity) {
     val dialogView = parentActivity.layoutInflater.inflate(R.layout.dialog_decrypt_keys, parentActivity.base_activity_frame, false)
 
     AlertDialog.Builder(parentActivity)
-      .setTitle(R.string.title_unlock_private_keys)
+      .setTitle(R.string.decrypt_key_modal_title)
       .setView(dialogView)
-      .setPositiveButton(R.string.action_unlock) { _, _ -> tryStart(passphrase = dialogView.passphrase.text.toString()) }
-      .setNegativeButton(R.string.action_cancel) { _, _ -> Unit }
+      .setPositiveButton(R.string.decrypt_key_modal_action_unlock) { _, _ -> tryStart(passphrase = dialogView.passphrase.text.toString()) }
+      .setNegativeButton(R.string.decrypt_key_modal_action_cancel) { _, _ -> Unit }
       .show()
   }
 
diff --git a/app/src/main/java/org/pacien/tincapp/activities/start/StartActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/start/StartActivity.kt
index 9cc6159..802115f 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/start/StartActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/start/StartActivity.kt
@@ -99,7 +99,7 @@ class StartActivity : BaseActivity() {
   }
 
   fun showConnectProgressDialog() {
-    connectDialog = ProgressModal.show(this, resources.getString(R.string.message_starting_vpn))
+    connectDialog = ProgressModal.show(this, resources.getString(R.string.start_starting_vpn))
   }
 
   @Suppress("UNUSED_PARAMETER")
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() {
   }
 
   private fun stopVpn() {
-    shutdownDialog = ProgressModal.show(this, getString(R.string.message_disconnecting_vpn))
+    shutdownDialog = ProgressModal.show(this, getString(R.string.status_activity_disconnecting_vpn))
     vpnService.disconnect()
   }
 
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 {
 
   fun formatList(list: List<Any>) = when {
     list.isNotEmpty() -> list.joinToString("\n", transform = this::formatListElement)
-    else -> resources.getString(R.string.status_network_info_none_value)!!
+    else -> resources.getString(R.string.status_network_info_value_none)!!
   }