luv090909/FitoTrack
1
0
Fork 0
mirror of https://github.com/russok/FitoTrack.git synced 2025-10-29 00:32:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.0' into develop

Browse Source
This commit is contained in:
jannis 2019-12-25 23:56:43 +01:00
commit db0690a351
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/build.gradle
View File

@ -81,7 +81,6 @@ dependencies {
configurations {
compile.exclude group: 'net.sf.kxml', module: 'kxml2' // already included in Android
}
implementation 'oauth.signpost:signpost-commonshttp4:1.2.1.2'
// Android Room Database
def room_version = "2.2.0"

8
app/src/main/java/de/tadris/fitness/osm/OAuthUrlProvider.java
View File

@ -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";