From 1b6894bf5f964afebca54a559e7e8242a8b03f6e Mon Sep 17 00:00:00 2001
From: Austin Huang <im@austinhuang.me>
Date: Sun, 10 Jan 2021 14:57:01 -0500
Subject: [PATCH] better null check

---
 .../main/java/awais/instagrabber/webservices/FeedService.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/awais/instagrabber/webservices/FeedService.java b/app/src/main/java/awais/instagrabber/webservices/FeedService.java
index 08008773..a5e69219 100644
--- a/app/src/main/java/awais/instagrabber/webservices/FeedService.java
+++ b/app/src/main/java/awais/instagrabber/webservices/FeedService.java
@@ -109,6 +109,7 @@ public class FeedService extends BaseService {
         final List<Media> allPosts = new ArrayList<>();
         final List<Media> items = feedFetchResponse.getItems();
         for (final Media media : items) {
+            if (media == null || media.isInjected() || (media.getMediaType() == null && media.getEndOfFeedDemarcator() == null)) continue;
             if (needNewMaxId && media.getEndOfFeedDemarcator() != null) {
                 final EndOfFeedDemarcator endOfFeedDemarcator = media.getEndOfFeedDemarcator();
                 final EndOfFeedGroupSet groupSet = endOfFeedDemarcator.getGroupSet();
@@ -121,13 +122,12 @@ public class FeedService extends BaseService {
                     nextMaxId = group.getNextMaxId();
                     final List<Media> feedItems = group.getFeedItems();
                     for (final Media feedItem : feedItems) {
-                        if (feedItem == null || feedItem.isInjected()) continue;
+                        if (feedItem == null || feedItem.isInjected() || feedItem.getMediaType() == null) continue;
                         allPosts.add(feedItem);
                     }
                 }
                 continue;
             }
-            if (media.isInjected() || media.getMediaType() == null) continue;
             allPosts.add(media);
         }
         return new PostsFetchResponse(allPosts, moreAvailable, nextMaxId);