Merge remote-tracking branch 'origin/master' into CURA-7290_manual_account_sync

# Conflicts:
#	cura/API/Account.py
This commit is contained in:
Nino van Hooff 2020-05-12 14:59:01 +02:00
commit b40b8e8489
1938 changed files with 5246 additions and 2008 deletions

View file

@ -93,8 +93,8 @@ class CloudPackageChecker(QObject):
self._application.getCuraAPI().account.setSyncState(self.SYNC_SERVICE_NAME, SyncState.SUCCESS)
def _handleCompatibilityData(self, subscribed_packages_payload: List[Dict[str, Any]]) -> None:
user_subscribed_packages = [plugin["package_id"] for plugin in subscribed_packages_payload]
user_installed_packages = self._package_manager.getUserInstalledPackages()
user_subscribed_packages = {plugin["package_id"] for plugin in subscribed_packages_payload}
user_installed_packages = self._package_manager.getAllInstalledPackageIDs()
if user_subscribed_packages == self._last_check_packages:
# nothing new here