Changeset 11969 in josm for trunk/src/org

Timestamp:

2017-04-22T01:28:44+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #14671 - Make sure we don't run the API call many times after system wakeup

File:

• trunk/src/org/openstreetmap/josm/io/MessageNotifier.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/io/MessageNotifier.java

@@ -57 +57 @@
 
         private int lastUnreadCount;
+        private long lastTimeInMillis;
 
         @Override
         public void run() {
             try {
-                final UserInfo userInfo = new OsmServerUserInfoReader().fetchUserInfo(NullProgressMonitor.INSTANCE,
-                        tr("get number of unread messages"));
-                final int unread = userInfo.getUnreadMessages();
-                if (unread > 0 && unread != lastUnreadCount) {
-                    GuiHelper.runInEDT(() -> {
-                        JPanel panel = new JPanel(new GridBagLayout());
-                        panel.add(new JLabel(trn("You have {0} unread message.", "You have {0} unread messages.", unread, unread)),
-                                GBC.eol());
-                        panel.add(new UrlLabel(Main.getBaseUserUrl() + '/' + userInfo.getDisplayName() + "/inbox",
-                                tr("Click here to see your inbox.")), GBC.eol());
-                        panel.setOpaque(false);
-                        new Notification().setContent(panel)
-                            .setIcon(JOptionPane.INFORMATION_MESSAGE)
-                            .setDuration(Notification.TIME_LONG)
-                            .show();
-                    });
-                    lastUnreadCount = unread;
+                long currentTime = System.currentTimeMillis();
+                // See #14671 - Make sure we don't run the API call many times after system wakeup
+                if (currentTime >= lastTimeInMillis + TimeUnit.MINUTES.toMillis(PROP_INTERVAL.get())) {
+                    lastTimeInMillis = currentTime;
+                    final UserInfo userInfo = new OsmServerUserInfoReader().fetchUserInfo(NullProgressMonitor.INSTANCE,
+                            tr("get number of unread messages"));
+                    final int unread = userInfo.getUnreadMessages();
+                    if (unread > 0 && unread != lastUnreadCount) {
+                        GuiHelper.runInEDT(() -> {
+                            JPanel panel = new JPanel(new GridBagLayout());
+                            panel.add(new JLabel(trn("You have {0} unread message.", "You have {0} unread messages.", unread, unread)),
+                                    GBC.eol());
+                            panel.add(new UrlLabel(Main.getBaseUserUrl() + '/' + userInfo.getDisplayName() + "/inbox",
+                                    tr("Click here to see your inbox.")), GBC.eol());
+                            panel.setOpaque(false);
+                            new Notification().setContent(panel)
+                                .setIcon(JOptionPane.INFORMATION_MESSAGE)
+                                .setDuration(Notification.TIME_LONG)
+                                .show();
+                        });
+                        lastUnreadCount = unread;
+                    }
                 }
             } catch (OsmTransferException e) {