MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Correct build number comparison for update check IDEA-CR-7070

Browse Source
This commit is contained in:
Ivan Chirkov
2015-11-30 13:23:41 +01:00
parent f79d6fb7b5
commit 37060b91ab
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ide/plugins/PluginManager.java
-1
View File
@@ -101,7 +101,6 @@ public class PluginManager extends PluginManagerCore {
}
/**
* Returns file with list of once installed plugins if it exists or null otherwise.
* @return file with list of once installed plugins if it exists, null otherwise
*/
@Nullable
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateCheckerComponent.java
+3 -7
View File
@@ -17,7 +17,6 @@ package com.intellij.openapi.updateSettings.impl;
import com.intellij.ide.AppLifecycleListener;
import com.intellij.ide.IdeBundle;
import com.intellij.ide.plugins.PluginManager;
import com.intellij.notification.Notification;
import com.intellij.notification.NotificationListener;
import com.intellij.notification.NotificationType;
@@ -29,10 +28,10 @@ import com.intellij.openapi.components.ApplicationComponent;
import com.intellij.openapi.options.ShowSettingsUtil;
import com.intellij.openapi.updateSettings.UpdateStrategyCustomization;
import com.intellij.openapi.updateSettings.impl.pluginsAdvertisement.PluginsAdvertiser;
import com.intellij.openapi.util.BuildNumber;
import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.util.Ref;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.util.Alarm;
import com.intellij.util.text.DateFormatUtil;
import org.jetbrains.annotations.NotNull;
@@ -110,11 +109,8 @@ public class UpdateCheckerComponent implements ApplicationComponent {
String currentBuild = ApplicationInfo.getInstance().getBuild().asString();
long timeToNextCheck = mySettings.getLastTimeChecked() + CHECK_INTERVAL - System.currentTimeMillis();
boolean pluginsWereJustImportedFromPreviousVersion = PluginManager.getOnceInstalledIfExists() != null;
if (StringUtil.compareVersionNumbers(mySettings.getLasBuildChecked(), currentBuild) < 0 ||
timeToNextCheck <= 0 ||
pluginsWereJustImportedFromPreviousVersion) {
if (BuildNumber.fromString(mySettings.getLasBuildChecked()).compareTo(BuildNumber.fromString(currentBuild)) < 0 ||
timeToNextCheck <= 0) {
myCheckRunnable.run();
}
else {