Re-add decode to unicode

Then convert to utf-8, then ascii for the auth header.

resources/lib/clientinfo.py

@@ -44,8 +44,7 @@ class ClientInfo():
 
         if utils.settings('deviceNameOpt') == "false":
             # Use Kodi's deviceName
-            deviceName = xbmc.getInfoLabel('System.FriendlyName')
-            deviceName = utils.normalize_string(deviceName)
+            deviceName = xbmc.getInfoLabel('System.FriendlyName').decode('utf-8')
         else:
             deviceName = utils.settings('deviceName')
             deviceName = deviceName.replace("\"", "_")

resources/lib/downloadutils.py

@@ -182,6 +182,7 @@ class DownloadUtils():
         clientInfo = self.clientInfo
 
         deviceName = clientInfo.getDeviceName()
+        deviceName = utils.normalize_string(deviceName.encode('utf-8'))
         deviceId = clientInfo.getDeviceId()
         version = clientInfo.getVersion()