Merge pull request #1938 from oliv3r/mainlist_fail

Fixed: Return early and navigate back when mainlist login fails

Author: basrieter

resources/lib/actions/folderaction.py

@@ -63,6 +63,11 @@ def execute(self):
                 watcher = StopWatch("Plugin process_folder_list With Items", Logger.instance())
                 media_items = self.__favorites
 
+            if media_items is None:
+                Logger.warning("process_folder_list returned None, navigating back")
+                xbmcplugin.endOfDirectory(self.handle, False)
+                return
+
             if len(media_items) == 0:
                 Logger.warning("process_folder_list returned %s items", len(media_items))
                 ok = self.__show_empty_information(media_items, favs=self.__favorites is not None)

resources/lib/chn_class.py

@@ -201,6 +201,15 @@ def process_folder_list(self, parent_item: Optional[MediaItem] = None) -> List[M
         if [p for p in data_parsers if p.LogOnRequired]:
             Logger.info("One or more dataparsers require logging in.")
             self.loggedOn = self.log_on()
+            if not self.loggedOn:
+                Logger.warning("Could not log on for: %s", self)
+                title = LanguageHelper.get_localized_string(LanguageHelper.LoginErrorTitle)
+                text = LanguageHelper.get_localized_string(LanguageHelper.LoginErrorText)
+                XbmcWrapper.show_notification(
+                    title, text, display_time=2000,
+                    notification_type=XbmcWrapper.Error,
+                    logger=Logger.instance())
+                return None
 
         # now set the headers here and not earlier in case they might have been update by the logon
         if parent_item is not None and parent_item.HttpHeaders: