Merge pull request #2067 from jitsi/cs-applicationName

Adds application name to the initJitsiConference options.

conference.js

@@ -1297,6 +1297,8 @@ export default {
             options.displayName = nick;
         }
 
+        options.applicationName = interfaceConfig.APP_NAME;
+
         return options;
     },
 

react/features/app/functions.native.js

@@ -1,22 +1,13 @@
 /* @flow */
+import { NativeModules } from 'react-native';
 
-import { isRoomValid } from '../base/conference';
+export * from './getRouteToRender';
-import { RouteRegistry } from '../base/react';
-import { toState } from '../base/redux';
-import { Conference } from '../conference';
-import { WelcomePage } from '../welcome';
 
 /**
- * Determines which route is to be rendered in order to depict a specific Redux
+ * Returns application name.
- * store.
  *
- * @param {(Object|Function)} stateOrGetState - Redux state or Regux getState()
+ * @returns {string} The application name.
- * method.
- * @returns {Route}
  */
-export function _getRouteToRender(stateOrGetState: Object | Function) {
+export function getName() {
-    const { room } = toState(stateOrGetState)['features/base/conference'];
+    return NativeModules.AppInfo.name;
-    const component = isRoomValid(room) ? Conference : WelcomePage;
-
-    return RouteRegistry.getRouteByComponent(component);
 }

react/features/app/functions.web.js

@@ -12,7 +12,7 @@ import {
 import {
     // eslint-disable-next-line camelcase
     _getRouteToRender as _super_getRouteToRender
-} from './functions.native';
+} from './getRouteToRender';
 
 declare var APP: Object;
 declare var interfaceConfig: Object;
@@ -116,3 +116,12 @@ function _interceptComponent(
 
     return result || component;
 }
+
+/**
+ * Returns application name.
+ *
+ * @returns {string} The application name.
+ */
+export function getName() {
+    return interfaceConfig.APP_NAME;
+}

react/features/app/getRouteToRender.js

@@ -0,0 +1,22 @@
+/* @flow */
+
+import { isRoomValid } from '../base/conference';
+import { RouteRegistry } from '../base/react';
+import { toState } from '../base/redux';
+import { Conference } from '../conference';
+import { WelcomePage } from '../welcome';
+
+/**
+ * Determines which route is to be rendered in order to depict a specific Redux
+ * store.
+ *
+ * @param {(Object|Function)} stateOrGetState - Redux state or Regux getState()
+ * method.
+ * @returns {Route}
+ */
+export function _getRouteToRender(stateOrGetState: Object | Function) {
+    const { room } = toState(stateOrGetState)['features/base/conference'];
+    const component = isRoomValid(room) ? Conference : WelcomePage;
+
+    return RouteRegistry.getRouteByComponent(component);
+}

react/features/base/conference/actions.js

@@ -1,6 +1,7 @@
 // @flow
 
 import { sendEvent } from '../../analytics';
+import { getName } from '../../app';
 import { JitsiConferenceEvents } from '../lib-jitsi-meet';
 import { setAudioMuted, setVideoMuted } from '../media';
 import {
@@ -280,8 +281,10 @@ export function createConference() {
             = connection.initJitsiConference(
 
                 // XXX Lib-jitsi-meet does not accept uppercase letters.
-                room.toLowerCase(),
+                room.toLowerCase(), {
-                state['features/base/config']);
+                    ...state['features/base/config'],
+                    applicationName: getName()
+                });
 
         conference[JITSI_CONFERENCE_URL_KEY] = locationURL;
         dispatch(_conferenceWillJoin(conference));