Commit df5ec5fe authored by Szu-Yu Chen [:aknow]'s avatar Szu-Yu Chen [:aknow]
Browse files

Bug 990467 - Part 1: Refactor: Extract function of adding new voice call. r=hsinyi

parent 7cc88c81

dom/system/gonk/ril_worker.js

+29 −24
Original line number Diff line number Diff line
@@ -3823,9 +3823,24 @@ RilObject.prototype = { 
    // Go through any remaining calls that are new to us.

    for each (let newCall in newCalls) {

      if (newCall.isVoice) {

        if (newCall.isMpty) {

          conferenceChanged = true;

        }

        this._addNewVoiceCall(newCall);

      }

    }



    if (clearConferenceRequest) {

      this._hasConferenceRequest = false;

    }

    if (conferenceChanged) {

      this._ensureConference();

    }

  },



  _addNewVoiceCall: function(newCall) {

    // Format international numbers appropriately.

        if (newCall.number &&

            newCall.toa == TOA_INTERNATIONAL &&

    if (newCall.number && newCall.toa == TOA_INTERNATIONAL &&

        newCall.number[0] != "+") {

      newCall.number = "+" + newCall.number;

    }
@@ -3840,25 +3855,15 @@ RilObject.prototype = { 
    newCall.isEmergency = newCall.isOutgoing &&

      this._isEmergencyNumber(newCall.number);



    // Set flag for conference.

    newCall.isConference = newCall.isMpty ? true : false;



    // Add to our map.

    if (newCall.isMpty) {

          conferenceChanged = true;

          newCall.isConference = true;

      this.currentConference.participants[newCall.callIndex] = newCall;

        } else {

          newCall.isConference = false;

    }

    this._handleChangedCallState(newCall);

    this.currentCalls[newCall.callIndex] = newCall;

      }

    }



    if (clearConferenceRequest) {

      this._hasConferenceRequest = false;

    }

    if (conferenceChanged) {

      this._ensureConference();

    }

  },



  _ensureConference: function() {