1
0
mirror of https://github.com/KokaKiwi/BarInsta synced 2024-11-22 22:57:29 +00:00

bad conflict resolution

This commit is contained in:
Austin Huang 2021-01-06 14:25:42 -05:00
parent 0f7fde38cd
commit a89e1f7bb5
No known key found for this signature in database
GPG Key ID: 84C23AA04587A91F

View File

@ -769,14 +769,13 @@ public class StoryViewerFragment extends Fragment {
Log.e(TAG, "Error", t); Log.e(TAG, "Error", t);
} }
}; };
if (live != null) storyCallback.onSuccess(Collections.singletonList(live)); if (live != null) storyCallback.onSuccess(Collections.singletonList(live));
else storiesService.getUserStory(currentStoryMediaId, else storiesService.getUserStory(currentStoryMediaId,
currentStoryUsername, currentStoryUsername,
isLoc, isLoc,
isHashtag, isHashtag,
isHighlight, isHighlight,
storyCallback); storyCallback);
}
} }
private void refreshStory() { private void refreshStory() {