Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'develop' into Peertube_stream

This commit is contained in:
stom79 2019-01-06 15:11:52 +01:00
parent 067e031214 f940f5b61f
commit 8cbc4c3d0e
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/fr/gouv/etalab/mastodon/activities/LoginActivity.java
View File

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

1
app/src/main/java/fr/gouv/etalab/mastodon/client/PeertubeAPI.java
View File

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