aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authoreuxane2024-09-18 23:41:13 +0200
committereuxane2024-09-18 23:41:13 +0200
commit8ca054dfcdf32d66b46113139ed6ba65a18bef7c (patch)
tree661a324d27c568e4db03f75ea48c3f42e84d370c /app/src/main/res
parent32d87010bbd053185be8b1c817499df310096c33 (diff)
downloadtincapp-8ca054dfcdf32d66b46113139ed6ba65a18bef7c.tar.gz
errors: add log and config dirs openers to error messages
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/layout/start_error_notification.xml30
-rw-r--r--app/src/main/res/values/strings.xml2
2 files changed, 32 insertions, 0 deletions
diff --git a/app/src/main/res/layout/start_error_notification.xml b/app/src/main/res/layout/start_error_notification.xml
index 543cd8c..4499357 100644
--- a/app/src/main/res/layout/start_error_notification.xml
+++ b/app/src/main/res/layout/start_error_notification.xml
@@ -33,6 +33,14 @@
33 name="openManualAction" 33 name="openManualAction"
34 type="kotlin.jvm.functions.Function0<kotlin.Unit>"/> 34 type="kotlin.jvm.functions.Function0<kotlin.Unit>"/>
35 35
36 <variable
37 name="openConfigDirAction"
38 type="kotlin.jvm.functions.Function0&lt;kotlin.Unit>"/>
39
40 <variable
41 name="openLogDirAction"
42 type="kotlin.jvm.functions.Function0&lt;kotlin.Unit>"/>
43
36 </data> 44 </data>
37 45
38 <LinearLayout 46 <LinearLayout
@@ -62,6 +70,28 @@
62 70
63 </LinearLayout> 71 </LinearLayout>
64 72
73 <LinearLayout
74 style="@style/AppTheme.ListBlock.Clickable"
75 android:visibility="@{errorNotification.configDir == null ? View.GONE : View.VISIBLE}"
76 android:onClick="@{() -> openConfigDirAction.invoke()}">
77
78 <TextView
79 style="@style/AppTheme.BlockTitle"
80 android:text="@string/notification_error_action_open_config_dir" />
81
82 </LinearLayout>
83
84 <LinearLayout
85 style="@style/AppTheme.ListBlock.Clickable"
86 android:visibility="@{errorNotification.proposeLogs ? View.VISIBLE : View.GONE}"
87 android:onClick="@{() -> openLogDirAction.invoke()}">
88
89 <TextView
90 style="@style/AppTheme.BlockTitle"
91 android:text="@string/notification_error_action_open_logs_dir" />
92
93 </LinearLayout>
94
65 </LinearLayout> 95 </LinearLayout>
66 96
67 </LinearLayout> 97 </LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8ded24f..a678832 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -61,6 +61,8 @@
61 <!-- error notifications --> 61 <!-- error notifications -->
62 <string name="notification_error_channel_name">Errors</string> 62 <string name="notification_error_channel_name">Errors</string>
63 <string name="notification_error_action_open_manual">Open manual</string> 63 <string name="notification_error_action_open_manual">Open manual</string>
64 <string name="notification_error_action_open_config_dir">Open configuration directory</string>
65 <string name="notification_error_action_open_logs_dir">Open logs directory</string>
64 <string name="notification_error_title_unable_to_start_tinc">Could not start tinc</string> 66 <string name="notification_error_title_unable_to_start_tinc">Could not start tinc</string>
65 <string name="notification_error_message_could_not_read_private_key_format">Could not read private tinc keys:\n%1$s</string> 67 <string name="notification_error_message_could_not_read_private_key_format">Could not read private tinc keys:\n%1$s</string>
66 <string name="notification_error_message_could_not_read_network_configuration_format">Could not read network interface configuration:\n%1$s</string> 68 <string name="notification_error_message_could_not_read_network_configuration_format">Could not read network interface configuration:\n%1$s</string>