From ebdf48df70e49b6e3f35ad4280f46aab1b793108 Mon Sep 17 00:00:00 2001
From: stom79 <tschneider.ac@gmail.com>
Date: Wed, 26 Dec 2018 15:43:36 +0100
Subject: [PATCH] Follow PixelFed instances

---
 .../mastodon/activities/BaseMainActivity.java |  53 ++++++-
 .../mastodon/activities/MediaActivity.java    |   2 +-
 .../asynctasks/RetrieveFeedsAsyncTask.java    |   6 +-
 .../fr/gouv/etalab/mastodon/client/API.java   |  40 ++++-
 .../mastodon/drawers/StatusListAdapter.java   | 145 ++++++++++++++----
 .../fragments/DisplayStatusFragment.java      |  34 ++--
 .../etalab/mastodon/helper/CrossActions.java  |  12 +-
 .../gouv/etalab/mastodon/helper/Helper.java   |  12 +-
 app/src/main/res/drawable-hdpi/pixelfed.png   | Bin 0 -> 2045 bytes
 app/src/main/res/drawable-ldpi/pixelfed.png   | Bin 0 -> 704 bytes
 app/src/main/res/drawable-mdpi/pixelfed.png   | Bin 0 -> 1127 bytes
 app/src/main/res/drawable-xhdpi/pixelfed.png  | Bin 0 -> 3137 bytes
 app/src/main/res/drawable-xxhdpi/pixelfed.png | Bin 0 -> 5886 bytes
 .../main/res/drawable-xxxhdpi/pixelfed.png    | Bin 0 -> 8674 bytes
 app/src/main/res/layout/drawer_art.xml        |  33 +++-
 app/src/main/res/layout/search_instance.xml   |  27 +++-
 app/src/main/res/menu/remote_instances.xml    |  10 ++
 app/src/main/res/values/strings.xml           |   3 +
 18 files changed, 301 insertions(+), 76 deletions(-)
 create mode 100644 app/src/main/res/drawable-hdpi/pixelfed.png
 create mode 100644 app/src/main/res/drawable-ldpi/pixelfed.png
 create mode 100644 app/src/main/res/drawable-mdpi/pixelfed.png
 create mode 100644 app/src/main/res/drawable-xhdpi/pixelfed.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/pixelfed.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/pixelfed.png

diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java
index c067df164..b854beaeb 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java
@@ -70,10 +70,10 @@ import android.view.inputmethod.InputMethodManager;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.AutoCompleteTextView;
-import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.RadioGroup;
 import android.widget.RelativeLayout;
 import android.widget.SeekBar;
 import android.widget.TextView;
@@ -407,6 +407,7 @@ public abstract class BaseMainActivity extends BaseActivity
                 if(remoteInstances != null) {
                     SubMenu submMastodon = popup.getMenu().findItem(R.id.action_show_mastodon).getSubMenu();
                     SubMenu submPeertube = popup.getMenu().findItem(R.id.action_show_peertube).getSubMenu();
+                    SubMenu submPixelfed = popup.getMenu().findItem(R.id.action_show_pixelfed).getSubMenu();
                     SubMenu submChannel = popup.getMenu().findItem(R.id.action_show_channel).getSubMenu();
                     int i = 0, j = 0 , k = 0;
                     for (RemoteInstance remoteInstance : remoteInstances) {
@@ -473,6 +474,37 @@ public abstract class BaseMainActivity extends BaseActivity
                             });
                             k++;
                         }
