From 818943f7e8bad37af981fc01452822bb040c2ca9 Mon Sep 17 00:00:00 2001
From: pacien
Date: Wed, 18 Apr 2018 22:36:03 +0200
Subject: Prevent logging when no daemon is running

---
 app/src/main/res/menu/menu_viewlog.xml | 1 +
 app/src/main/res/values/strings.xml    | 1 +
 2 files changed, 2 insertions(+)

(limited to 'app/src/main/res')

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 @@
 			tools:context="org.pacien.tincapp.activities.ViewLogActivity">
 
 	<item
+		android:id="@+id/log_viewer_action_toggle"
 		android:icon="@drawable/ic_pause_circle_outline_primary_24dp"
 		android:onClick="toggleLogging"
 		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 @@
 	<string name="message_invalid_network_name">Invalid network name.</string>
 	<string name="message_app_crash">The application has previously encountered a fatal error.</string>
 	<string name="message_crash_logged">The crash details have been saved in \"%1$s\".</string>
+	<string name="message_no_daemon">No running tinc daemon has been found.</string>
 
 	<string name="value_none">none</string>
 	<string name="value_yes">yes</string>
-- 
cgit v1.2.3