Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix video not loading after regaining internet connection #37674

Merged
merged 8 commits into from
Mar 26, 2024
Merged

Fix video not loading after regaining internet connection #37674

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
451f83d
Fix resuming video after regaining internet connection
Skalakid Mar 4, 2024
d104cb0
Fix playing video in preview when uploading
Skalakid Mar 4, 2024
810b10d
Merge branch 'main' into @Skalakid/fix-resuming-video-after-regaining…
Skalakid Mar 12, 2024
03954ba
Merge branch 'main' into @Skalakid/fix-resuming-video-after-regaining…
Skalakid Mar 14, 2024
28e72ff
Remove unnecessary changes
Skalakid Mar 15, 2024
e0b6726
Readd video starting after video is ready to play
Skalakid Mar 20, 2024
214ff21
Merge branch 'main' into @Skalakid/fix-resuming-video-after-regaining…
Skalakid Mar 21, 2024
6e74315
Merge branch 'main' into @Skalakid/fix-resuming-video-after-regaining…
Skalakid Mar 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions src/components/VideoPlayer/BaseVideoPlayer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import Hoverable from '@components/Hoverable';
import PressableWithoutFeedback from '@components/Pressable/PressableWithoutFeedback';
import {usePlaybackContext} from '@components/VideoPlayerContexts/PlaybackContext';
import VideoPopoverMenu from '@components/VideoPopoverMenu';
import useNetwork from '@hooks/useNetwork';
import useThemeStyles from '@hooks/useThemeStyles';
import addEncryptedAuthTokenToURL from '@libs/addEncryptedAuthTokenToURL';
import * as Browser from '@libs/Browser';
Expand Down Expand Up @@ -45,6 +46,7 @@ function BaseVideoPlayer({
const styles = useThemeStyles();
const {pauseVideo, playVideo, currentlyPlayingURL, updateSharedElements, sharedElement, originalParent, shareVideoPlayerElements, currentVideoPlayerRef, updateCurrentlyPlayingURL} =
usePlaybackContext();
const {isOffline} = useNetwork();
const [duration, setDuration] = useState(videoDuration * 1000);
const [position, setPosition] = useState(0);
const [isPlaying, setIsPlaying] = useState(false);
Expand Down Expand Up @@ -253,13 +255,20 @@ function BaseVideoPlayer({
style={[styles.w100, styles.h100, videoPlayerStyle]}
videoStyle={[styles.w100, styles.h100, videoStyle]}
source={{
uri: sourceURL,
// if video is loading and is offline, we want to change uri to null to
// reset the video player after connection is back
uri: !isLoading || (isLoading && !isOffline) ? sourceURL : null,
}}
shouldPlay={false}
useNativeControls={false}
resizeMode={resizeMode}
isLooping={isLooping}
onReadyForDisplay={onVideoLoaded}
onReadyForDisplay={(e) => {
Skalakid marked this conversation as resolved.
Show resolved Hide resolved
if (isCurrentlyURLSet && !isUploading) {
playVideo();
}
onVideoLoaded(e);
}}
onPlaybackStatusUpdate={handlePlaybackStatusUpdate}
onFullscreenUpdate={handleFullscreenUpdate}
/>
Expand Down
Loading