diff options
Diffstat (limited to 'app/src/main/java/org/pacien/tincapp/activities/configure/tools/ConfigurationTool.kt')
-rw-r--r-- | app/src/main/java/org/pacien/tincapp/activities/configure/tools/ConfigurationTool.kt | 6 |
1 files changed, 3 insertions, 3 deletions
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) { | |||
43 | .setTitle(title) | 43 | .setTitle(title) |
44 | .setView(view) | 44 | .setView(view) |
45 | .setPositiveButton(applyButton) { _, _ -> applyAction(view) } | 45 | .setPositiveButton(applyButton) { _, _ -> applyAction(view) } |
46 | .setNegativeButton(R.string.action_cancel) { _, _ -> Unit } | 46 | .setNegativeButton(R.string.generic_action_cancel) { _, _ -> Unit } |
47 | .show() | 47 | .show() |
48 | } | 48 | } |
49 | 49 | ||
@@ -51,7 +51,7 @@ abstract class ConfigurationTool(private val parentActivity: BaseActivity) { | |||
51 | ProgressModal.show(parentActivity, parentActivity.getString(label)).let { progressDialog -> | 51 | ProgressModal.show(parentActivity, parentActivity.getString(label)).let { progressDialog -> |
52 | action | 52 | action |
53 | .whenComplete { _, _ -> progressDialog.dismiss() } | 53 | .whenComplete { _, _ -> progressDialog.dismiss() } |
54 | .thenAccept { parentActivity.notify(R.string.message_network_configuration_written) } | 54 | .thenAccept { parentActivity.notify(R.string.configure_tools_message_network_configuration_written) } |
55 | .exceptionallyAccept { parentActivity.runOnUiThread { parentActivity.showErrorDialog(it.cause!!.localizedMessage) } } | 55 | .exceptionallyAccept { parentActivity.runOnUiThread { parentActivity.showErrorDialog(it.cause!!.localizedMessage) } } |
56 | } | 56 | } |
57 | } | 57 | } |
@@ -60,5 +60,5 @@ abstract class ConfigurationTool(private val parentActivity: BaseActivity) { | |||
60 | if (networkNamePattern.matcher(netName).matches()) | 60 | if (networkNamePattern.matcher(netName).matches()) |
61 | CompletableFuture.completedFuture(Unit) | 61 | CompletableFuture.completedFuture(Unit) |
62 | else | 62 | else |
63 | CompletableFuture.failedFuture(IllegalArgumentException(parentActivity.getString(R.string.message_invalid_network_name))) | 63 | CompletableFuture.failedFuture(IllegalArgumentException(parentActivity.getString(R.string.configure_tools_message_invalid_network_name))) |
64 | } | 64 | } |