Compare commits

..

2 Commits

Author SHA1 Message Date
Saúl Ibarra Corretgé
d69584ce17 fixup! 2021-03-16 22:20:28 +01:00
Saúl Ibarra Corretgé
b2d271a679 fix(android) update manifest override after GAP update 2021-03-16 22:10:49 +01:00
4 changed files with 16 additions and 18 deletions

View File

@@ -122,13 +122,17 @@ gradle.projectsEvaluated {
android.applicationVariants.all { variant ->
variant.outputs.each { output ->
output.getProcessManifestProvider().get().doLast {
def outputDir = manifestOutputDirectory.get().asFile
def manifestPath = new File(outputDir, 'AndroidManifest.xml')
def charset = 'UTF-8'
def text
text = manifestPath.getText(charset)
def outputDir = manifestOutputDirectory
File directory
if (outputDir instanceof File) {
directory = outputDir
} else {
directory = outputDir.get().asFile
}
String manifestPath = directory.toString() + "/AndroidManifest.xml"
def text = file(manifestPath).getText('UTF-8')
text = text.replace('</application>', "${dropboxActivity}</application>")
manifestPath.write(text, charset)
file(manifestPath).write(text, 'UTF-8')
}
}
}

5
package-lock.json generated
View File

@@ -14077,8 +14077,9 @@
"integrity": "sha512-iqdJ1KpZbR4XGahgVmaeibB7kDhyMT7wrylINgJaYBY38IAiI0LF32VX1umO4pko6n21YF5I/kSeNQ+OXGqqow=="
},
"react-native-webrtc": {
"version": "github:react-native-webrtc/react-native-webrtc#1343580c0322f265ff0fb22722ac5501c5fd77ad",
"from": "github:react-native-webrtc/react-native-webrtc#1343580c0322f265ff0fb22722ac5501c5fd77ad",
"version": "1.89.1",
"resolved": "https://registry.npmjs.org/react-native-webrtc/-/react-native-webrtc-1.89.1.tgz",
"integrity": "sha512-YBvSoSpw3dvRQr5LcOmdS/56arCBwtrIqdgPuYURbGheJbGAE/wYfeqMKa2fiIQ6EoYkFNZPDV5n4M7/f3KvlQ==",
"requires": {
"base64-js": "^1.1.2",
"cross-os": "^1.3.0",

View File

@@ -84,7 +84,7 @@
"react-native-svg-transformer": "0.14.3",
"react-native-url-polyfill": "1.2.0",
"react-native-watch-connectivity": "0.4.3",
"react-native-webrtc": "github:react-native-webrtc/react-native-webrtc#1343580c0322f265ff0fb22722ac5501c5fd77ad",
"react-native-webrtc": "1.89.1",
"react-native-webview": "11.0.2",
"react-native-youtube-iframe": "1.2.3",
"react-redux": "7.1.0",

View File

@@ -8,11 +8,6 @@ import { getLocalVideoTrack } from '../../../tracks';
export type Props = {
/**
* Flag controlling whether the video should be flipped or not.
*/
flipVideo: boolean,
/**
* Flag signaling the visibility of camera preview.
*/
@@ -31,14 +26,13 @@ export type Props = {
* @returns {ReactElement}
*/
function Preview(props: Props) {
const { videoMuted, videoTrack, flipVideo } = props;
const className = flipVideo ? 'flipVideoX' : '';
const { videoMuted, videoTrack } = props;
if (!videoMuted && videoTrack) {
return (
<div id = 'preview'>
<Video
className = { className }
className = 'flipVideoX'
videoTrack = {{ jitsiTrack: videoTrack }} />
</div>
);
@@ -56,7 +50,6 @@ function Preview(props: Props) {
*/
function _mapStateToProps(state, ownProps) {
return {
flipVideo: state['features/base/settings'].localFlipX,
videoMuted: ownProps.videoTrack ? ownProps.videoMuted : state['features/base/media'].video.muted,
videoTrack: ownProps.videoTrack || (getLocalVideoTrack(state['features/base/tracks']) || {}).jitsiTrack
};