Bläddra i källkod

Adds application name to the initJitsiConference options.

j8
damencho 7 år sedan
förälder
incheckning
c3e42e0162

+ 2
- 0
conference.js Visa fil

@@ -1297,6 +1297,8 @@ export default {
1297 1297
             options.displayName = nick;
1298 1298
         }
1299 1299
 
1300
+        options.applicationName = interfaceConfig.APP_NAME;
1301
+
1300 1302
         return options;
1301 1303
     },
1302 1304
 

+ 6
- 15
react/features/app/functions.native.js Visa fil

@@ -1,22 +1,13 @@
1 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 Visa fil

@@ -12,7 +12,7 @@ import {
12 12
 import {
13 13
     // eslint-disable-next-line camelcase
14 14
     _getRouteToRender as _super_getRouteToRender
15
-} from './functions.native';
15
+} from './getRouteToRender';
16 16
 
17 17
 declare var APP: Object;
18 18
 declare var interfaceConfig: Object;
@@ -116,3 +116,12 @@ function _interceptComponent(
116 116
 
117 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 Visa fil

@@ -0,0 +1,22 @@
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 Visa fil

@@ -1,6 +1,7 @@
1 1
 // @flow
2 2
 
3 3
 import { sendEvent } from '../../analytics';
4
+import { getName } from '../../app';
4 5
 import { JitsiConferenceEvents } from '../lib-jitsi-meet';
5 6
 import { setAudioMuted, setVideoMuted } from '../media';
6 7
 import {
@@ -280,8 +281,10 @@ export function createConference() {
280 281
             = connection.initJitsiConference(
281 282
 
282 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 289
         conference[JITSI_CONFERENCE_URL_KEY] = locationURL;
287 290
         dispatch(_conferenceWillJoin(conference));

Laddar…
Avbryt
Spara