Changeset 36146 in osm for applications/editors/josm/plugins/geochat/src/geochat/ChatServerConnection.java

Timestamp:

2023-09-20T17:53:20+02:00 (14 months ago)

Author:

taylor.smock

Message:

Fix #23171: UnknownHostException may cause issues in GeoChat

This appears to be something that can occur when running under WebStart.
To fix this, we check if (a) the JOSM website is offline and (b) if we are
running under webstart. If so, we don't check for messages.

Additionally, this patch converts geochat from the older time classes to the
newer java.time classes and fixes some lint issues.

File:

• applications/editors/josm/plugins/geochat/src/geochat/ChatServerConnection.java (modified) (11 diffs)

applications/editors/josm/plugins/geochat/src/geochat/ChatServerConnection.java

@@ -7 +7 @@
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
+import java.net.UnknownHostException;
+import java.time.Instant;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -14 +15 @@
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 
 import jakarta.json.JsonArray;
@@ -22 +25 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.coor.conversion.DecimalDegreesCoordinateFormat;
+import org.openstreetmap.josm.data.preferences.JosmUrls;
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.io.NetworkManager;
+import org.openstreetmap.josm.io.OnlineResource;
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -37 +44 @@
     public static final String TOKEN_PREFIX = "=";
     private static final String TOKEN_PATTERN = "^[a-zA-Z0-9]{10}$";
+    private static final ScheduledThreadPoolExecutor EXECUTOR = new ScheduledThreadPoolExecutor(1);
 
     private int userId;
@@ -42 +50 @@
     private static ChatServerConnection instance;
     private final Set<ChatServerConnectionListener> listeners;
-    private final LogRequest requestThread;
 
     private ChatServerConnection() {
@@ -48 +55 @@
         userName = null;
         listeners = new HashSet<>();
-        requestThread = new LogRequest();
-        new Thread(requestThread).start();
+        LogRequest requestThread = new LogRequest();
+        final int interval = Config.getPref().getInt("geochat.interval", 2);
+        EXECUTOR.scheduleAtFixedRate(requestThread, interval, interval, TimeUnit.SECONDS);
     }
 
@@ -116 +124 @@
             return;
         }
-        new Thread(() -> {
+        // Blocking the geochat executor here isn't a big deal, since we need to be logged in for chat anyway.
+        EXECUTOR.schedule(() -> {
             try {
                 int cnt = 10;
@@ -127 +136 @@
             }
             autoLogin(userName);
-        }).start();
+        }, 200, TimeUnit.MILLISECONDS);
     }
 
@@ -315 +324 @@
         private long lastId;
         private boolean lastStatus;
-        private boolean stopping;
 
         @Override
         public void run() {
             //            lastId = Config.getPref().getLong("geochat.lastid", 0);
-            int interval = Config.getPref().getInt("geochat.interval", 2);
-            while (!stopping) {
+            if (!NetworkManager.isOffline(OnlineResource.JOSM_WEBSITE) || !Utils.isRunningWebStart()) {
                 process();
-                try {
-                    Thread.sleep(interval * 1000L);
-                } catch (InterruptedException e) {
-                    Thread.currentThread().interrupt();
-                    stopping = true;
-                    Logging.trace(e);
-                }
-            }
-        }
-
-        public void stop() {
-            stopping = true;
-        }
-
-        public void process() {
+            }
+        }
+
+        private void process() {
             if (!isLoggedIn()) {
                 fireStatusChanged(false);
@@ -371 +367 @@
                 Logging.trace(ex);
                 json = null; // ?
+                final Throwable root = Utils.getRootCause(ex);
+                if (root instanceof UnknownHostException) {
+                    UnknownHostException uhe = (UnknownHostException) root;
+                    NetworkManager.addNetworkError(uhe.getMessage(), uhe);
+                    if (JosmUrls.getInstance().getJOSMWebsite().endsWith(uhe.getMessage())) {
+                        NetworkManager.setOffline(OnlineResource.JOSM_WEBSITE);
+                    }
+                }
             }
             if (json == null) {
@@ -424 +428 @@
                     boolean incoming = msg.getBoolean("incoming");
                     ChatMessage cm = new ChatMessage(id, new LatLon(lat, lon), author,
-                            incoming, message, new Date(timeStamp * 1000));
+                            incoming, message, Instant.ofEpochSecond(timeStamp));
                     cm.setPrivate(priv);
                     if (msg.get("recipient") != null && !incoming)