Changeset 12928 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2017-10-06T15:17:51+02:00 (7 years ago)

Author:

bastiK

Message:

see #15229 - do not copy the entire preferences list, just to set a custom server API in OAuth wizard

File:

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

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

@@ -114 +114 @@
     protected void addOAuthAuthorizationHeader(HttpClient connection) throws OsmTransferException {
         if (oauthParameters == null) {
-            oauthParameters = OAuthParameters.createFromPreferences(Main.pref);
+            oauthParameters = OAuthParameters.createFromApiUrl(OsmApi.getOsmApi().getServerUrl());
         }
         OAuthConsumer consumer = oauthParameters.buildConsumer();
@@ -146 +146 @@
             fetcher.obtainAccessToken(apiUrl);
             OAuthAccessTokenHolder.getInstance().setSaveToPreferences(true);
-            OAuthAccessTokenHolder.getInstance().save(Main.pref, CredentialsManager.getInstance());
+            OAuthAccessTokenHolder.getInstance().save(CredentialsManager.getInstance());
         } catch (MalformedURLException | InterruptedException | InvocationTargetException e) {
             throw new MissingOAuthAccessTokenException(e);