Changeset 16426 in josm for trunk/src/org/openstreetmap/josm/io/OsmServerReader.java

Timestamp:

2020-05-16T20:59:34+02:00 (4 years ago)

Author:

simon04

Message:

see #18712 - Add NetworkManager.isOffline(String) to test offline status of given URL

Deprecates OnlineResource.checkOfflineAccess(String, String)

File:

• trunk/src/org/openstreetmap/josm/io/OsmServerReader.java (modified) (2 diffs)

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

@@ -20 +20 @@
 import org.openstreetmap.josm.io.auth.CredentialsAgentException;
 import org.openstreetmap.josm.io.auth.CredentialsManager;
-import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.HttpClient;
 import org.openstreetmap.josm.tools.Logging;
@@ -158 +157 @@
             boolean uncompressAccordingToContentDisposition, String httpMethod, byte[] requestBody) throws OsmTransferException {
         try {
-            OnlineResource.JOSM_WEBSITE.checkOfflineAccess(urlStr, Config.getUrls().getJOSMWebsite());
-            OnlineResource.OSM_API.checkOfflineAccess(urlStr, OsmApi.getOsmApi().getServerUrl());
+            if (NetworkManager.isOffline(urlStr)) {
+                throw new OsmApiException(new OfflineAccessException(tr("{0} not available (offline mode)", urlStr)));
+            }
 
             URL url = null;