Compare commits

...

8 Commits

Author SHA1 Message Date
Saúl Ibarra Corretgé
abcbbbea12 rn: update versions 2020-07-22 12:55:59 +02:00
Saúl Ibarra Corretgé
98326cb910 rn: fix overriding user-selected server URL 2020-07-22 12:50:10 +02:00
Saúl Ibarra Corretgé
12082ebb70 rn: set SDK version to 2.9.2 2020-07-17 16:30:35 +02:00
Saúl Ibarra Corretgé
0d826dc58d ios: set version to 20.3.1 2020-07-17 16:08:31 +02:00
Saúl Ibarra Corretgé
cb47720cb4 HOTFIX: fix participant kicking 2020-07-17 16:07:00 +02:00
Saúl Ibarra Corretgé
036f4166fe android: set version to 20.3.1 2020-07-17 14:21:59 +02:00
Saúl Ibarra Corretgé
eb1f057ba2 deps: react-native-calendar-events@latest
Fixes a crash on Android.
2020-07-17 14:21:09 +02:00
Saúl Ibarra Corretgé
5b2d28490b rn: set SDK version to 2.9.1 2020-07-14 13:57:16 +02:00
9 changed files with 21 additions and 14 deletions

View File

@@ -20,5 +20,5 @@
android.useAndroidX=true
android.enableJetifier=true
appVersion=20.3.0
sdkVersion=2.9.0
appVersion=20.3.2
sdkVersion=2.9.3

View File

@@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>20.3.0</string>
<string>20.3.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>

View File

@@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>20.3.0</string>
<string>20.3.2</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>UISupportedInterfaceOrientations</key>

View File

@@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
<string>20.3.0</string>
<string>20.3.2</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>CLKComplicationPrincipalClass</key>

View File

@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>2.9.0</string>
<string>2.9.3</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>

4
package-lock.json generated
View File

@@ -14215,8 +14215,8 @@
"integrity": "sha512-cuXIIv+dcG8a8qkTD8pMzeqOEZCO+UGKglZWIe1osve+yJslmCowYQff+bI9xa7NOt2w+Vtd4L3d9JonlSqODg=="
},
"react-native-calendar-events": {
"version": "github:jitsi/react-native-calendar-events#928a80e2ffef0d7e84936d7e7e0acc4f53ee8470",
"from": "github:jitsi/react-native-calendar-events#928a80e2ffef0d7e84936d7e7e0acc4f53ee8470"
"version": "github:jitsi/react-native-calendar-events#df48ecdc4e1e90c5352f803ddbab1fa7269b74a7",
"from": "github:jitsi/react-native-calendar-events#df48ecdc4e1e90c5352f803ddbab1fa7269b74a7"
},
"react-native-callstats": {
"version": "3.61.0",

View File

@@ -69,7 +69,7 @@
"react-linkify": "1.0.0-alpha",
"react-native": "github:jitsi/react-native#efd2aff5661d75a230e36406b698cfe0ee545be2",
"react-native-background-timer": "2.1.1",
"react-native-calendar-events": "github:jitsi/react-native-calendar-events#928a80e2ffef0d7e84936d7e7e0acc4f53ee8470",
"react-native-calendar-events": "github:jitsi/react-native-calendar-events#df48ecdc4e1e90c5352f803ddbab1fa7269b74a7",
"react-native-callstats": "3.61.0",
"react-native-collapsible": "1.5.1",
"react-native-default-preference": "1.4.2",

View File

@@ -4,7 +4,9 @@ import React from 'react';
import { setColorScheme } from '../../base/color-scheme';
import { DialogContainer } from '../../base/dialog';
import { CALL_INTEGRATION_ENABLED, SERVER_URL_CHANGE_ENABLED, updateFlags } from '../../base/flags';
import { updateFlags } from '../../base/flags/actions';
import { CALL_INTEGRATION_ENABLED, SERVER_URL_CHANGE_ENABLED } from '../../base/flags/constants';
import { getFeatureFlag } from '../../base/flags/functions';
import { Platform } from '../../base/react';
import { DimensionsDetector, clientResized } from '../../base/responsive-ui';
import { updateSettings } from '../../base/settings';
@@ -83,11 +85,14 @@ export class App extends AbstractApp {
super.componentDidMount();
this._init.then(() => {
const { dispatch, getState } = this.state.store;
// We set these early enough so then we avoid any unnecessary re-renders.
const { dispatch } = this.state.store;
dispatch(setColorScheme(this.props.colorScheme));
dispatch(updateFlags(this.props.flags));
// Check if serverURL is configured externally and not allowed to change.
const serverURLChangeEnabled = this.props.flags[SERVER_URL_CHANGE_ENABLED];
const serverURLChangeEnabled = getFeatureFlag(getState(), SERVER_URL_CHANGE_ENABLED, true);
if (!serverURLChangeEnabled) {
// As serverURL is provided externally, so we push it to settings.
@@ -100,8 +105,6 @@ export class App extends AbstractApp {
}
}
dispatch(setColorScheme(this.props.colorScheme));
dispatch(updateFlags(this.props.flags));
dispatch(updateSettings(this.props.userInfo || {}));
// Update settings with feature-flag.

View File

@@ -416,6 +416,10 @@ export function participantMutedUs(participant) {
*/
export function participantKicked(kicker, kicked) {
return (dispatch, getState) => {
// HOTFIX, DO NOT LAND ON MASTER. This has been properly fixed in LJM.
if (typeof kicker === 'undefined') {
return;
}
dispatch({
type: PARTICIPANT_KICKED,