Selaa lähdekoodia

Adds application name to the initJitsiConference options.

j8
damencho 7 vuotta sitten
vanhempi
commit
c3e42e0162

+ 2
- 0
conference.js Näytä tiedosto

1297
             options.displayName = nick;
1297
             options.displayName = nick;
1298
         }
1298
         }
1299
 
1299
 
1300
+        options.applicationName = interfaceConfig.APP_NAME;
1301
+
1300
         return options;
1302
         return options;
1301
     },
1303
     },
1302
 
1304
 

+ 6
- 15
react/features/app/functions.native.js Näytä tiedosto

1
 /* @flow */
1
 /* @flow */
2
+import { NativeModules } from 'react-native';
2
 
3
 
3
-import { isRoomValid } from '../base/conference';
4
-import { RouteRegistry } from '../base/react';
5
-import { toState } from '../base/redux';
6
-import { Conference } from '../conference';
7
-import { WelcomePage } from '../welcome';
4
+export * from './getRouteToRender';
8
 
5
 
9
 /**
6
 /**
10
- * Determines which route is to be rendered in order to depict a specific Redux
11
- * store.
7
+ * Returns application name.
12
  *
8
  *
13
- * @param {(Object|Function)} stateOrGetState - Redux state or Regux getState()
14
- * method.
15
- * @returns {Route}
9
+ * @returns {string} The application name.
16
  */
10
  */
17
-export function _getRouteToRender(stateOrGetState: Object | Function) {
18
-    const { room } = toState(stateOrGetState)['features/base/conference'];
19
-    const component = isRoomValid(room) ? Conference : WelcomePage;
20
-
21
-    return RouteRegistry.getRouteByComponent(component);
11
+export function getName() {
12
+    return NativeModules.AppInfo.name;
22
 }
13
 }

+ 10
- 1
react/features/app/functions.web.js Näytä tiedosto

12
 import {
12
 import {
13
     // eslint-disable-next-line camelcase
13
     // eslint-disable-next-line camelcase
14
     _getRouteToRender as _super_getRouteToRender
14
     _getRouteToRender as _super_getRouteToRender
15
-} from './functions.native';
15
+} from './getRouteToRender';
16
 
16
 
17
 declare var APP: Object;
17
 declare var APP: Object;
18
 declare var interfaceConfig: Object;
18
 declare var interfaceConfig: Object;
116
 
116
 
117
     return result || component;
117
     return result || component;
118
 }
118
 }
119
+
120
+/**
121
+ * Returns application name.
122
+ *
123
+ * @returns {string} The application name.
124
+ */
125
+export function getName() {
126
+    return interfaceConfig.APP_NAME;
127
+}

+ 22
- 0
react/features/app/getRouteToRender.js Näytä tiedosto

1
+/* @flow */
2
+
3
+import { isRoomValid } from '../base/conference';
4
+import { RouteRegistry } from '../base/react';
5
+import { toState } from '../base/redux';
6
+import { Conference } from '../conference';
7
+import { WelcomePage } from '../welcome';
8
+
9
+/**
10
+ * Determines which route is to be rendered in order to depict a specific Redux
11
+ * store.
12
+ *
13
+ * @param {(Object|Function)} stateOrGetState - Redux state or Regux getState()
14
+ * method.
15
+ * @returns {Route}
16
+ */
17
+export function _getRouteToRender(stateOrGetState: Object | Function) {
18
+    const { room } = toState(stateOrGetState)['features/base/conference'];
19
+    const component = isRoomValid(room) ? Conference : WelcomePage;
20
+
21
+    return RouteRegistry.getRouteByComponent(component);
22
+}

+ 5
- 2
react/features/base/conference/actions.js Näytä tiedosto

1
 // @flow
1
 // @flow
2
 
2
 
3
 import { sendEvent } from '../../analytics';
3
 import { sendEvent } from '../../analytics';
4
+import { getName } from '../../app';
4
 import { JitsiConferenceEvents } from '../lib-jitsi-meet';
5
 import { JitsiConferenceEvents } from '../lib-jitsi-meet';
5
 import { setAudioMuted, setVideoMuted } from '../media';
6
 import { setAudioMuted, setVideoMuted } from '../media';
6
 import {
7
 import {
280
             = connection.initJitsiConference(
281
             = connection.initJitsiConference(
281
 
282
 
282
                 // XXX Lib-jitsi-meet does not accept uppercase letters.
283
                 // XXX Lib-jitsi-meet does not accept uppercase letters.
283
-                room.toLowerCase(),
284
-                state['features/base/config']);
284
+                room.toLowerCase(), {
285
+                    ...state['features/base/config'],
286
+                    applicationName: getName()
287
+                });
285
 
288
 
286
         conference[JITSI_CONFERENCE_URL_KEY] = locationURL;
289
         conference[JITSI_CONFERENCE_URL_KEY] = locationURL;
287
         dispatch(_conferenceWillJoin(conference));
290
         dispatch(_conferenceWillJoin(conference));

Loading…
Peruuta
Tallenna