From c1339aa5c693c10a8c4fb75cc8cc5bbb08c98e9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= Date: Sat, 10 Jun 2023 15:29:48 +0100 Subject: [PATCH] App Manager: Only set up to date apps on FOSSILQHYBRID --- .../AbstractAppManagerFragment.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AbstractAppManagerFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AbstractAppManagerFragment.java index 016fc3ad5..7d7697a64 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AbstractAppManagerFragment.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AbstractAppManagerFragment.java @@ -143,17 +143,20 @@ public abstract class AbstractAppManagerFragment extends Fragment { GBDeviceApp app = new GBDeviceApp(uuid, appName, appCreator, appVersion, appType, previewImage); app.setOnDevice(true); - if ((mGBDevice.getType() == DeviceType.FOSSILQHYBRID) && (app.getType() == GBDeviceApp.Type.WATCHFACE) && (!QHybridConstants.HYBRIDHR_WATCHFACE_VERSION.equals(appVersion))) { - app.setUpToDate(false); - } - try { - if ((app.getType() == GBDeviceApp.Type.APP_GENERIC) && ((new Version(app.getVersion())).smallerThan(new Version(QHybridConstants.KNOWN_WAPP_VERSIONS.get(app.getName()))))) { + if (mGBDevice.getType() == DeviceType.FOSSILQHYBRID) { + if ((app.getType() == GBDeviceApp.Type.WATCHFACE) && (!QHybridConstants.HYBRIDHR_WATCHFACE_VERSION.equals(appVersion))) { app.setUpToDate(false); } - } catch (IllegalArgumentException e) { - LOG.warn("App JSON: " + app.getJSON().toString()); - LOG.warn("Couldn't read app version", e); + try { + if ((app.getType() == GBDeviceApp.Type.APP_GENERIC) && ((new Version(app.getVersion())).smallerThan(new Version(QHybridConstants.KNOWN_WAPP_VERSIONS.get(app.getName()))))) { + app.setUpToDate(false); + } + } catch (IllegalArgumentException e) { + LOG.warn("App JSON: " + app.getJSON().toString()); + LOG.warn("Couldn't read app version", e); + } } + if (filterApp(app)) { appList.add(app); }