Prepare backend 1

3 files changed, 11 insertions, 1 deletions

diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/client/API.java b/app/src/main/java/fr/gouv/etalab/mastodon/client/API.java
index 10673f976..9b8e0d038 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/client/API.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/client/API.java
@@ -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<>();
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Account.java b/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Account.java
index 21ce9150f..6dc067985 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Account.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Account.java
@@ -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);
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 3b6ac8fd8..9e3e9b44a 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
@@ -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()));