Changeset 31827 in osm for applications/editors/josm/plugins/mapillary

Timestamp:

2015-12-15T14:16:06+01:00 (9 years ago)

Author:

floscher

Message:

[mapillary] Fix Sonar complaints about MapillaryUser.isTokenValid

Location:

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary

Files:

• MapillaryPlugin.java (modified) (1 diff)
• oauth/MapillaryUser.java (modified) (3 diffs)
• oauth/OAuthPortListener.java (modified) (1 diff)

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryPlugin.java

@@ -131 +131 @@
 
     if (Main.pref.get("mapillary.access-token") == null)
-      MapillaryUser.isTokenValid = false;
+      MapillaryUser.setTokenValid(false);
   }
 

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/oauth/MapillaryUser.java

@@ -23 +23 @@
   private static String imagesHash;
   /** If the stored token is valid or not. */
-  public static boolean isTokenValid = true;
+  private static boolean isTokenValid = true;
 
   private MapillaryUser() {
@@ -82 +82 @@
    * Resets the MapillaryUser to null values.
    */
-  public static void reset() {
+  public static synchronized void reset() {
     username = null;
     imagesPolicy = null;
@@ -89 +89 @@
     Main.pref.put("mapillary.access-token", null);
   }
+
+  public static synchronized void setTokenValid(boolean value) {
+    isTokenValid = value;
+  }
 }

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/oauth/OAuthPortListener.java

@@ -71 +71 @@
       Main.info("Successful login with Mapillary, the access token is: " + accessToken);
       // Saves the access token in preferences.
-      MapillaryUser.isTokenValid = true;
+      MapillaryUser.setTokenValid(true);
       if (Main.main != null) {
         Main.pref.put("mapillary.access-token", accessToken);