1 files changed, 4 insertions, 12 deletions
diff --git a/app/src/main/java/app/fedilab/android/asynctasks/RetrieveFeedsAsyncTask.java b/app/src/main/java/app/fedilab/android/asynctasks/RetrieveFeedsAsyncTask.java
index 1d0bb7777..8a8bf22fe 100644
--- a/app/src/main/java/app/fedilab/android/asynctasks/RetrieveFeedsAsyncTask.java
+++ b/app/src/main/java/app/fedilab/android/asynctasks/RetrieveFeedsAsyncTask.java
@@ -25,13 +25,11 @@ import java.util.List;
 import app.fedilab.android.activities.MainActivity;
 import app.fedilab.android.client.API;
 import app.fedilab.android.client.APIResponse;
-import app.fedilab.android.client.Entities.Account;
 import app.fedilab.android.client.Entities.ManageTimelines;
 import app.fedilab.android.client.Entities.Peertube;
 import app.fedilab.android.client.Entities.RemoteInstance;
 import app.fedilab.android.client.Entities.Results;
 import app.fedilab.android.client.Entities.RetrieveFeedsParam;
-import app.fedilab.android.client.Entities.Status;
 import app.fedilab.android.client.GNUAPI;
 import app.fedilab.android.client.PeertubeAPI;
 import app.fedilab.android.helper.FilterToots;
@@ -369,13 +367,9 @@ public class RetrieveFeedsAsyncTask extends AsyncTask<Void, Void, Void> {
                 db = Sqlite.getInstance(contextReference.get().getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
                 List<app.fedilab.android.client.Entities.Status> statuses = new StatusCacheDAO(contextReference.get(), db).getAllStatus(StatusCacheDAO.BOOKMARK_CACHE);
                 if (statuses != null) {
+
                     for (app.fedilab.android.client.Entities.Status status : statuses) {
                         app.fedilab.android.client.Entities.Status.fillSpan(contextReference, status);
-                        app.fedilab.android.client.Entities.Status.makeEmojiPoll(contextReference, status.getReblog() != null ? status.getReblog().getPoll() : status.getPoll());
-                        Account.makeAccountNameEmoji(contextReference, status.getReblog() != null ? status.getReblog().getAccount() : status.getAccount());
-                        if( status.getPoll() != null) {
-                            app.fedilab.android.client.Entities.Status.makeEmojiPoll(contextReference, status.getPoll());
-                        }
                     }
                 } else {
                     statuses = new ArrayList<>();
@@ -393,6 +387,9 @@ public class RetrieveFeedsAsyncTask extends AsyncTask<Void, Void, Void> {
                 db = Sqlite.getInstance(contextReference.get().getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
                 statuses = new StatusCacheDAO(contextReference.get(), db).getStatusFromID(StatusCacheDAO.ARCHIVE_CACHE, filterToots, max_id);
                 if (statuses != null && statuses.size() > 0) {
+                    for (app.fedilab.android.client.Entities.Status status : statuses) {
+                        app.fedilab.android.client.Entities.Status.fillSpan(contextReference, status);
+                    }
                     apiResponse.setStatuses(statuses);
                     apiResponse.setSince_id(statuses.get(0).getId());
                     apiResponse.setMax_id(statuses.get(statuses.size() - 1).getId());
@@ -423,10 +420,6 @@ public class RetrieveFeedsAsyncTask extends AsyncTask<Void, Void, Void> {
                 peertubeAPI = new PeertubeAPI(this.contextReference.get());
                 apiResponse = peertubeAPI.getLocalTL(max_id);
                 break;
-            case PMYVIDEOS:
-                peertubeAPI = new PeertubeAPI(this.contextReference.get());
-                apiResponse = peertubeAPI.getLocalTL(max_id);
-                break;
             case PF_HOME:
                 api = new API(this.contextReference.get());
                 apiResponse = api.getHomeTimeline(max_id);
@@ -510,7 +503,6 @@ public class RetrieveFeedsAsyncTask extends AsyncTask<Void, Void, Void> {
         POVERVIEW,
         PTRENDING,
         PRECENTLYADDED,
-        PMYVIDEOS,
         PLOCAL,
         CHANNEL,
         MYVIDEOS,