From a89e1f7bb56991fbdde3defe23c8bee4be8cf38e Mon Sep 17 00:00:00 2001
From: Austin Huang <im@austinhuang.me>
Date: Wed, 6 Jan 2021 14:25:42 -0500
Subject: [PATCH] bad conflict resolution

---
 .../fragments/StoryViewerFragment.java            | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/awais/instagrabber/fragments/StoryViewerFragment.java b/app/src/main/java/awais/instagrabber/fragments/StoryViewerFragment.java
index 4d8fd604..75f265c3 100644
--- a/app/src/main/java/awais/instagrabber/fragments/StoryViewerFragment.java
+++ b/app/src/main/java/awais/instagrabber/fragments/StoryViewerFragment.java
@@ -769,14 +769,13 @@ public class StoryViewerFragment extends Fragment {
                 Log.e(TAG, "Error", t);
             }
         };
-          if (live != null) storyCallback.onSuccess(Collections.singletonList(live));
-          else storiesService.getUserStory(currentStoryMediaId,
-                  currentStoryUsername,
-                  isLoc,
-                  isHashtag,
-                  isHighlight,
-                  storyCallback);
-      }
+        if (live != null) storyCallback.onSuccess(Collections.singletonList(live));
+        else storiesService.getUserStory(currentStoryMediaId,
+              currentStoryUsername,
+              isLoc,
+              isHashtag,
+              isHighlight,
+              storyCallback);
     }
 
     private void refreshStory() {