+                        if (remoteInstance.getType() == null || remoteInstance.getType().equals("PIXELFED")) {
+                            MenuItem itemPlaceHolder = submPixelfed.findItem(R.id.pixelfed_instance);
+                            if( itemPlaceHolder != null)
+                                itemPlaceHolder.setVisible(false);
+                            MenuItem item = submPixelfed.add(0, j, Menu.NONE, remoteInstance.getHost());
+                            item.setIcon(R.drawable.pixelfed);
+                            item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
+                                @Override
+                                public boolean onMenuItemClick(MenuItem item) {
+                                    DisplayStatusFragment statusFragment;
+                                    Bundle bundle = new Bundle();
+                                    statusFragment = new DisplayStatusFragment();
+                                    bundle.putSerializable("type", RetrieveFeedsAsyncTask.Type.PIXELFED);
+                                    bundle.putString("remote_instance", remoteInstance.getHost());
+                                    statusFragment.setArguments(bundle);
+                                    String fragmentTag = "REMOTE_INSTANCE";
+                                    instance_id = remoteInstance.getDbID();
+                                    FragmentManager fragmentManager = getSupportFragmentManager();
+                                    fragmentManager.beginTransaction()
+                                            .replace(R.id.main_app_container, statusFragment, fragmentTag).commit();
+                                    main_app_container.setVisibility(View.VISIBLE);
+                                    viewPager.setVisibility(View.GONE);
+                                    tabLayout.setVisibility(View.GONE);
+                                    toolbarTitle.setVisibility(View.VISIBLE);
+                                    delete_instance.setVisibility(View.VISIBLE);
+                                    toolbarTitle.setText(remoteInstance.getHost());
+                                    return false;
+                                }
+                            });
+                            j++;
+                        }
                         if (remoteInstance.getType() == null || remoteInstance.getType().equals("PEERTUBE")) {
                             MenuItem itemPlaceHolder = submPeertube.findItem(R.id.peertube_instances);
                             if( itemPlaceHolder != null)
@@ -516,7 +548,9 @@ public abstract class BaseMainActivity extends BaseActivity
                                 dialogBuilder.setView(dialogView);
 
                                 AutoCompleteTextView instance_list = dialogView.findViewById(R.id.search_instance);
-                                CheckBox peertube_instance  = dialogView.findViewById(R.id.peertube_instance);
+                                //Manage download of attachments
+                                RadioGroup radioGroup = dialogView.findViewById(R.id.set_attachment_group);
+
                                 instance_list.setFilters(new InputFilter[]{new InputFilter.LengthFilter(60)});
                                 dialogBuilder.setPositiveButton(R.string.validate, new DialogInterface.OnClickListener() {
                                     @Override
@@ -527,18 +561,23 @@ public abstract class BaseMainActivity extends BaseActivity
                                             @Override
                                             public void run() {
                                                 try {
-                                                    if( !peertube_instance.isChecked())
+                                                    if(radioGroup.getCheckedRadioButtonId() == R.id.mastodon_instance)
                                                         new HttpsConnection(BaseMainActivity.this).get("https://" + instanceName + "/api/v1/timelines/public?local=true", 10, null, null);
-                                                    else
+                                                    else  if( radioGroup.getCheckedRadioButtonId() == R.id.peertube_instance)
                                                         new HttpsConnection(BaseMainActivity.this).get("https://" + instanceName + "/api/v1/videos/", 10, null, null);
+                                                    else  if( radioGroup.getCheckedRadioButtonId() == R.id.pixelfed_instance) {
+                                                        new HttpsConnection(BaseMainActivity.this).get("https://" + instanceName + "/api/v1/timelines/public", 10, null, null);
+                                                    }
                                                     runOnUiThread(new Runnable() {
                                                         public void run() {
                                                             JSONObject resobj;
                                                             dialog.dismiss();
-                                                            if( peertube_instance.isChecked())
-                                                                new InstancesDAO(BaseMainActivity.this, db).insertInstance(instanceName, "PEERTUBE");
-                                                            else
+                                                            if(radioGroup.getCheckedRadioButtonId() == R.id.mastodon_instance)
                                                                 new InstancesDAO(BaseMainActivity.this, db).insertInstance(instanceName, "MASTODON");
+                                                            else  if( radioGroup.getCheckedRadioButtonId() == R.id.peertube_instance)
+                                                                new InstancesDAO(BaseMainActivity.this, db).insertInstance(instanceName, "PEERTUBE");
+                                                            else  if( radioGroup.getCheckedRadioButtonId() == R.id.pixelfed_instance)
+                                                                new InstancesDAO(BaseMainActivity.this, db).insertInstance(instanceName, "PIXELFED");
                                                             DisplayStatusFragment statusFragment;
                                                             Bundle bundle = new Bundle();
                                                             statusFragment = new DisplayStatusFragment();
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/MediaActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/MediaActivity.java
index b14fefa4c..bbef6be7e 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/MediaActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/MediaActivity.java
@@ -368,7 +368,7 @@ public class MediaActivity extends BaseActivity implements OnDownloadInterface {
             attachment.setType(type);
         }
         final String finalUrl = url;
-        switch (type){
+        switch (type.toLowerCase()){
             case "image":
                 pbar_inf.setScaleY(1f);
                 imageView.setVisibility(View.VISIBLE);
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveFeedsAsyncTask.java b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveFeedsAsyncTask.java
index c7ba3c25e..5c7991ca8 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveFeedsAsyncTask.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveFeedsAsyncTask.java
@@ -75,7 +75,8 @@ public class RetrieveFeedsAsyncTask extends AsyncTask<Void, Void, Void> {
         CACHE_STATUS,
         REMOTE_INSTANCE,
         ART,
-        NOTIFICATION
+        NOTIFICATION,
+        PIXELFED
     }
 
 
@@ -159,6 +160,9 @@ public class RetrieveFeedsAsyncTask extends AsyncTask<Void, Void, Void> {
             case CONVERSATION:
                 apiResponse = api.getConversationTimeline(max_id);
                 break;
+            case PIXELFED:
+                apiResponse = api.getPixelfedTimeline(instanceName, max_id);
+                break;
             case REMOTE_INSTANCE:
                 if( this.name != null && this.remoteInstance != null){ //For Peertube channels
                     apiResponse = api.getPeertubeChannelVideos(this.remoteInstance, this.name);
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 bc47ba348..b44c97c3f 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
@@ -803,6 +803,38 @@ public class API {
     }
 
 
+
+    /**
+     * Retrieves public pixelfed timeline for the account *synchronously*
+     * @param max_id   String id max
+     * @return APIResponse
+     */
+    public APIResponse getPixelfedTimeline(String remoteInstance, String max_id) {
+
+        HashMap<String, String> params = new HashMap<>();
+        if (max_id != null)
+            params.put("page", max_id);
+        statuses = new ArrayList<>();
+        try {
+            HttpsConnection httpsConnection = new HttpsConnection(context);
+            String response = httpsConnection.get(getAbsoluteUrlRemote(remoteInstance, "/timelines/public/"), 60, params, prefKeyOauthTokenT);
+            apiResponse.setSince_id(httpsConnection.getSince_id());
+            apiResponse.setMax_id(httpsConnection.getMax_id());
+            statuses = parseStatuses(context, new JSONArray(response));
+        } catch (HttpsConnection.HttpsConnectionException e) {
+            setError(e.getStatusCode(), e);
+        } catch (NoSuchAlgorithmException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        } catch (KeyManagementException e) {
+            e.printStackTrace();
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        apiResponse.setStatuses(statuses);
+        return apiResponse;
+    }
     /**
      * Retrieves Peertube videos from an instance *synchronously*
      * @return APIResponse
@@ -2957,9 +2989,6 @@ public class API {
             }catch (Exception e){status.setVisibility("public");}
             status.setLanguage(resobj.get("language").toString());
             status.setUrl(resobj.get("url").toString());
-            //TODO: replace by the value
-            status.setApplication(new Application());
-
             //Retrieves attachments
             JSONArray arrayAttachement = resobj.getJSONArray("media_attachments");
             ArrayList<Attachment> attachments = new ArrayList<>();
@@ -3043,7 +3072,6 @@ public class API {
             }
             status.setApplication(application);
 
-
             status.setAccount(parseAccountResponse(context, resobj.getJSONObject("account")));
             status.setContent(resobj.get("content").toString());
             status.setFavourites_count(Integer.valueOf(resobj.get("favourites_count").toString()));
@@ -3593,7 +3621,9 @@ public class API {
     private String getAbsoluteUrl(String action) {
         return Helper.instanceWithProtocol(this.instance) + "/api/v1" + action;
     }
-
+    private String getAbsoluteUrlRemote(String remote, String action) {
+        return "https://" + remote + "/api/v1" + action;
+    }
 
     private String getAbsoluteUrlRemoteInstance(String instanceName) {
         return "https://" + instanceName + "/api/v1/timelines/public?local=true";
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
index b6561dbf6..ff2ab3574 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
@@ -32,6 +32,7 @@ import android.os.Bundle;
 import android.os.CountDownTimer;
 import android.os.Handler;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.PopupMenu;
@@ -63,12 +64,16 @@ import android.widget.TimePicker;
 import android.widget.Toast;
 
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.DataSource;
+import com.bumptech.glide.load.engine.GlideException;
 import com.bumptech.glide.load.resource.bitmap.CenterCrop;
 import com.bumptech.glide.load.resource.bitmap.FitCenter;
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions;
+import com.bumptech.glide.request.RequestListener;
 import com.bumptech.glide.request.RequestOptions;
 import com.bumptech.glide.request.target.SimpleTarget;
+import com.bumptech.glide.request.target.Target;
 import com.bumptech.glide.request.transition.Transition;
 import com.github.stom79.mytransl.MyTransL;
 import com.github.stom79.mytransl.client.HttpsConnectionException;
@@ -106,6 +111,7 @@ import fr.gouv.etalab.mastodon.client.Entities.Emojis;
 import fr.gouv.etalab.mastodon.client.Entities.Error;
 import fr.gouv.etalab.mastodon.client.Entities.Status;
 import fr.gouv.etalab.mastodon.client.Entities.TagTimeline;
+import fr.gouv.etalab.mastodon.client.Glide.GlideApp;
 import fr.gouv.etalab.mastodon.fragments.DisplayStatusFragment;
 import fr.gouv.etalab.mastodon.helper.CrossActions;
 import fr.gouv.etalab.mastodon.helper.CustomTextView;
@@ -230,7 +236,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
     @Override
     public void onViewAttachedToWindow(@NonNull RecyclerView.ViewHolder holder) {
         super.onViewAttachedToWindow(holder);
-        if( type != RetrieveFeedsAsyncTask.Type.ART && (tagTimeline == null || !tagTimeline.isART()) && (holder.getItemViewType() == DISPLAYED_STATUS || holder.getItemViewType() == COMPACT_STATUS)) {
+        if( type != RetrieveFeedsAsyncTask.Type.ART && type != RetrieveFeedsAsyncTask.Type.PIXELFED && (tagTimeline == null || !tagTimeline.isART()) && (holder.getItemViewType() == DISPLAYED_STATUS || holder.getItemViewType() == COMPACT_STATUS)) {
             final ViewHolder viewHolder = (ViewHolder) holder;
             // Bug workaround for losing text selection ability, see:
             // https://code.google.com/p/android/issues/detail?id=208169
@@ -247,6 +253,8 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
         ImageView art_media, art_pp;
         TextView art_username, art_acct;
         LinearLayout art_author;
+        RelativeLayout status_show_more;
+        ImageView show_more_button_art;
         ViewHolderArt(View itemView) {
             super(itemView);
             art_media = itemView.findViewById(R.id.art_media);
@@ -254,6 +262,8 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
             art_username = itemView.findViewById(R.id.art_username);
             art_acct = itemView.findViewById(R.id.art_acct);
             art_author = itemView.findViewById(R.id.art_author);
+            status_show_more = itemView.findViewById(R.id.status_show_more);
+            show_more_button_art = itemView.findViewById(R.id.show_more_button_art);
         }
     }
 
@@ -436,7 +446,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
     @NonNull
     @Override
     public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        if( type == RetrieveFeedsAsyncTask.Type.ART || (tagTimeline != null && tagTimeline.isART()))
+        if(type == RetrieveFeedsAsyncTask.Type.PIXELFED ||  type == RetrieveFeedsAsyncTask.Type.ART || (tagTimeline != null && tagTimeline.isART()))
             return new ViewHolderArt(layoutInflater.inflate(R.layout.drawer_art, parent, false));
         else if( viewType == DISPLAYED_STATUS)
             return new ViewHolder(layoutInflater.inflate(R.layout.drawer_status, parent, false));
@@ -455,58 +465,125 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
     public void onBindViewHolder(@NonNull final RecyclerView.ViewHolder viewHolder, int i) {
         final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
         final String userId = sharedpreferences.getString(Helper.PREF_KEY_ID, null);
-        if( (type == RetrieveFeedsAsyncTask.Type.ART || (tagTimeline != null && tagTimeline.isART())) && viewHolder.getItemViewType() != HIDDEN_STATUS ) {
+        if( (type == RetrieveFeedsAsyncTask.Type.PIXELFED || type == RetrieveFeedsAsyncTask.Type.ART || (tagTimeline != null && tagTimeline.isART())) && viewHolder.getItemViewType() != HIDDEN_STATUS ) {
             final ViewHolderArt holder = (ViewHolderArt) viewHolder;
             final Status status = statuses.get(viewHolder.getAdapterPosition());
-
             if( !status.isClickable())
                 Status.transform(context, status);
             if( !status.isEmojiFound())
                 Status.makeEmojis(context, this, status);
-            if( status.getArt_attachment() != null)
-                Glide.with(context)
-                    .load(status.getArt_attachment().getPreview_url())
-                    .into(holder.art_media);
+
             if( status.getAccount() != null && status.getAccount().getAvatar() != null)
                 Glide.with(context)
                         .load(status.getAccount().getAvatar())
                         .apply(new RequestOptions().transforms(new FitCenter(), new RoundedCorners(10)))
                         .into(holder.art_pp);
-            holder.art_pp.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    Intent intent = new Intent(context, ShowAccountActivity.class);
-                    Bundle b = new Bundle();
-                    b.putParcelable("account", status.getAccount());
-                    intent.putExtras(b);
-                    context.startActivity(intent);
+
+            if( type == RetrieveFeedsAsyncTask.Type.PIXELFED){
+                boolean expand_media = sharedpreferences.getBoolean(Helper.SET_EXPAND_MEDIA, false);
+                if( status.getMedia_attachments() != null && status.getMedia_attachments().size() > 0)
+                    GlideApp.with(context)
+                            .asBitmap()
+                            .load(status.getMedia_attachments().get(0).getPreview_url())
+                            .listener(new RequestListener<Bitmap>(){
+                                @Override
+                                public boolean onResourceReady(Bitmap resource, Object model, Target<Bitmap> target, DataSource dataSource, boolean isFirstResource) {
+                                    if(status.isSensitive())
+                                        notifyStatusChanged(status);
+                                    return false;
+                                }
+
+                                @Override
+                                public boolean onLoadFailed(@Nullable GlideException e, Object model, Target target, boolean isFirstResource) {
+                                    return false;
+                                }
+                            })
+                            .into(holder.art_media);
+                RelativeLayout.LayoutParams rel_btn = new RelativeLayout.LayoutParams(
+                        ViewGroup.LayoutParams.MATCH_PARENT, holder.art_media.getHeight());
+                holder.status_show_more.setLayoutParams(rel_btn);
+                if (expand_media || !status.isSensitive()) {
+                    status.setAttachmentShown(true);
+                    holder.status_show_more.setVisibility(View.GONE);
+                } else {
+                    if (!status.isAttachmentShown()) {
+                        holder.status_show_more.setVisibility(View.VISIBLE);
+                    } else {
+                        holder.status_show_more.setVisibility(View.GONE);
+                    }
                 }
-            });
+
+                holder.show_more_button_art.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        status.setAttachmentShown(true);
+                        notifyStatusChanged(status);
+                    }
+                });
+            }else{
+                if( status.getArt_attachment() != null)
+                    Glide.with(context)
+                            .load(status.getArt_attachment().getPreview_url())
+                            .into(holder.art_media);
+            }
+            if( type == RetrieveFeedsAsyncTask.Type.PIXELFED){
+                holder.art_pp.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        CrossActions.doCrossProfile(context, status.getAccount());
+                    }
+                });
+            }else {
+                holder.art_pp.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        Intent intent = new Intent(context, ShowAccountActivity.class);
+                        Bundle b = new Bundle();
+                        b.putParcelable("account", status.getAccount());
+                        intent.putExtras(b);
+                        context.startActivity(intent);
+                    }
+                });
+            }
+
             holder.art_media.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
                     Intent intent = new Intent(context, MediaActivity.class);
                     Bundle b = new Bundle();
                     ArrayList<Attachment> attachments = new ArrayList<>();
-                    attachments.add(status.getArt_attachment());
+                    if( status.getArt_attachment() != null)
+                        attachments.add(status.getArt_attachment());
+                    else if( status.getMedia_attachments() != null && status.getMedia_attachments().size() > 0)
+                        attachments.add(status.getMedia_attachments().get(0));
                     intent.putParcelableArrayListExtra("mediaArray", attachments);
                     b.putInt("position", 0);
                     intent.putExtras(b);
                     context.startActivity(intent);
                 }
             });
-            holder.art_author.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    Intent intent = new Intent(context, ShowConversationActivity.class);
-                    Bundle b = new Bundle();
-                    b.putParcelable("status", status);
-                    intent.putExtras(b);
-                    if (type == RetrieveFeedsAsyncTask.Type.CONTEXT)
-                        ((Activity) context).finish();
-                    context.startActivity(intent);
-                }
-            });
+            if( type == RetrieveFeedsAsyncTask.Type.PIXELFED){
+                holder.art_author.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        CrossActions.doCrossConversation(context,status);
+                    }
+                });
+            }else {
+                holder.art_author.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        Intent intent = new Intent(context, ShowConversationActivity.class);
+                        Bundle b = new Bundle();
+                        b.putParcelable("status", status);
+                        intent.putExtras(b);
+                        if (type == RetrieveFeedsAsyncTask.Type.CONTEXT)
+                            ((Activity) context).finish();
+                        context.startActivity(intent);
+                    }
+                });
+            }
+
             if( status.getDisplayNameSpan() != null && status.getDisplayNameSpan().toString().trim().length() > 0)
                 holder.art_username.setText( status.getDisplayNameSpan(), TextView.BufferType.SPANNABLE);
             else
@@ -2237,7 +2314,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                 ImageView imageView;
                 if( i == 0) {
                     imageView = fullAttachement?holder.status_prev1_h:holder.status_prev1;
-                    if( attachment.getType().equals("image") || attachment.getType().equals("unknown"))
+                    if( attachment.getType().toLowerCase().equals("image") || attachment.getType().equals("unknown"))
                         if( fullAttachement)
                             holder.status_prev1_play_h.setVisibility(View.GONE);
                         else
@@ -2249,7 +2326,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                             holder.status_prev1_play.setVisibility(View.VISIBLE);
                 }else if( i == 1) {
                     imageView = fullAttachement?holder.status_prev2_h:holder.status_prev2;
-                    if( attachment.getType().equals("image") || attachment.getType().equals("unknown"))
+                    if( attachment.getType().toLowerCase().equals("image") || attachment.getType().equals("unknown"))
                         if( fullAttachement)
                             holder.status_prev2_play_h.setVisibility(View.GONE);
                         else
@@ -2261,7 +2338,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                             holder.status_prev2_play.setVisibility(View.VISIBLE);
                 }else if(i == 2) {
                     imageView = fullAttachement?holder.status_prev3_h:holder.status_prev3;
-                    if( attachment.getType().equals("image") || attachment.getType().equals("unknown"))
+                    if( attachment.getType().toLowerCase().equals("image") || attachment.getType().equals("unknown"))
                         if( fullAttachement)
                             holder.status_prev3_play_h.setVisibility(View.GONE);
                         else
@@ -2273,7 +2350,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                             holder.status_prev3_play.setVisibility(View.VISIBLE);
                 }else {
                     imageView = fullAttachement?holder.status_prev4_h:holder.status_prev4;
-                    if( attachment.getType().equals("image") || attachment.getType().equals("unknown"))
+                    if( attachment.getType().toLowerCase().equals("image") || attachment.getType().equals("unknown"))
                         if( fullAttachement)
                             holder.status_prev4_play_h.setVisibility(View.GONE);
                         else
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java
index 13ed2a757..af08c0600 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java
@@ -179,8 +179,10 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
                 statusListAdapter = new StatusListAdapter(context, tagTimeline, targetedId, isOnWifi, this.statuses);
                 lv_status.setAdapter(statusListAdapter);
             }
-        }else if( search_peertube == null && (instanceType == null || instanceType.equals("MASTODON"))) {
+        }else if( search_peertube == null && (instanceType == null || instanceType.equals("MASTODON") || instanceType.equals("PIXELFED"))) {
             BaseMainActivity.displayPeertube = null;
+            if( instanceType != null && instanceType.equals("PIXELFED"))
+                type = RetrieveFeedsAsyncTask.Type.PIXELFED;
             statusListAdapter = new StatusListAdapter(context, type, targetedId, isOnWifi, this.statuses);
             lv_status.setAdapter(statusListAdapter);
         }else {
@@ -217,7 +219,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
                                 asyncTask = new RetrieveFeedsAsyncTask(context, type, targetedId, max_id, showMediaOnly, showPinned, showReply, DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
                             else if( type == RetrieveFeedsAsyncTask.Type.TAG)
                                 asyncTask = new RetrieveFeedsAsyncTask(context, type, tag, targetedId, max_id, DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
-                            else if( type == RetrieveFeedsAsyncTask.Type.REMOTE_INSTANCE ) {
+                            else if( type == RetrieveFeedsAsyncTask.Type.REMOTE_INSTANCE || type == RetrieveFeedsAsyncTask.Type.PIXELFED) {
                                 if( search_peertube == null) {
                                     if( remote_channel_name == null)
                                         asyncTask = new RetrieveFeedsAsyncTask(context, type, remoteInstance, max_id, DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
@@ -249,7 +251,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
         });
 
 
-        if( instanceType == null || instanceType.equals("MASTODON"))
+        if( instanceType == null || instanceType.equals("MASTODON") || instanceType.equals("PIXELFED"))
             swipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
                 @Override
                 public void onRefresh() {
@@ -305,12 +307,13 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
                 asyncTask = new RetrieveFeedsAsyncTask(context, type, targetedId, max_id, showMediaOnly, showPinned, showReply,DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
             else if (type == RetrieveFeedsAsyncTask.Type.TAG)
                 asyncTask = new RetrieveFeedsAsyncTask(context, type, tag, targetedId, max_id, DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
-            else if( type == RetrieveFeedsAsyncTask.Type.REMOTE_INSTANCE ) {
+            else if( type == RetrieveFeedsAsyncTask.Type.REMOTE_INSTANCE || type == RetrieveFeedsAsyncTask.Type.PIXELFED) {
                 if( search_peertube == null) {
-                    if( remote_channel_name == null)
+                    if( remote_channel_name == null) {
                         asyncTask = new RetrieveFeedsAsyncTask(context, type, remoteInstance, max_id, DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+                    }
                     else
-                        asyncTask = new RetrieveFeedsAsyncTask(context, remoteInstance, remote_channel_name, null,DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+                        asyncTask = new RetrieveFeedsAsyncTask(context, remoteInstance, remote_channel_name, null, DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
                 }
                 else
                     asyncTask = new RetrievePeertubeSearchAsyncTask(context, remoteInstance, search_peertube, DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
@@ -332,7 +335,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
                             asyncTask = new RetrieveFeedsAsyncTask(context, type, targetedId, max_id, showMediaOnly, showPinned, showReply,DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
                         else if (type == RetrieveFeedsAsyncTask.Type.TAG)
                             asyncTask = new RetrieveFeedsAsyncTask(context, type, tag, targetedId, max_id, DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
-                        else if( type == RetrieveFeedsAsyncTask.Type.REMOTE_INSTANCE ) {
+                        else if( type == RetrieveFeedsAsyncTask.Type.REMOTE_INSTANCE || type == RetrieveFeedsAsyncTask.Type.PIXELFED ) {
                             if( search_peertube == null) {
                                 if( remote_channel_name == null)
                                     asyncTask = new RetrieveFeedsAsyncTask(context, type, remoteInstance, max_id, DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
@@ -413,7 +416,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
             return;
         }
         //For remote Peertube remote instances
-        if( type == RetrieveFeedsAsyncTask.Type.REMOTE_INSTANCE && peertubeAdapater != null){
+        if(( type == RetrieveFeedsAsyncTask.Type.REMOTE_INSTANCE ) && peertubeAdapater != null){
             int previousPosition = this.peertubes.size();
             if( max_id == null)
                 max_id = "0";
@@ -455,7 +458,16 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
             int previousPosition = this.statuses.size();
             List<Status> statuses = apiResponse.getStatuses();
             //At this point all statuses are in "List<Status> statuses"
-            max_id = apiResponse.getMax_id();
+
+            //Pagination for Pixelfed
+            if(type == RetrieveFeedsAsyncTask.Type.PIXELFED) {
+                if( max_id == null)
+                    max_id = "1";
+                //max_id needs to work like an offset
+                max_id = String.valueOf(Integer.valueOf(max_id) + 1);
+            }else{
+                max_id = apiResponse.getMax_id();
+            }
             //while max_id is different from null, there are some more toots to load when scrolling
             flag_loading = (max_id == null );
             //If it's the first load and the reply doesn't contain any toots, a message is displayed.
@@ -520,7 +532,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
                     //Update the id of the last toot retrieved
                     MainActivity.lastHomeId = status.getId();
                     statuses.add(0, status);
-                    if (!status.getAccount().getId().equals(userId)) {
+                    if (status.getAccount() != null && !status.getAccount().getId().equals(userId)) {
                         MainActivity.countNewStatus++;
                     }
                     try {
@@ -625,7 +637,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
 
         if( type == RetrieveFeedsAsyncTask.Type.HOME)
             asyncTask = new RetrieveFeedsAfterBookmarkAsyncTask(context, null, DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
-        if (type == RetrieveFeedsAsyncTask.Type.REMOTE_INSTANCE )
+        if (type == RetrieveFeedsAsyncTask.Type.REMOTE_INSTANCE || type == RetrieveFeedsAsyncTask.Type.PIXELFED)
             asyncTask = new RetrieveMissingFeedsAsyncTask(context, remoteInstance, sinceId, type, DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
         else if(type == RetrieveFeedsAsyncTask.Type.TAG)
             asyncTask = new RetrieveMissingFeedsAsyncTask(context, tag, sinceId, type, DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/helper/CrossActions.java b/app/src/main/java/fr/gouv/etalab/mastodon/helper/CrossActions.java
index d8fd26d58..4649e1a09 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/helper/CrossActions.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/helper/CrossActions.java
@@ -266,11 +266,13 @@ public class CrossActions {
             @Override
             protected Void doInBackground(Void... voids) {
                 API api = new API(contextReference.get(), account.getInstance(), account.getToken());
-                String url;
-                if( remoteAccount.getHost() != null && remoteAccount.getAcct().split("@").length > 1) //Peertube compatibility
-                    url = "https://" + remoteAccount.getHost() + "/accounts/" + remoteAccount.getAcct().split("@")[0];
-                else
-                    url = "https://" + remoteAccount.getInstance() + "/@" + remoteAccount.getAcct();
+                String url = remoteAccount.getUrl();
+                if( url == null) {
+                    if (remoteAccount.getHost() != null && remoteAccount.getAcct().split("@").length > 1) //Peertube compatibility
+                        url = "https://" + remoteAccount.getHost() + "/accounts/" + remoteAccount.getAcct().split("@")[0];
+                    else
+                        url = "https://" + remoteAccount.getInstance() + "/@" + remoteAccount.getAcct();
+                }
                 response = api.search(url);
                 return null;
             }
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
index 701c03d6e..4735c2a28 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
@@ -541,7 +541,15 @@ public class Helper {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat(STRING_DATE_FORMAT, userLocale);
         simpleDateFormat.setTimeZone(TimeZone.getTimeZone("gmt"));
         simpleDateFormat.setLenient(true);
-        return simpleDateFormat.parse(date);
+        try {
+            return simpleDateFormat.parse(date);
+        }catch (Exception e){
+            String newdate = date.split("\\+")[0];
+            simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", userLocale);
+            simpleDateFormat.setTimeZone(TimeZone.getTimeZone("gmt"));
+            simpleDateFormat.setLenient(true);
+            return simpleDateFormat.parse(newdate);
+        }
     }
 
 
@@ -2564,7 +2572,7 @@ public class Helper {
                 return;
             }
         }
-        if( url == null || url.contains("missing.png")) {
+        if( url == null || url.contains("missing.png") || url.contains(".svg")) {
             try {
                 Glide.with(imageView.getContext())
                         .load(R.drawable.missing)
diff --git a/app/src/main/res/drawable-hdpi/pixelfed.png b/app/src/main/res/drawable-hdpi/pixelfed.png
new file mode 100644
index 0000000000000000000000000000000000000000..62324da98c007622cd527a4c9ddaa1926cbf3fc5
GIT binary patch
literal 2045
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
bnR@*PiVU-?9qXqP00000NkvXXu0mjf>apxS

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-ldpi/pixelfed.png b/app/src/main/res/drawable-ldpi/pixelfed.png
new file mode 100644
index 0000000000000000000000000000000000000000..7df1a00595d375a111a52643f26697b82c681b76
GIT binary patch
literal 704
zcmV;x0zdtUP)<h;3K|Lk000e1NJLTq000dD000dL1^@s6a_i)L0007qNkl<Zc-mEx
zTS${(0ERzPLu%9J)Gb|F26~Ztp_pzA6<r51519%Q)J0GTA(R#thRz^QBy|@wEh-Ex
zDs_!YLGqBIGmkiD>ZV&cOSd_9(*OV8KeGe%+&?@Q?@P#U*e>G5R)mO{T0sL_A(&&!
zL{_#`q-Ae})n8VK{Rx}rN&aObLK13EkE^3{VhxV`D3|lneww~1WKb@om~xThbA5z9
zvpcEO`;$!gt3Xn`)_GZV_Mq(5bx{Va5y$ZDumslg2SCdM0C^xB6~U-`5^drdj$hv{
zx_olNHvRIAYr-tp!cV{!a|9M?Doh1&aLV_Bsp7+Ri;qS{1cG&G3n9idKH1<FG}?ns
zxy)hNFh^y=T2>9(U<7Sl1!JCvTUCU$Du2{GiiH1cnln%%y+<tkY@I3e3_ToKiH|Y$
zSa{YC+D+jP8x|ejD54ngU=qXArcnW-QY~2v&aizrbf0+}+W~dlODr}|Y)hLAjSYsv
zocjwTV|mPO{YmVZmN8qBl`J33*S<;|q&gFOFc9AcL-QoQ+nwlIF`#*=8yUJva28L4
zyCv~vWOU$2`Yf4?E~;-$o^iYr_oFXCh0&%-T%2EoP&)<TL<zWtv)J`D7rweo@HDwD
zALUR3QA&Gw?J4tml|+rsgbozS`{Aou2AOuiV`vFG2O7W~E&!*m7~V>)fwZtf(vrt|
zzDU(yQ%c88o#I|xDI5l8&<---2I<%YdF_P9QwuyE*jC6LriNT#y|)Lhj(;y`OP;yf
zBOTYb9_@D|)fy>IyPMhZoT12LxX42oNG+;K$<)68uJp60mYMz3;@+z6MAcaFxe-(N
mZL4O--Ax5)Vg-K-Tl@g1vVrcb9Y{6+0000<MNUMnLSTZSBRp0B

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/pixelfed.png b/app/src/main/res/drawable-mdpi/pixelfed.png
new file mode 100644
index 0000000000000000000000000000000000000000..d86bbb52f8420de1536ca7f26ab6ea8db69068ee
GIT binary patch
literal 1127
zcmV-t1ep7YP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B000CoNkl<Zc-no`
zYfO`86bJAJodV;IrRAnAIBpYyfZ@_sE&^T<1Z9bAZc7%kPfNCJ$u<Q<gejOUG1;8T
z4A}$}rsya`uAy8Nk-Inw1VM1rf&~hFp{4Kp{=3(@kja+)lauG$FXx<`JcRs5j6d?l
z#ymm3@w7{?G1GO%nC?DpJh8Ram@fLdB0nI2{9m?v5VOGy^8jUrppnUNQ5(`-DEgGZ
zfNVaCQ_c)BTn#wsM$Ki3R3{5|mRfa7ya{j9>xc)>+^n?1ddKr!k%}cz0=?+94^#e;
zcp4XI(5E{CxlTZ~02~OUyJ9j^s1K<XcW?Bx^4{=I?4DUtz??8qG4Ggy1(zf&dL&@c
zcQ59HqA?L0gw-4#aF(l_SD+!w1?72OjIc%0>((drS%aRLr#3Fw9ibQahoBK2#FF=Z
zP=WE#isLaIEyc`nKZeQUy2<0PZ+M_{`RK?ILNpMgckGmuy;`j0hf<AAs(OK!42^pt
zmfku5t$#e0lHZ3mGaC!%&S3WPm(Z0T1ARFF?0HAfd0Wt)>ki>S3>+0vD*j_>AX&0`
z=ezkWDa#tyM5sMepnf|Uv(fK@nV1A93hc{T(E|EKuydo(6$E2B#{p#*J?U+aIOuT{
z<uoEaK^7fS`!vo;v`UnQI-dfj!mk8X(jw^QbXXr&uZ2qXIT|jB81KP2*pJ4;aWKlj
z>zA|<4L?~uz3n~rH=h#R-C2(Z!7}v3l)*6nZ%EJRP&9lMK?4U^+wp_2A2C4;uTP>R
z)Ykpan|v<NHDRr23YDXCR~33<Z>~WsSB&XpF`-u>`AHV+Cy&5pB9ZH8FE?5Y>(n2q
zBHHZ<tv5pMuU3k?(HP!>`=K@HjJs`ubS#50oeqCc^XSwJA#vmk?8ehz_2)|{33j9V
zI4IV@dw8se%=mop)vr+sN+#_?eMCFjLb>tcWSE)JqWHxuJcftCANZYd@BbK9&(dJ2
zI%<M!pC*}hWZ##%Y*kltj!?cK0p(F6syn*}Q6ug^OIRc1dn)lo+ZY5RQy>%bAR}tL
zF<1pF#Zg#~9)`_mD(n<VaOgP<^9s3|+%|@rZt0hZhU?{#gSsk7muWm%R4trujf0G8
zKok^6-wH^F7G}*;*xXvmTF9@!qPm3HP^_fMMP=jKWnYNx^|~r~*d>$pG7a2#)w|^o
z7Aiq{Ii!n2+H@fGdXUOhkXu@iVy=E#2Fb?|$sY1wgKReQh?}LScTsqASFQNLN=uj=
z*ABJ7xoQEVi36%R;En<01`SfkfLvl}auy0A81f_5zOVlPwwoNt6-l+%%`kakdqjt_
zIif-P+3^9L;2K3+T-Pxhe>NCM0Yi}=@PeG5ttY3sPSzvq(<bfo9uVLAR1sWJcUMw9
t_Q^+&p6tk+X@B$E<s9<;--}(BzW};jywikDrRe|w002ovPDHLkV1nvJ7=i!*

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/pixelfed.png b/app/src/main/res/drawable-xhdpi/pixelfed.png
new file mode 100644
index 0000000000000000000000000000000000000000..141c477e6ec0c47b10e73a12ec0a7c2fdc24f009
GIT binary patch
literal 3137
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
boyPwG_@cR0>oaxy00000NkvXXu0mjf7&H_&

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/pixelfed.png b/app/src/main/res/drawable-xxhdpi/pixelfed.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2cf0f68fd95ca8659aef8abaf5b482145748984
GIT binary patch
literal 5886
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
UFcY;D4*&oF07*qoM6N<$f?;lAM*si-

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/pixelfed.png b/app/src/main/res/drawable-xxxhdpi/pixelfed.png
new file mode 100644
index 0000000000000000000000000000000000000000..49703d27a4d4bfea5b348f1384c623426f9e8c30
GIT binary patch
literal 8674
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
Aj{pDw

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/drawer_art.xml b/app/src/main/res/layout/drawer_art.xml
index 2bb7df40e..8a3227c13 100644
--- a/app/src/main/res/layout/drawer_art.xml
+++ b/app/src/main/res/layout/drawer_art.xml
@@ -3,12 +3,35 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
-    <ImageView
-        android:id="@+id/art_media"
-        android:scaleType="fitCenter"
-        android:adjustViewBounds="true"
+    <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content">
+        <ImageView
+            android:id="@+id/art_media"
+            android:scaleType="fitCenter"
+            android:adjustViewBounds="true"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+        <RelativeLayout
+            android:id="@+id/status_show_more"
+            android:layout_alignParentTop="true"
+            android:layout_width="match_parent"
+            android:background="@color/mastodonC1"
+            android:layout_height="match_parent">
+            <ImageView
+                android:id="@+id/show_more_button_art"
+                android:layout_marginTop="10dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginStart="10dp"
+                android:src="@drawable/ic_remove_red_eye"
+                android:layout_alignParentTop="true"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentLeft="true"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+        </RelativeLayout>
+
+    </RelativeLayout>
     <LinearLayout
         android:layout_alignParentBottom="true"
         android:orientation="horizontal"
diff --git a/app/src/main/res/layout/search_instance.xml b/app/src/main/res/layout/search_instance.xml
index c090e5567..57272863e 100644
--- a/app/src/main/res/layout/search_instance.xml
+++ b/app/src/main/res/layout/search_instance.xml
@@ -10,9 +10,26 @@
         android:hint="@string/instance"
         android:maxLines="1"
         />
-    <CheckBox
-        android:text="@string/peertube_instance"
-        android:id="@+id/peertube_instance"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
+    <RadioGroup
+        android:id="@+id/set_attachment_group"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+        <RadioButton android:id="@+id/mastodon_instance"
+            android:layout_width="wrap_content"
+            android:checked="true"
+            android:layout_height="wrap_content"
+            android:text="@string/mastodon_instance"
+            />
+        <RadioButton android:id="@+id/peertube_instance"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/peertube_instance"
+            />
+        <RadioButton android:id="@+id/pixelfed_instance"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/pixelfed_instance"
+            />
+    </RadioGroup>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/remote_instances.xml b/app/src/main/res/menu/remote_instances.xml
index bb29c908a..07ad2ed39 100644
--- a/app/src/main/res/menu/remote_instances.xml
+++ b/app/src/main/res/menu/remote_instances.xml
@@ -27,6 +27,16 @@
             <item android:id="@+id/peertube_instances" android:title="@string/no_peertube_instances"/>
         </menu>
     </item>
+    <item
+        android:id="@+id/action_show_pixelfed"
+        android:title="Pixelfed"
+        android:icon="@drawable/pixelfed"
+        app:showAsAction="never"
+        >
+        <menu>
+            <item android:id="@+id/pixelfed_instance" android:title="@string/no_pixelfed_instance"/>
+        </menu>
+    </item>
     <item
         android:id="@+id/action_show_channel"
         android:title="@string/channel"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 46e5c543d..2badf7bc5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -774,6 +774,9 @@
     <string name="translation_app">Translation of the application</string>
     <string name="about_crowdin">About Crowdin</string>
     <string name="bot">Bot</string>
+    <string name="pixelfed_instance">Pixelfed instance</string>
+    <string name="mastodon_instance">Mastodon instance</string>
+    <string name="no_pixelfed_instance">No Pixelfed instances</string>
     <!-- end languages -->
 
 </resources>
\ No newline at end of file