mirror of
https://github.com/KokaKiwi/BarInsta
synced 2025-11-20 21:06:32 +00:00
bad conflict resolution
This commit is contained in:
parent
0f7fde38cd
commit
a89e1f7bb5
1 changed files with 7 additions and 8 deletions
|
|
@ -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() {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue