Merge pull request #311 from oddstr13/pr-kodi19-3

Add Kodi 17 backwards compat to #308
jellyfin · May 30, 2020 · d50283b · d50283b
2 parents c4ea427 + db51abd
commit d50283b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/jellyfin_kodi/dialogs/loginmanual.py b/jellyfin_kodi/dialogs/loginmanual.py
@@ -8,6 +8,7 @@
 
 from helper import translate
 from helper import LazyLogger
+from helper import kodi_version
 
 ##################################################################################################
 
@@ -97,13 +98,20 @@ def onAction(self, action):
 
     def _add_editcontrol(self, x, y, height, width, password=False):
 
-        control = xbmcgui.ControlEdit(0, 0, 0, 0,
-                                      label="User",
-                                      font="font13",
-                                      textColor="FF00A4DC",
-                                      disabledColor="FF888888",
-                                      focusTexture="-",
-                                      noFocusTexture="-")
+        kwargs = dict(
+            label="User",
+            font="font13",
+            textColor="FF00A4DC",
+            disabledColor="FF888888",
+            focusTexture="-",
+            noFocusTexture="-"
+        )
+
+        # TODO: Kodi 17 compat removal cleanup
+        if kodi_version() < 18:
+            kwargs['isPassword'] = password
+
+        control = xbmcgui.ControlEdit(0, 0, 0, 0, **kwargs)
 
         control.setPosition(x, y)
         control.setHeight(height)
@@ -112,7 +120,8 @@ def _add_editcontrol(self, x, y, height, width, password=False):
         self.addControl(control)
 
         # setType has no effect before the control is added to a window
-        if password:
+        # TODO: Kodi 17 compat removal cleanup
+        if password and not kodi_version() < 18:
             control.setType(xbmcgui.INPUT_TYPE_PASSWORD, "Please enter password")
 
         return control

diff --git a/jellyfin_kodi/helper/utils.py b/jellyfin_kodi/helper/utils.py
@@ -33,7 +33,7 @@ def addon_id():
 
 
 def kodi_version():
-    return xbmc.getInfoLabel('System.BuildVersion')[:2]
+    return int(xbmc.getInfoLabel('System.BuildVersion').split('.')[0])
 
 
 def window(key, value=None, clear=False, window_id=10000):