diff options
| author | stom79 <tschneider.ac@gmail.com> | 2019-01-06 15:11:52 +0100 |
|---|---|---|
| committer | stom79 <tschneider.ac@gmail.com> | 2019-01-06 15:11:52 +0100 |
| commit | 8cbc4c3d0ed7f315dd7bce6a1e776f7ec243a018 (patch) | |
| tree | f71cf171edd13db7be64a4c9769ea608efd43fa9 /app/src/main/java | |
| parent | 067e0312143ca7ce30f9a9f78d23cd1e963a9b63 (diff) | |
| parent | f940f5b61fb3b10cbc7a68b74b3f21220ef7b86b (diff) | |
Merge branch 'develop' into Peertube_stream
Diffstat (limited to 'app/src/main/java')
| -rw-r--r-- | app/src/main/java/fr/gouv/etalab/mastodon/activities/LoginActivity.java | 4 | ||||
| -rw-r--r-- | app/src/main/java/fr/gouv/etalab/mastodon/client/PeertubeAPI.java | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/LoginActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/LoginActivity.java index 38976996b..5f5384158 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/LoginActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/LoginActivity.java @@ -122,7 +122,7 @@ public class LoginActivity extends BaseActivity { String token = resobj.get("access_token").toString(); String refresh_token = null; if( resobj.has("refresh_token")) - refresh_token = resobj.get("access_token").toString(); + refresh_token = resobj.get("refresh_token").toString(); SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); SharedPreferences.Editor editor = sharedpreferences.edit(); editor.putString(Helper.PREF_KEY_OAUTH_TOKEN, token); @@ -515,7 +515,7 @@ public class LoginActivity extends BaseActivity { String token = resobj.get("access_token").toString(); String refresh_token = null; if( resobj.has("refresh_token")) - refresh_token = resobj.get("access_token").toString(); + refresh_token = resobj.get("refresh_token").toString(); SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); SharedPreferences.Editor editor = sharedpreferences.edit(); editor.putString(Helper.PREF_KEY_OAUTH_TOKEN, token); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/client/PeertubeAPI.java b/app/src/main/java/fr/gouv/etalab/mastodon/client/PeertubeAPI.java index bfd238aa0..9e0ecf134 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/client/PeertubeAPI.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/client/PeertubeAPI.java @@ -236,7 +236,6 @@ public class PeertubeAPI { params.put("client_id", client_id); params.put("client_secret", client_secret); params.put("refresh_token", refresh_token); - try { String response = new HttpsConnection(context).post(getAbsoluteUrl("/users/token"), 60, params, null); JSONObject resobj = new JSONObject(response); |