Changeset 5469 in josm for trunk

Timestamp:

2012-08-21T22:19:06+02:00 (12 years ago)

Author:

Don-vip

Message:

Do not try to init JosmUserIdentityManager from OAuth if no access token is set

File:

• trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java

@@ -12 +12 @@
 import org.openstreetmap.josm.data.Preferences.StringSetting;
 import org.openstreetmap.josm.data.osm.UserInfo;
+import org.openstreetmap.josm.gui.preferences.server.OAuthAccessTokenHolder;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.io.OsmServerUserInfoReader;
@@ -59 +60 @@
         if (instance == null) {
             instance = new JosmUserIdentityManager();
-            if (Main.pref.get("osm-server.auth-method").equals("oauth")) {
+            if (Main.pref.get("osm-server.auth-method").equals("oauth") && OAuthAccessTokenHolder.getInstance().containsAccessToken()) {
                 try {
                     instance.initFromOAuth(Main.parent);