From a06a9ec30ab4a26bfda8d6c44c33412aaa70359f Mon Sep 17 00:00:00 2001 From: jannis Date: Wed, 11 Dec 2019 17:38:53 +0100 Subject: [PATCH] Fix Build Issues --- app/build.gradle | 2 -- .../main/java/de/tadris/fitness/osm/OAuthUrlProvider.java | 8 ++++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 8b8608a..7b89c50 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -80,9 +80,7 @@ dependencies { implementation ('de.westnordost:osmapi-traces:1.0') configurations { compile.exclude group: 'net.sf.kxml', module: 'kxml2' // already included in Android - compile.exclude module: 'httpclient' } - implementation 'oauth.signpost:signpost-commonshttp4:1.2.1.2' // Android Room Database def room_version = "2.2.0" diff --git a/app/src/main/java/de/tadris/fitness/osm/OAuthUrlProvider.java b/app/src/main/java/de/tadris/fitness/osm/OAuthUrlProvider.java index 430c280..83a6401 100644 --- a/app/src/main/java/de/tadris/fitness/osm/OAuthUrlProvider.java +++ b/app/src/main/java/de/tadris/fitness/osm/OAuthUrlProvider.java @@ -21,8 +21,8 @@ package de.tadris.fitness.osm; import oauth.signpost.OAuthConsumer; import oauth.signpost.OAuthProvider; -import oauth.signpost.commonshttp.CommonsHttpOAuthConsumer; -import oauth.signpost.commonshttp.CommonsHttpOAuthProvider; +import oauth.signpost.basic.DefaultOAuthConsumer; +import oauth.signpost.basic.DefaultOAuthProvider; public class OAuthUrlProvider { @@ -30,11 +30,11 @@ public class OAuthUrlProvider { static private final String CONSUMER_SECRET= "oH969vYW60fZLco6E09UQl3uFXqjl4siQbOL0q9q"; static OAuthConsumer getDefaultConsumer(){ - return new CommonsHttpOAuthConsumer(CONSUMER_KEY, CONSUMER_SECRET); + return new DefaultOAuthConsumer(CONSUMER_KEY, CONSUMER_SECRET); } static OAuthProvider getDefaultProvider(){ - return new CommonsHttpOAuthProvider(URL_TOKEN_REQUEST, URL_TOKEN_ACCESS, URL_AUTHORIZE); + return new DefaultOAuthProvider(URL_TOKEN_REQUEST, URL_TOKEN_ACCESS, URL_AUTHORIZE); } static private final String URL_TOKEN_REQUEST= "https://www.openstreetmap.org/oauth/request_token";