Merge pull request #5 from misty-/master

[upd] Ignore if '.apps.googleusercontent.com' entered in API Id string in add-on settings
Kolifanes · Mar 20, 2016 · fc74312 · fc74312
2 parents 2e0e840 + cf22676
commit fc74312
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/addon.xml b/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.youtube" name="YouTube" version="5.1.20.4" provider-name="bromix">
+<addon id="plugin.video.youtube" name="YouTube" version="5.1.20.5" provider-name="bromix">
 	<requires>
 		<import addon="xbmc.python" version="2.1.0"/>
 	</requires>

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,6 @@
+5.1.20.5 (2016-03-20)
+[upd] Ignore if '.apps.googleusercontent.com' entered in API Id string in add-on settings
+
 5.1.20.4 (2016-03-05)
 [add] API Key in add-on settings
 [upd] All string.po for new API Key functionality. New entries in language string.po files not translated from English.

diff --git a/resources/lib/youtube/client/login_client.py b/resources/lib/youtube/client/login_client.py
@@ -9,7 +9,7 @@
 
 addon = xbmcaddon.Addon()
 api_key = addon.getSetting('youtube.api.key')
-api_id = addon.getSetting('youtube.api.id')
+api_id = addon.getSetting('youtube.api.id').replace('.apps.googleusercontent.com', '')
 api_secret = addon.getSetting('youtube.api.secret')
 
 # Kodi 17 support by Uukrul