mirror of
https://github.com/KokaKiwi/BarInsta
synced 2024-11-22 22:57:29 +00:00
bad conflict resolution
This commit is contained in:
parent
0f7fde38cd
commit
a89e1f7bb5
@ -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() {
|
||||||
|
Loading…
Reference in New Issue
Block a user