Compare commits

...

3 Commits

Author SHA1 Message Date
Bettenbuk Zoltan
3a5f2280ea fix: disable reduced UI on welcome page 2019-07-23 17:54:06 +02:00
Saúl Ibarra Corretgé
4c506ae5fd android: fix crash if UserInfo is not set
Fixes: https://github.com/jitsi/jitsi-meet-sdk-samples/issues/11
2019-07-16 07:31:45 +01:00
Saúl Ibarra Corretgé
54e8d2c1a8 android: raise SDK version 2019-07-16 07:31:25 +01:00
3 changed files with 14 additions and 6 deletions

View File

@@ -18,4 +18,4 @@
# org.gradle.parallel=true
appVersion=19.2.0
sdkVersion=2.2.1
sdkVersion=2.2.2

View File

@@ -341,7 +341,7 @@ public class JitsiMeetConferenceOptions implements Parcelable {
dest.writeString(token);
dest.writeBundle(colorScheme);
dest.writeBundle(featureFlags);
dest.writeBundle(userInfo.asBundle());
dest.writeBundle(userInfo != null ? userInfo.asBundle() : new Bundle());
dest.writeByte((byte) (audioMuted == null ? 0 : audioMuted ? 1 : 2));
dest.writeByte((byte) (audioOnly == null ? 0 : audioOnly ? 1 : 2));
dest.writeByte((byte) (videoMuted == null ? 0 : videoMuted ? 1 : 2));

View File

@@ -98,11 +98,20 @@ class WelcomePage extends AbstractWelcomePage {
* @returns {ReactElement}
*/
render() {
// We want to have the welcome page support the reduced UI layout,
// but we ran into serious issues enabling it so we disable it
// until we have a proper fix in place. We leave the code here though, because
// this part should be fine when the bug is fixed.
//
// NOTE: when re-enabling, don't forget to uncomment the respective _mapStateToProps line too
/*
const { _reducedUI } = this.props;
if (_reducedUI) {
return this._renderReducedUI();
}
*/
return this._renderFullUI();
}
@@ -316,12 +325,11 @@ class WelcomePage extends AbstractWelcomePage {
* @returns {Object}
*/
function _mapStateToProps(state) {
const { reducedUI } = state['features/base/responsive-ui'];
return {
..._abstractMapStateToProps(state),
_headerStyles: ColorSchemeRegistry.get(state, 'Header'),
_reducedUI: reducedUI
_headerStyles: ColorSchemeRegistry.get(state, 'Header')
// _reducedUI: state['features/base/responsive-ui'].reducedUI
};
}