Fix crash with bookmarks

1 files changed, 8 insertions, 4 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 c23a035f1..334d243b8 100644
--- a/app/src/main/java/app/fedilab/android/asynctasks/RetrieveFeedsAsyncTask.java
+++ b/app/src/main/java/app/fedilab/android/asynctasks/RetrieveFeedsAsyncTask.java
@@ -367,10 +367,14 @@ public class RetrieveFeedsAsyncTask extends AsyncTask<Void, Void, Void> {
                 apiResponse = new APIResponse();
                 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);
-                for (app.fedilab.android.client.Entities.Status status : statuses) {
-                    app.fedilab.android.client.Entities.Status.fillSpan(contextReference.get(), status);
-                    app.fedilab.android.client.Entities.Status.makeEmojiPoll(contextReference.get(), status.getReblog() != null ? status.getReblog().getPoll() : status.getPoll());
-                    Account.makeAccountNameEmoji(contextReference.get(), status.getReblog() != null ? status.getReblog().getAccount() : status.getAccount());
+                if( statuses != null ) {
+                    for (app.fedilab.android.client.Entities.Status status : statuses) {
+                        app.fedilab.android.client.Entities.Status.fillSpan(contextReference.get(), status);
+                        app.fedilab.android.client.Entities.Status.makeEmojiPoll(contextReference.get(), status.getReblog() != null ? status.getReblog().getPoll() : status.getPoll());
+                        Account.makeAccountNameEmoji(contextReference.get(), status.getReblog() != null ? status.getReblog().getAccount() : status.getAccount());
+                    }
+                }else {
+                    statuses = new ArrayList<>();
                 }
                 apiResponse.setStatuses(statuses);
                 break;