|
@@ -86,27 +86,31 @@ function _appWillMount({ dispatch, getState }, next, action) {
|
86
|
86
|
* @returns {*} The result returned by {@code next(action)}.
|
87
|
87
|
*/
|
88
|
88
|
function _conferenceWillLeave({ dispatch, getState }, next, action) {
|
89
|
|
- let locationURL;
|
90
|
|
-
|
91
|
|
- /**
|
92
|
|
- * FIXME:
|
93
|
|
- * It is better to use action.conference[JITSI_CONFERENCE_URL_KEY]
|
94
|
|
- * in order to make sure we get the url the conference is leaving
|
95
|
|
- * from (i.e. the room we are leaving from) because if the order of events
|
96
|
|
- * is different, we cannot be guranteed that the location URL in base
|
97
|
|
- * connection is the url we are leaving from... not the one we are going to
|
98
|
|
- * (the latter happens on mobile -- if we use the web implementation);
|
99
|
|
- * however, the conference object on web does not have
|
100
|
|
- * JITSI_CONFERENCE_URL_KEY so we cannot call it and must use the other way
|
101
|
|
- */
|
102
|
|
- if (typeof APP === 'undefined') {
|
103
|
|
- locationURL = action.conference[JITSI_CONFERENCE_URL_KEY];
|
104
|
|
- } else {
|
105
|
|
- locationURL = getState()['features/base/connection'].locationURL;
|
|
89
|
+ const { doNotStoreRoom } = getState()['features/base/config'];
|
|
90
|
+
|
|
91
|
+ if (!doNotStoreRoom) {
|
|
92
|
+ let locationURL;
|
|
93
|
+
|
|
94
|
+ /**
|
|
95
|
+ * FIXME:
|
|
96
|
+ * It is better to use action.conference[JITSI_CONFERENCE_URL_KEY]
|
|
97
|
+ * in order to make sure we get the url the conference is leaving
|
|
98
|
+ * from (i.e. the room we are leaving from) because if the order of events
|
|
99
|
+ * is different, we cannot be guranteed that the location URL in base
|
|
100
|
+ * connection is the url we are leaving from... not the one we are going to
|
|
101
|
+ * (the latter happens on mobile -- if we use the web implementation);
|
|
102
|
+ * however, the conference object on web does not have
|
|
103
|
+ * JITSI_CONFERENCE_URL_KEY so we cannot call it and must use the other way
|
|
104
|
+ */
|
|
105
|
+ if (typeof APP === 'undefined') {
|
|
106
|
+ locationURL = action.conference[JITSI_CONFERENCE_URL_KEY];
|
|
107
|
+ } else {
|
|
108
|
+ locationURL = getState()['features/base/connection'].locationURL;
|
|
109
|
+ }
|
|
110
|
+ dispatch(
|
|
111
|
+ _updateConferenceDuration(
|
|
112
|
+ locationURL));
|
106
|
113
|
}
|
107
|
|
- dispatch(
|
108
|
|
- _updateConferenceDuration(
|
109
|
|
- locationURL));
|
110
|
114
|
|
111
|
115
|
return next(action);
|
112
|
116
|
}
|
|
@@ -122,7 +126,9 @@ function _conferenceWillLeave({ dispatch, getState }, next, action) {
|
122
|
126
|
* @returns {*} The result returned by {@code next(action)}.
|
123
|
127
|
*/
|
124
|
128
|
function _setRoom({ dispatch, getState }, next, action) {
|
125
|
|
- if (action.room) {
|
|
129
|
+ const { doNotStoreRoom } = getState()['features/base/config'];
|
|
130
|
+
|
|
131
|
+ if (!doNotStoreRoom && action.room) {
|
126
|
132
|
const { locationURL } = getState()['features/base/connection'];
|
127
|
133
|
|
128
|
134
|
if (locationURL) {
|