From 9fa9df04a5d3a0ab5b9525607978fc8ab3e0e48b Mon Sep 17 00:00:00 2001
From: Vinicius Moreira <vinicius_fmoreira@hotmail.com>
Date: Sun, 13 Oct 2019 18:14:24 -0300
Subject: [PATCH] [flatpak] fix update-checking for version 1.5.X

---
 CHANGELOG.md                    | 4 ++++
 bauh/__init__.py                | 2 +-
 bauh/gems/flatpak/controller.py | 6 +++++-
 bauh/gems/flatpak/worker.py     | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e0f3610e..d3a8da1c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [0.6.4] 2019-10-13
+### Fixes
+- Flatpak update-checking for version 1.5.X
+
 ## [0.6.3] 2019-10-11
 ### Fixes
 - AUR update check for some scenarios
diff --git a/bauh/__init__.py b/bauh/__init__.py
index 7b71e0d6..954f81ce 100644
--- a/bauh/__init__.py
+++ b/bauh/__init__.py
@@ -1,4 +1,4 @@
-__version__ = '0.6.3'
+__version__ = '0.6.4'
 __app_name__ = 'bauh'
 
 import os
diff --git a/bauh/gems/flatpak/controller.py b/bauh/gems/flatpak/controller.py
index ad9dc692..ddcc4171 100644
--- a/bauh/gems/flatpak/controller.py
+++ b/bauh/gems/flatpak/controller.py
@@ -96,7 +96,11 @@ class FlatpakManager(SoftwareManager):
             for app_json in installed:
                 model = self._map_to_model(app_json=app_json, installed=True,
                                            disk_loader=disk_loader, internet=internet_available)
-                model.update = app_json['ref'] in updates[0] if updates else None
+                if version >= '1.5.0':
+                    model.update = '{}/{}'.format(app_json['id'], app_json['branch']) in updates[0] if updates else None
+                else:
+                    model.update = app_json['ref'] in updates[0] if updates else None
+
                 models.append(model)
 
         return SearchResult(models, None, len(models))
diff --git a/bauh/gems/flatpak/worker.py b/bauh/gems/flatpak/worker.py
index f9e709db..1eed1c1d 100644
--- a/bauh/gems/flatpak/worker.py
+++ b/bauh/gems/flatpak/worker.py
@@ -30,7 +30,7 @@ class FlatpakAsyncDataLoader(Thread):
             try:
                 res = self.http_client.get('{}/apps/{}'.format(FLATHUB_API_URL, self.app.id))
 
-                if res.status_code == 200 and res.text:
+                if res and res.text:
                     data = res.json()
 
                     if not self.app.version: