diff --git a/app/src/index.js b/app/src/index.js index 15e72765..94012017 100644 --- a/app/src/index.js +++ b/app/src/index.js @@ -10,6 +10,7 @@ import { } from 'react-native'; import { Lbry, + blacklistReducer, claimsReducer, costInfoReducer, fileInfoReducer, @@ -68,6 +69,7 @@ const navigatorReducer = (state = initialNavState, action) => { const reducers = combineReducers({ auth: authReducer, + blacklist: blacklistReducer, claims: claimsReducer, costInfo: costInfoReducer, fileInfo: fileInfoReducer, diff --git a/app/src/page/file/view.js b/app/src/page/file/view.js index 2cd0d9db..5e399d61 100644 --- a/app/src/page/file/view.js +++ b/app/src/page/file/view.js @@ -329,144 +329,170 @@ class FilePage extends React.PureComponent { ); } else if (claim) { - const completed = fileInfo && fileInfo.completed; - const title = metadata.title; - const isRewardContent = rewardedContentClaimIds.includes(claim.claim_id); - const description = metadata.description ? metadata.description : null; - const mediaType = Lbry.getMediaType(contentType); - const isPlayable = mediaType === 'video' || mediaType === 'audio'; - const { height, channel_name: channelName, value } = claim; - const showActions = !this.state.fullscreenMode && !this.state.showImageViewer && !this.state.showWebView && - (completed || (fileInfo && !fileInfo.stopped && fileInfo.written_bytes < fileInfo.total_bytes)); - const channelClaimId = - value && value.publisherSignature && value.publisherSignature.certificateId; + let isClaimBlackListed = false; - const playerStyle = [filePageStyle.player, - this.state.isLandscape ? filePageStyle.containedPlayerLandscape : - (this.state.fullscreenMode ? filePageStyle.fullscreenPlayer : filePageStyle.containedPlayer)]; - const playerBgStyle = [filePageStyle.playerBackground, this.state.fullscreenMode ? - filePageStyle.fullscreenPlayerBackground : filePageStyle.containedPlayerBackground]; - // at least 2MB (or the full download) before media can be loaded - const canLoadMedia = fileInfo && - (fileInfo.written_bytes >= 2097152 || fileInfo.written_bytes == fileInfo.total_bytes); // 2MB = 1024*1024*2 - const canOpen = (mediaType === 'image' || mediaType === 'text') && completed; - const isWebViewable = mediaType === 'text'; - const localFileUri = this.localUriForFileInfo(fileInfo); - - const openFile = () => { - if (mediaType === 'image') { - // use image viewer - this.setState({ - imageUrls: [{ - url: localFileUri - }], - showImageViewer: true - }); - } - if (isWebViewable) { - // show webview - this.setState({ - showWebView: true - }); + if (blackListedOutpoints) { + for (let i = 0; i < blackListedOutpoints.length; i += 1) { + const outpoint = blackListedOutpoints[i]; + if (outpoint.txid === claim.txid && outpoint.nout === claim.nout) { + isClaimBlackListed = true; + break; + } } } - innerContent = ( - - {this.state.showWebView && isWebViewable && } - - {this.state.showImageViewer && null} />} - - {!this.state.showWebView && ( - - - {((canOpen || (!fileInfo || (isPlayable && !canLoadMedia))) || (!canOpen && fileInfo)) && - } - {((!this.state.downloadButtonShown || this.state.downloadPressed) && !this.state.mediaLoaded) && - } - {((isPlayable && !completed && !canLoadMedia) || !completed || canOpen) && (!this.state.downloadPressed) && - { - this.startTime = Date.now(); - this.setState({ downloadPressed: true, autoPlayMedia: true }); - }} - onButtonLayout={() => this.setState({ downloadButtonShown: true })} - onStartDownloadFailed={() => { - this.startTime = null; - setTimeout(() => { - this.setState({ downloadPressed: false, fileViewLogged: false, mediaLoaded: false }); - }, 500); - }} />} - {!fileInfo && } - - {canLoadMedia && fileInfo && { this.playerBackground = ref; }} - onLayout={(evt) => { - if (!this.state.playerBgHeight) { - this.setState({ playerBgHeight: evt.nativeEvent.layout.height }); - } - }} />} - {canLoadMedia && fileInfo && { this.player = ref; }} - uri={uri} - style={playerStyle} - autoPlay={autoplay || this.state.autoPlayMedia} - onFullscreenToggled={this.handleFullscreenToggle} - onLayout={(evt) => { - if (!this.state.playerHeight) { - this.setState({ playerHeight: evt.nativeEvent.layout.height }); - } - }} - onMediaLoaded={() => this.onMediaLoaded(channelName, title, uri)} - onPlaybackStarted={this.onPlaybackStarted} - />} - - { showActions && - - {completed &&