From dc6909ddee4eeb09cafb7bcdb99672a42d87019e Mon Sep 17 00:00:00 2001
From: stom79 <tschneider.ac@gmail.com>
Date: Sun, 6 Jan 2019 18:18:13 +0100
Subject: [PATCH] Some edges fixes

---
 app/build.gradle                                              | 4 ++--
 .../gouv/etalab/mastodon/fragments/DisplayStatusFragment.java | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index c2567b6a7..a6944fb6f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "fr.gouv.etalab.mastodon"
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 221
-        versionName "1.63.0-beta-2"
+        versionCode 222
+        versionName "1.63.0"
         multiDexEnabled true
     }
     dexOptions {
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 6024239ea..02bfcfbf5 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
@@ -193,7 +193,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
             statusListAdapter = new StatusListAdapter(context, type, targetedId, isOnWifi, this.statuses);
             lv_status.setAdapter(statusListAdapter);
         }else {
-            if( remoteInstance != null) //if it's a Peertube account connected
+            if( remoteInstance != null && MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.PEERTUBE) //if it's a Peertube account connected
                 remoteInstance = account.getInstance();
             BaseMainActivity.displayPeertube = remoteInstance;
             peertubeAdapater = new PeertubeAdapter(context, remoteInstance, this.peertubes);
@@ -319,6 +319,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
             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);
                     }
                     else