From c323ed125b181c1bdf98159e3fa4b1d954e14de2 Mon Sep 17 00:00:00 2001
From: Vinicius Moreira <vinicius_fmoreira@hotmail.com>
Date: Thu, 24 Oct 2019 14:52:25 -0300
Subject: [PATCH] [snap] fix: not showing 'API is out' popup when there is no
 internet connection

---
 bauh/api/abstract/controller.py  |  3 ++-
 bauh/gems/appimage/controller.py |  2 +-
 bauh/gems/arch/controller.py     |  2 +-
 bauh/gems/flatpak/controller.py  |  2 +-
 bauh/gems/snap/controller.py     | 11 ++++++-----
 bauh/view/core/controller.py     |  6 ++++--
 6 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/bauh/api/abstract/controller.py b/bauh/api/abstract/controller.py
index 2a00373a..41d9abd1 100644
--- a/bauh/api/abstract/controller.py
+++ b/bauh/api/abstract/controller.py
@@ -213,8 +213,9 @@ class SoftwareManager(ABC):
         pass
 
     @abstractmethod
-    def list_warnings(self) -> List[str]:
+    def list_warnings(self, internet_available: bool) -> List[str]:
         """
+        :param internet_available
         :return: a list of warnings to be shown to the user
         """
         pass
diff --git a/bauh/gems/appimage/controller.py b/bauh/gems/appimage/controller.py
index 1d910b65..1f5ab7f9 100644
--- a/bauh/gems/appimage/controller.py
+++ b/bauh/gems/appimage/controller.py
@@ -396,7 +396,7 @@ class AppImageManager(SoftwareManager):
 
         return updates
 
-    def list_warnings(self) -> List[str]:
+    def list_warnings(self, internet_available: bool) -> List[str]:
         pass
 
     def list_suggestions(self, limit: int) -> List[PackageSuggestion]:
diff --git a/bauh/gems/arch/controller.py b/bauh/gems/arch/controller.py
index 6bc68437..62e826f5 100644
--- a/bauh/gems/arch/controller.py
+++ b/bauh/gems/arch/controller.py
@@ -710,7 +710,7 @@ class ArchManager(SoftwareManager):
         installed = self.read_installed(disk_loader=None, internet_available=internet_available).installed
         return [PackageUpdate(p.id, p.latest_version, 'aur') for p in installed if p.update]
 
-    def list_warnings(self) -> List[str]:
+    def list_warnings(self, internet_available: bool) -> List[str]:
         warnings = []
 
         if self.arch_distro:
diff --git a/bauh/gems/flatpak/controller.py b/bauh/gems/flatpak/controller.py
index 43445cb4..4e12c0d1 100644
--- a/bauh/gems/flatpak/controller.py
+++ b/bauh/gems/flatpak/controller.py
@@ -248,7 +248,7 @@ class FlatpakManager(SoftwareManager):
 
         return updates
 
-    def list_warnings(self) -> List[str]:
+    def list_warnings(self, internet_available: bool) -> List[str]:
         if flatpak.is_installed():
             if not flatpak.has_remotes_set():
                 return [self.i18n['flatpak.notification.no_remotes']]
diff --git a/bauh/gems/snap/controller.py b/bauh/gems/snap/controller.py
index 25054bd2..7ce13691 100644
--- a/bauh/gems/snap/controller.py
+++ b/bauh/gems/snap/controller.py
@@ -196,17 +196,18 @@ class SnapManager(SoftwareManager):
     def list_updates(self, internet_available: bool) -> List[PackageUpdate]:
         pass
 
-    def list_warnings(self) -> List[str]:
+    def list_warnings(self, internet_available: bool) -> List[str]:
         if snap.is_installed() and not snap.is_snapd_running():
             snap_bold = bold('Snap')
             return [self.i18n['snap.notification.snapd_unavailable'].format(bold('snapd'), snap_bold),
                     self.i18n['snap.notification.snap.disable'].format(snap_bold, bold(self.i18n['manage_window.settings.gems']))]
 
-        available, output = snap.is_api_available()
+        if internet_available:
+            available, output = snap.is_api_available()
 
-        if not available:
-            self.logger.warning('It seems Snap API is not available. Search output: {}'.format(output))
-            return [self.i18n['snap.notifications.api.unavailable'].format(bold('Snaps'), bold('Snap'))]
+            if not available:
+                self.logger.warning('It seems Snap API is not available. Search output: {}'.format(output))
+                return [self.i18n['snap.notifications.api.unavailable'].format(bold('Snaps'), bold('Snap'))]
 
     def _fill_suggestion(self, pkg_name: str, priority: SuggestionPriority, out: List[PackageSuggestion]):
         res = self.http_client.get_json(SNAP_API_URL + '/search?q=package_name:{}'.format(pkg_name))
diff --git a/bauh/view/core/controller.py b/bauh/view/core/controller.py
index 9769c109..e0f65f4a 100755
--- a/bauh/view/core/controller.py
+++ b/bauh/view/core/controller.py
@@ -307,13 +307,15 @@ class GenericSoftwareManager(SoftwareManager):
 
         return updates
 
-    def list_warnings(self) -> List[str]:
+    def list_warnings(self, internet_available: bool = None) -> List[str]:
         warnings = []
 
         if self.managers:
+            int_available = internet.is_available(self.context.http_client, self.context.logger)
+
             for man in self.managers:
                 if man.is_enabled():
-                    man_warnings = man.list_warnings()
+                    man_warnings = man.list_warnings(internet_available=int_available)
 
                     if man_warnings:
                         if warnings is None: