Browse Source
bad conflict resolution
renovate/org.robolectric-robolectric-4.x
Austin Huang
5 years ago
No known key found for this signature in database
GPG Key ID: 84C23AA04587A91F
1 changed files with
7 additions and
8 deletions
-
app/src/main/java/awais/instagrabber/fragments/StoryViewerFragment.java
|
|
@ -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() { |
|
|
|
xxxxxxxxxx