[eslint] no-negated-condition

.eslintrc.js

@@ -152,6 +152,7 @@ module.exports = {
         'no-array-constructor': 2,
         'no-inline-comments': 0,
         'no-mixed-spaces-and-tabs': 2,
+        'no-negated-condition': 2,
         'no-nested-ternary': 0,
         'no-new-object': 2,
         'no-plusplus': 0,

modules/RTC/JitsiLocalTrack.js

@@ -326,10 +326,7 @@ JitsiLocalTrack.prototype._setMute = function(mute) {
                     const mediaType = self.getType();
                     const streamInfo = streamsInfo.find(info => info.mediaType === mediaType);
 
-                    if(!streamInfo) {
-                        throw new JitsiTrackError(
-                            JitsiTrackErrors.TRACK_NO_STREAM_FOUND);
-                    }else {
+                    if (streamInfo) {
                         self._setStream(streamInfo.stream);
                         self.track = streamInfo.track;
                         // This is not good when video type changes after
@@ -340,6 +337,9 @@ JitsiLocalTrack.prototype._setMute = function(mute) {
                                 self.videoType, streamInfo.videoType);
                             self.videoType = streamInfo.videoType;
                         }
+                    }else {
+                        throw new JitsiTrackError(
+                            JitsiTrackErrors.TRACK_NO_STREAM_FOUND);
                     }
 
                     self.containers = self.containers.map(cont => RTCUtils.attachMediaStream(cont, self.stream));

modules/RTC/JitsiTrack.js

@@ -46,10 +46,10 @@ function implementOnEndedHandling(jitsiTrack) {
  */
 function addMediaStreamInactiveHandler(mediaStream, handler) {
     // Temasys will use onended
-    if(typeof mediaStream.active !== 'undefined') {
-        mediaStream.oninactive = handler;
-    } else {
+    if (typeof mediaStream.active === 'undefined') {
         mediaStream.onended = handler;
+    } else {
+        mediaStream.oninactive = handler;
     }
 }
 

modules/RTC/RTC.js

@@ -95,10 +95,11 @@ export default class RTC extends Listenable {
         return RTCUtils.obtainAudioAndVideoPermissions(options).then(
             tracksInfo => {
                 const tracks = createLocalTracks(tracksInfo, options);
-                return !tracks.some(track =>
-                    !track._isReceivingData()) ? tracks
-                        : Promise.reject(new JitsiTrackError(
-                            JitsiTrackErrors.NO_DATA_FROM_SOURCE));
+                return tracks.some(track => !track._isReceivingData())
+                    ? Promise.reject(
+                        new JitsiTrackError(
+                            JitsiTrackErrors.NO_DATA_FROM_SOURCE))
+                    : tracks;
             });
     }
 

modules/RTC/RTCUtils.js

@@ -200,7 +200,18 @@ function getConstraints(um, options) {
             // The react-native-webrtc project that we're currently using
             // expects the audio constraint to be a boolean.
             constraints.audio = true;
-        } else if (!RTCBrowserType.isFirefox()) {
+        } else if (RTCBrowserType.isFirefox()) {
+            if (options.micDeviceId) {
+                constraints.audio = {
+                    mandatory: {},
+                    deviceId: options.micDeviceId, // new style
+                    optional: [{
+                        sourceId: options.micDeviceId // old style
+                    }]};
+            } else {
+                constraints.audio = true;
+            }
+        } else {
             // same behaviour as true
             constraints.audio = { mandatory: {}, optional: []};
             if (options.micDeviceId) {
@@ -223,17 +234,6 @@ function getConstraints(um, options) {
                 {googEchoCancellation2: !disableAEC},
                 {googAutoGainControl2: true}
             );
-        } else {
-            if (options.micDeviceId) {
-                constraints.audio = {
-                    mandatory: {},
-                    deviceId: options.micDeviceId, // new style
-                    optional: [{
-                        sourceId: options.micDeviceId // old style
-                    }]};
-            } else {
-                constraints.audio = true;
-            }
         }
     }
     if (um.indexOf('screen') >= 0) {

modules/RTC/ScreenObtainer.js

@@ -121,18 +121,21 @@ const ScreenObtainer = {
         } else if (RTCBrowserType.isTemasysPluginUsed()) {
             // XXX Don't require Temasys unless it's to be used because it
             // doesn't run on React Native, for example.
-            const AdapterJS = require('./adapter.screenshare');
+            const plugin
+                = require('./adapter.screenshare').WebRTCPlugin.plugin;
 
-            if (!AdapterJS.WebRTCPlugin.plugin.HasScreensharingFeature) {
-                logger.info('Screensharing not supported by this plugin '
-                    + 'version');
-            } else if(!AdapterJS.WebRTCPlugin.plugin.isScreensharingAvailable) {
-                logger.info(
-                    'Screensharing not available with Temasys plugin on'
-                    + ' this site');
+            if (plugin.HasScreensharingFeature) {
+                if (plugin.isScreensharingAvailable) {
+                    obtainDesktopStream = obtainWebRTCScreen;
+                    logger.info('Using Temasys plugin for desktop sharing');
+                } else {
+                    logger.info(
+                        'Screensharing not available with Temasys plugin on'
+                            + ' this site');
+                }
             } else {
-                obtainDesktopStream = obtainWebRTCScreen;
-                logger.info('Using Temasys plugin for desktop sharing');
+                logger.info(
+                    'Screensharing not supported by this plugin version');
             }
         } else if (RTCBrowserType.isChrome()) {
             if (options.desktopSharingChromeDisabled

modules/transcription/transcriptionServices/AbstractTranscriptionService.js

@@ -19,15 +19,13 @@ const TranscriptionService = function() {
 TranscriptionService.prototype.send = function send(recordingResult, callback) {
     const t = this;
     this.sendRequest(recordingResult.blob, response => {
-        if(!t.verify(response)) {
-            console.log('the retrieved response from the server'
-                   + ' is not valid!');
-            recordingResult.wordArray = [];
-            callback(recordingResult);
-        } else{
+        if(t.verify(response)) {
             recordingResult.wordArray = t.formatResponse(response);
-            callback(recordingResult);
+        } else{
+            console.log('the retrieved response from the server is not valid!');
+            recordingResult.wordArray = [];
         }
+        callback(recordingResult);
     });
 };
 

modules/xmpp/JingleSession.js

@@ -80,7 +80,7 @@ export default class JingleSession {
         this.rtc = rtc;
         this.state = JingleSessionState.PENDING;
         this.initiator = isInitiator ? this.localJid : this.peerjid;
-        this.responder = !isInitiator ? this.localJid : this.peerjid;
+        this.responder = isInitiator ? this.peerjid : this.localJid;
         this.doInitialize();
     }
 

modules/xmpp/JingleSessionPC.js

@@ -975,13 +975,8 @@ export default class JingleSessionPC extends JingleSession {
             this.modificationQueue.push(
                 workFunction,
                 error => {
-                    if (!error) {
-                        resolve();
-                    } else {
-                        reject(error);
-                    }
-                }
-            );
+                    error ? reject(error) : resolve();
+                });
         });
     }
 
@@ -1113,13 +1108,8 @@ export default class JingleSessionPC extends JingleSession {
         this.modificationQueue.push(
             workFunction,
             error => {
-                if (!error) {
-                    callback();
-                } else {
-                    errorCallback(error);
-                }
-            }
-        );
+                error ? errorCallback(error) : callback();
+            });
     }
 
     /**
@@ -1234,13 +1224,8 @@ export default class JingleSessionPC extends JingleSession {
         this.modificationQueue.push(
             workFunction,
             error => {
-                if (!error) {
-                    callback();
-                } else {
-                    errorCallback(error);
-                }
-            }
-        );
+                error ? errorCallback(error) : callback();
+            });
     }
 
     /**

modules/xmpp/SDP.js

@@ -509,16 +509,9 @@ SDP.prototype.jingle2media = function(content) {
     } else {
         tmp.proto = 'RTP/AVPF';
     }
-    if (!sctp.length) {
-        tmp.fmt = desc.find('payload-type').map(
-            function() {
-                return this.getAttribute('id');
-            }).get();
-        media += `${SDPUtil.build_mline(tmp)}\r\n`;
-    } else {
+    if (sctp.length) {
         media += `m=application 1 DTLS/SCTP ${sctp.attr('number')}\r\n`;
-        media += `a=sctpmap:${sctp.attr('number')
-             } ${sctp.attr('protocol')}`;
+        media += `a=sctpmap:${sctp.attr('number')} ${sctp.attr('protocol')}`;
 
         const streamCount = sctp.attr('streams');
         if (streamCount) {
@@ -526,6 +519,12 @@ SDP.prototype.jingle2media = function(content) {
         } else {
             media += '\r\n';
         }
+    } else {
+        tmp.fmt = desc.find('payload-type').map(
+            function() {
+                return this.getAttribute('id');
+            }).get();
+        media += `${SDPUtil.build_mline(tmp)}\r\n`;
     }
 
     media += 'c=IN IP4 0.0.0.0\r\n';

modules/xmpp/SDPUtil.js

@@ -217,11 +217,11 @@ const SDPUtil = {
         const parts = line.substr(9).split(' ');
         const data = {};
         data.value = parts.shift();
-        if (data.value.indexOf('/') != -1) {
+        if (data.value.indexOf('/') === -1) {
+            data.direction = 'both';
+        } else {
             data.direction = data.value.substr(data.value.indexOf('/') + 1);
             data.value = data.value.substr(0, data.value.indexOf('/'));
-        } else {
-            data.direction = 'both';
         }
         data.uri = parts.shift();
         data.params = parts;

modules/xmpp/SdpConsistency.js

@@ -88,17 +88,11 @@ export default class SdpConsistency {
                 logger.info('Sdp-consistency couldn\'t parse new primary ssrc');
                 return sdpStr;
             }
-            if (!this.cachedPrimarySsrc) {
-                this.cachedPrimarySsrc = newPrimarySsrc;
-                logger.info(
-                    `Sdp-consistency caching primary ssrc ${
-                        this.cachedPrimarySsrc}`);
-            } else {
+            if (this.cachedPrimarySsrc) {
                 logger.info(
                     `Sdp-consistency replacing new ssrc ${newPrimarySsrc
                         } with cached ${this.cachedPrimarySsrc}`);
-                videoMLine.replaceSSRC(
-                    newPrimarySsrc, this.cachedPrimarySsrc);
+                videoMLine.replaceSSRC(newPrimarySsrc, this.cachedPrimarySsrc);
                 for (const group of videoMLine.ssrcGroups) {
                     if (group.semantics === 'FID') {
                         const primarySsrc = parsePrimarySSRC(group);
@@ -109,6 +103,11 @@ export default class SdpConsistency {
                         }
                     }
                 }
+            } else {
+                this.cachedPrimarySsrc = newPrimarySsrc;
+                logger.info(
+                    `Sdp-consistency caching primary ssrc ${
+                        this.cachedPrimarySsrc}`);
             }
         }
         return sdpTransformer.toRawSDP();

modules/xmpp/xmpp.js

@@ -162,7 +162,10 @@ export default class XMPP extends Listenable {
                 this.eventEmitter.emit(
                     JitsiConnectionEvents.CONNECTION_FAILED,
                     JitsiConnectionErrors.OTHER_ERROR, errMsg);
-            } else if (!wasIntentionalDisconnect) {
+            } else if (wasIntentionalDisconnect) {
+                this.eventEmitter.emit(
+                    JitsiConnectionEvents.CONNECTION_DISCONNECTED, errMsg);
+            } else {
                 // XXX if Strophe drops the connection while not being asked to,
                 // it means that most likely some serious error has occurred.
                 // One currently known case is when a BOSH request fails for
@@ -183,9 +186,6 @@ export default class XMPP extends Listenable {
                         JitsiConnectionErrors.CONNECTION_DROPPED_ERROR,
                         errMsg ? errMsg : 'connection-dropped-error');
                 }
-            } else {
-                this.eventEmitter.emit(
-                    JitsiConnectionEvents.CONNECTION_DISCONNECTED, errMsg);
             }
         } else if (status === Strophe.Status.AUTHFAIL) {
             // wrong password or username, prompt user