From 501a7ddbd99e2fe026b4fa7fcef1e448ea54fcd8 Mon Sep 17 00:00:00 2001
From: tomkat83 <kathriner.thomas@gmail.com>
Date: Sun, 5 Mar 2017 15:59:55 +0100
Subject: [PATCH] New setting for Alexa opting out

---
 resources/language/English/strings.xml |  3 +++
 resources/language/German/strings.xml  |  3 +++
 resources/settings.xml                 | 14 +++++++-------
 service.py                             |  3 ++-
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/resources/language/English/strings.xml b/resources/language/English/strings.xml
index 72a653b9..ce15f7fd 100644
--- a/resources/language/English/strings.xml
+++ b/resources/language/English/strings.xml
@@ -513,4 +513,7 @@
     <string id="39601">Could not stop the database from running. Please try again later.</string>
     <string id="39602">Remove all cached artwork? (recommended!)</string>
     <string id="39603">Reset all PlexKodiConnect Addon settings? (this is usually NOT recommended and unnecessary!)</string>
+
+    <string id="39700">Amazon Alexa (Voice Recognition)</string>
+    <string id="39701">Alexa aktivieren</string>
 </strings>
diff --git a/resources/language/German/strings.xml b/resources/language/German/strings.xml
index 499ca4f1..3c5a5515 100644
--- a/resources/language/German/strings.xml
+++ b/resources/language/German/strings.xml
@@ -513,4 +513,7 @@
     <string id="39601">Kodi Datenbank konnte nicht gestoppt werden. Bitte später erneut versuchen.</string>
     <string id="39602">Alle zwischengespeicherten Bilder löschen? (empfohlen!)</string>
     <string id="39603">Alle PlexKodiConnect Einstellungen zurücksetzen? (normalerweise NICHT empfohlen und nicht nötig!)</string>
+
+    <string id="39700">Amazon Alexa (Spracherkennung)</string>
+    <string id="39701">Alexa aktivieren</string>
 </strings>
\ No newline at end of file
diff --git a/resources/settings.xml b/resources/settings.xml
index b2e39d42..fd50830b 100644
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -21,13 +21,9 @@
 	</category>
 
 	<category label="Plex">
-		<setting id="enableContext" type="bool" label="30413" default="true" />
-		<setting id="skipContextMenu" type="bool" label="30520" default="false" visible="eq(-1,true)" subsetting="true" />
 		<setting type="lsep" label="plex.tv"/>
 		<setting id="plex_status" label="39071" type="text" default="Not logged in to plex.tv" enable="false" /><!-- Current plex.tv status: -->
 		<setting id="plexLogin" label="Plex user:" type="text" default="" enable="false" />
-		<setting type="sep" text=""/>
-
 		<setting id="myplexlogin" label="39025" type="bool" default="true" /> <!-- Log into plex.tv on startup -->
 		<setting label="39209" type="action" action="RunPlugin(plugin://plugin.video.plexkodiconnect?mode=togglePlexTV)" option="close" />
 		<setting id="plexhome" label="Plex home in use" type="bool" default="" visible="false" />
@@ -37,9 +33,13 @@
 		<setting type="lsep" label="39008" />
 		<setting id="plexCompanion" label="39004" type="bool" default="true" />
 		<setting id="deviceName" label="30016" type="text" visible="eq(-1,true)" default="PlexKodiConnect" subsetting="true" />
-		<setting id="companionPort" label="39005" type="number" default="3005" option="int" visible="eq(-3,true)" subsetting="true" />
-		<setting id="companionUpdatePort" label="39078" type="number" default="32412" option="int" visible="eq(-4,true)" subsetting="true" />
-
+		<setting id="companionPort" label="39005" type="number" default="3005" option="int" visible="eq(-2,true)" subsetting="true" />
+		<setting id="companionUpdatePort" label="39078" type="number" default="32412" option="int" visible="eq(-3,true)" subsetting="true" />
+		<setting type="lsep" label="39700" />
+		<setting id="enable_alexa" label="39701" type="bool" default="true"/>
+		<setting type="lsep" label="" />
+		<setting id="enableContext" type="bool" label="30413" default="true" />
+		<setting id="skipContextMenu" type="bool" label="30520" default="false" visible="eq(-1,true)" subsetting="true" />
 		<setting id="plex_restricteduser" type="bool" default="false" visible="false"/>
 		<setting id="plex_allows_mediaDeletion" type="bool" default="true" visible="false"/>
 		<setting id="companion_show_gdm_port_warning" type="bool" default="true" visible="false"/>
diff --git a/service.py b/service.py
index 6b23706f..696a87b9 100644
--- a/service.py
+++ b/service.py
@@ -204,7 +204,8 @@ class Service():
                             self.ws_running = True
                             self.ws.start()
                         # Start the Alexa thread
-                        if not self.alexa_running:
+                        if (not self.alexa_running and
+                                settings('enable_alexa') == 'true'):
                             self.alexa_running = True
                             self.alexa.start()
                         # Start the syncing thread