aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authorpacien2018-04-18 22:36:03 +0200
committerpacien2018-04-18 22:37:24 +0200
commit818943f7e8bad37af981fc01452822bb040c2ca9 (patch)
tree1a198d122bdec0528d6d42a09cf7815d39f4e6c8 /app/src/main/res
parentcb6a034ec7c78d46bc835333c302c853a10bab5b (diff)
downloadtincapp-818943f7e8bad37af981fc01452822bb040c2ca9.tar.gz
Prevent logging when no daemon is running
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/menu/menu_viewlog.xml1
-rw-r--r--app/src/main/res/values/strings.xml1
2 files changed, 2 insertions, 0 deletions
diff --git a/app/src/main/res/menu/menu_viewlog.xml b/app/src/main/res/menu/menu_viewlog.xml
index 397055a..bcf49d2 100644
--- a/app/src/main/res/menu/menu_viewlog.xml
+++ b/app/src/main/res/menu/menu_viewlog.xml
@@ -4,6 +4,7 @@
4 tools:context="org.pacien.tincapp.activities.ViewLogActivity"> 4 tools:context="org.pacien.tincapp.activities.ViewLogActivity">
5 5
6 <item 6 <item
7 android:id="@+id/log_viewer_action_toggle"
7 android:icon="@drawable/ic_pause_circle_outline_primary_24dp" 8 android:icon="@drawable/ic_pause_circle_outline_primary_24dp"
8 android:onClick="toggleLogging" 9 android:onClick="toggleLogging"
9 android:tint="@color/colorAccent" 10 android:tint="@color/colorAccent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cab09ee..6ff9ab5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -95,6 +95,7 @@
95 <string name="message_invalid_network_name">Invalid network name.</string> 95 <string name="message_invalid_network_name">Invalid network name.</string>
96 <string name="message_app_crash">The application has previously encountered a fatal error.</string> 96 <string name="message_app_crash">The application has previously encountered a fatal error.</string>
97 <string name="message_crash_logged">The crash details have been saved in \"%1$s\".</string> 97 <string name="message_crash_logged">The crash details have been saved in \"%1$s\".</string>
98 <string name="message_no_daemon">No running tinc daemon has been found.</string>
98 99
99 <string name="value_none">none</string> 100 <string name="value_none">none</string>
100 <string name="value_yes">yes</string> 101 <string name="value_yes">yes</string>