Sfoglia il codice sorgente

rn: show conference subject if set

master
Saúl Ibarra Corretgé 6 anni fa
parent
commit
9a8a070c62

+ 2
- 0
react/features/base/conference/actions.js Vedi File

84
     conference.on(
84
     conference.on(
85
         JitsiConferenceEvents.CONFERENCE_LEFT,
85
         JitsiConferenceEvents.CONFERENCE_LEFT,
86
         (...args) => dispatch(conferenceLeft(conference, ...args)));
86
         (...args) => dispatch(conferenceLeft(conference, ...args)));
87
+    conference.on(JitsiConferenceEvents.SUBJECT_CHANGED,
88
+        (...args) => dispatch(conferenceSubjectChanged(...args)));
87
 
89
 
88
     conference.on(
90
     conference.on(
89
         JitsiConferenceEvents.KICKED,
91
         JitsiConferenceEvents.KICKED,

+ 5
- 3
react/features/base/conference/functions.js Vedi File

1
 // @flow
1
 // @flow
2
 
2
 
3
+import _ from 'lodash';
4
+
3
 import { JitsiTrackErrors } from '../lib-jitsi-meet';
5
 import { JitsiTrackErrors } from '../lib-jitsi-meet';
4
 import {
6
 import {
5
     getLocalParticipant,
7
     getLocalParticipant,
155
 export function getConferenceName(stateful: Function | Object): string {
157
 export function getConferenceName(stateful: Function | Object): string {
156
     const state = toState(stateful);
158
     const state = toState(stateful);
157
     const { callee } = state['features/base/jwt'];
159
     const { callee } = state['features/base/jwt'];
160
+    const { callDisplayName } = state['features/base/config'];
161
+    const { pendingSubjectChange, room, subject } = state['features/base/conference'];
158
 
162
 
159
-    return state['features/base/config'].callDisplayName
160
-                || (callee && callee.name)
161
-                || state['features/base/conference'].room;
163
+    return pendingSubjectChange || subject || callDisplayName || (callee && callee.name) || _.startCase(room);
162
 }
164
 }
163
 
165
 
164
 /**
166
 /**

+ 1
- 2
react/features/conference/components/native/NavigationBar.js Vedi File

1
 // @flow
1
 // @flow
2
 
2
 
3
-import _ from 'lodash';
4
 import React, { Component } from 'react';
3
 import React, { Component } from 'react';
5
 import { SafeAreaView, Text, View } from 'react-native';
4
 import { SafeAreaView, Text, View } from 'react-native';
6
 import LinearGradient from 'react-native-linear-gradient';
5
 import LinearGradient from 'react-native-linear-gradient';
82
  */
81
  */
83
 function _mapStateToProps(state) {
82
 function _mapStateToProps(state) {
84
     return {
83
     return {
85
-        _meetingName: _.startCase(getConferenceName(state)),
84
+        _meetingName: getConferenceName(state),
86
         _visible: isToolboxVisible(state)
85
         _visible: isToolboxVisible(state)
87
     };
86
     };
88
 }
87
 }

Loading…
Annulla
Salva