Changeset 15084 in josm for trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java

Timestamp:

2019-05-18T16:29:09+02:00 (5 years ago)

Author:

Don-vip

Message:

see #17722 - proper notification of user block

File:

• trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java

@@ -2 +2 @@
 package org.openstreetmap.josm.tools;
 
+import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
 import static org.openstreetmap.josm.tools.I18n.trn;
@@ -43 +44 @@
 public final class ExceptionUtil {
 
+    /**
+     * Error message sent by the OSM API when a user has been blocked.
+     */
+    private static final String OSM_API_BLOCKED =
+            marktr("Your access to the API has been blocked. Please log-in to the web interface to find out more.");
+
     private ExceptionUtil() {
         // Hide default constructor for utils classes
@@ -296 +303 @@
     public static String explainFailedAuthorisation(OsmApiException e) {
         Logging.error(e);
-        String header = e.getErrorHeader();
-        String body = e.getErrorBody();
-        String msg;
-        if (header != null) {
-            if (body != null && !header.equals(body)) {
-                msg = header + " (" + body + ')';
-            } else {
-                msg = header;
-            }
-        } else {
-            msg = body;
-        }
+        String msg = e.getDisplayMessage();
 
         if (msg != null && !msg.isEmpty()) {
@@ -726 +722 @@
     }
 
+    /**
+     * Determines if the OSM API exception has been thrown because user has been blocked.
+     * @param e OSM API exception
+     * @return {@code true} if the OSM API exception has been thrown because user has been blocked
+     * @since 15084
+     */
+    public static boolean isUserBlocked(OsmApiException e) {
+        return OSM_API_BLOCKED.equals(e.getErrorHeader());
+    }
+
     static String getUrlFromException(OsmApiException e) {
         if (e.getAccessedUrl() != null) {