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

Prepare backend 1

This commit is contained in:
stom79 2019-01-14 09:48:01 +01:00
parent 3c09c3c5a6
commit dfbe96e0e9
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/fr/gouv/etalab/mastodon/client/API.java
View File

@ -3580,6 +3580,7 @@ public class API {
else
account.setNote("");
account.setUrl(resobj.get("url").toString());
account.setSocial("PEERTUBE");
if( resobj.has("avatar") && !resobj.get("avatar").toString().equals("null")){
account.setAvatar("https://" + instance + resobj.getJSONObject("avatar").get("path"));
}else
@ -3625,6 +3626,12 @@ public class API {
account.setAvatar_static(resobj.get("avatar_static").toString());
account.setHeader(resobj.get("header").toString());
account.setHeader_static(resobj.get("header_static").toString());
try{
account.setSocial(resobj.get("software").toString().toUpperCase());
}catch (Exception ignored){
account.setSocial("MASTODON");
}
try {
JSONArray fields = resobj.getJSONArray("fields");
LinkedHashMap<String, String> fieldsMap = new LinkedHashMap<>();

3
app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Account.java
View File

@ -133,6 +133,7 @@ public class Account implements Parcelable {
header_static = in.readString();
token = in.readString();
instance = in.readString();
social = in.readString();
metaDataSize = in.readInt();
for(int i = 0; i < metaDataSize; i++){
if( fields == null)
@ -150,6 +151,7 @@ public class Account implements Parcelable {
fieldsVerified.put(key,value);
}
}
@Override
@ -176,6 +178,7 @@ public class Account implements Parcelable {
dest.writeString(header_static);
dest.writeString(token);
dest.writeString(instance);
dest.writeString(social);
if( fields != null) {
metaDataSize = fields.size();
dest.writeInt(metaDataSize);

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

@ -1827,7 +1827,7 @@ public class PeertubeAPI {
account.setAcct(accountObject.get("name").toString()+"@" + accountObject.get("host"));
account.setDisplay_name(accountObject.get("name").toString());
account.setHost(accountObject.get("host").toString());
account.setSocial("PEERTUBE");
if( accountObject.has("createdAt") )
account.setCreated_at(Helper.mstStringToDate(context, accountObject.get("createdAt").toString()));