~aleteoryx/muditaos

81790f22ee87dd6610cf870bb95a7df138899282 — Adam Dobrowolski 3 years ago 1d19c54 
[MOS-459] Wait with GUI change till RING delay

As in the description, we can wait with audio etc too - as it's stupid
othervise
patch browse .tar.gz 
9 files changed, 120 insertions(+), 39 deletions(-)

M module-services/service-cellular/ServiceCellular.cpp
M module-services/service-cellular/call/CallMachine.hpp
M module-services/service-cellular/call/CellularCall.cpp
M module-services/service-cellular/call/api/CallTimer.cpp
M module-services/service-cellular/call/api/CallTimer.hpp
M module-services/service-cellular/call/doc/call.svg
M module-services/service-cellular/call/include/call/CallEvents.hpp
M module-services/service-cellular/call/include/call/CellularCall.hpp
M module-services/service-cellular/call/tests/test-CallMachine.cpp

M module-services/service-cellular/ServiceCellular.cpp => module-services/service-cellular/ServiceCellular.cpp +5 -0
@@ 266,6 266,11 @@ sys::ReturnCodes ServiceCellular::InitHandler()
                                         "callDurationTimer",
                                         std::chrono::milliseconds{1000},
                                         [this](sys::Timer &) { ongoingCall->handle(call::event::OngoingTimer{}); }),
                                     sys::TimerFactory::createSingleShotTimer(
                                         this,
                                         "callRingTimeout",
                                         std::chrono::milliseconds{1000},
                                         [this](sys::Timer &) { ongoingCall->handle(call::event::RingTimeout{}); }),
                                     cpuSentinel);

    auto sentinelRegistrationMsg = std::make_shared<sys::SentinelRegistrationMessage>(cpuSentinel);


M module-services/service-cellular/call/CallMachine.hpp => module-services/service-cellular/call/CallMachine.hpp +18 -6
@@ 61,13 61,21 @@ namespace call
            setIncomingCall(di, call, nr);
            call.record.date = std::time(nullptr);

            di.gui->notifyRING();
            di.sentinel->HoldMinimumFrequency(bsp::CpuFrequencyMHz::Level_6);
            di.ringTimer->start();
        }
    } constexpr HandleRing;

    struct HandleRingTimeout
    {
        void operator()(Dependencies &di, CallData &call)
        {
            di.multicast->notifyIncommingCall();
            di.db->startCall(call.record);
            di.sentinel->HoldMinimumFrequency(bsp::CpuFrequencyMHz::Level_6);
            di.gui->notifyRING();
            di.audio->play();
        }
    } constexpr HandleRing;
    } constexpr HandleRingTimeout;

    struct ClipConnected
    {


@@ 282,7 290,7 @@ namespace call
            return make_transition_table(
                *"Idle"_s + on_entry<_> / HandleInit,

                "Idle"_s + boost::sml::event<evt::RING>[RING] / HandleRing                     = "Ringing"_s,
                "Idle"_s + boost::sml::event<evt::RING>[RING] / HandleRing                     = "RingDelay"_s,
                "Idle"_s + boost::sml::event<evt::CLIP>[ClipConnected] / HandleClipWithoutRing = "HaveId"_s,
                "Idle"_s + boost::sml::event<evt::CLIP>[ClipDND_OK] / HandleClipDND            = "HaveId"_s,
                "Idle"_s + boost::sml::event<evt::CLIP>[ClipDND_NOK] / HandleDND_Reject        = "Idle"_s,


@@ 293,6 301,10 @@ namespace call
                "Starting"_s + boost::sml::event<evt::Reject> / HandleEndCall     = "Idle"_s,
                "Starting"_s + boost::sml::event<evt::Answer> / HandleStartedCall = "Ongoing"_s,

                "RingDelay"_s + boost::sml::event<evt::RingTimeout> / HandleRingTimeout = "Ringing"_s,
                // here we do not need guard - RingDelay state is already guarded on entry
                "RingDelay"_s + boost::sml::event<evt::CLIP> / HandleClipWithoutRing = "HaveId"_s,

                "Ringing"_s + boost::sml::event<evt::Answer> / HandleAnswerCall                 = "Ongoing"_s,
                "Ringing"_s + boost::sml::event<evt::Reject> / HandleRejectCall                 = "Idle"_s,
                "Ringing"_s + boost::sml::event<evt::Ended> / HandleRejectCall                  = "Idle"_s,


@@ 311,8 323,8 @@ namespace call
                "Ongoing"_s + boost::sml::event<evt::Ended> / HandleEndCall  = "Idle"_s,
                "Ongoing"_s + boost::sml::event<evt::Reject> / HandleEndCall = "Idle"_s,

                *("exceptions handling"_s) + exception<std::runtime_error> / ExceptionHandler = "Idle"_s,
                "exceptions handling"_s + exception<std::runtime_error> / ExceptionHandler    = "Idle"_s);
                *("ExceptionsHandling"_s) + exception<std::runtime_error> / ExceptionHandler = "Idle"_s,
                "ExceptionsHandling"_s + exception<std::runtime_error> / ExceptionHandler    = "Idle"_s);
        }
    };



M module-services/service-cellular/call/CellularCall.cpp => module-services/service-cellular/call/CellularCall.cpp +10 -0
@@ 30,6 30,7 @@ namespace call
    Call::Call(ServiceCellular *owner,
               CellularMux *cmux,
               sys::TimerHandle timer,
               sys::TimerHandle timerRing,
               std::shared_ptr<sys::CpuSentinel> sentinel)
    {
        machine = std::make_unique<StateMachine>(Dependencies{std::make_unique<Audio>(owner),


@@ 37,6 38,7 @@ namespace call
                                                              std::make_unique<CallGUI>(owner),
                                                              std::make_unique<CallDB>(owner),
                                                              std::make_unique<CallTimer>(std::move(timer)),
                                                              std::make_unique<TimerRing>(std::move(timerRing)),
                                                              std::make_unique<cellular::Api>(owner, cmux),
                                                              std::move(sentinel)});
    }


@@ 127,6 129,14 @@ namespace call
        return machine->machine.process_event(tim);
    }

    bool Call::handle(const call::event::RingTimeout &tim)
    {
        if (machine == nullptr) {
            return false;
        };
        return machine->machine.process_event(tim);
    }

    bool Call::active() const
    {
        return machine->active();


M module-services/service-cellular/call/api/CallTimer.cpp => module-services/service-cellular/call/api/CallTimer.cpp +8 -0
@@ 22,3 22,11 @@ time_t CallTimer::duration()
{
    return std::time(nullptr) - startActiveTime;
}

TimerRing::TimerRing(sys::TimerHandle handle) : handle(std::move(handle))
{}

void TimerRing::start()
{
    handle.start();
}


M module-services/service-cellular/call/api/CallTimer.hpp => module-services/service-cellular/call/api/CallTimer.hpp +14 -0
@@ 16,6 16,11 @@ namespace call::api
        virtual time_t duration() = 0;
        virtual ~Timer()          = default;
    };

    struct TimerRing
    {
        virtual void start() = 0;
    };
}; // namespace call::api

class CallTimer : public call::api::Timer


@@ 29,3 34,12 @@ class CallTimer : public call::api::Timer
    void stop() override;
    time_t duration() override;
};

class TimerRing : public call::api::TimerRing
{
    sys::TimerHandle handle;

  public:
    explicit TimerRing(sys::TimerHandle handle);
    void start() override;
};


M module-services/service-cellular/call/doc/call.svg => module-services/service-cellular/call/doc/call.svg +39 -28
@@ 1,39 1,46 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="673px" preserveAspectRatio="none" style="width:1725px;height:673px;background:#FFFFFF;" version="1.1" viewBox="0 0 1725 673" width="1725px" zoomAndPan="magnify"><defs><filter height="300%" id="fagroh412bl9h" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/><feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/><feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/></filter></defs><g><ellipse cx="689.42" cy="16" fill="#000000" filter="url(#fagroh412bl9h)" rx="10" ry="10" style="stroke:none;stroke-width:1.0;"/><g id="Idle"><rect fill="#FEFECE" filter="url(#fagroh412bl9h)" height="71.7561" rx="12.5" ry="12.5" style="stroke:#A80036;stroke-width:1.5;" width="108" x="635.42" y="87"/><line style="stroke:#A80036;stroke-width:1.5;" x1="635.42" x2="743.42" y1="116.0679" y2="116.0679"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="26" x="676.42" y="106.9659">Idle</text><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacing" textLength="55" x="640.42" y="133.896">on_entry /</text><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacing" textLength="85" x="643.42" y="150.2401">call::handle_init</text></g><g id="Ringing"><rect fill="#FEFECE" filter="url(#fagroh412bl9h)" height="50" rx="12.5" ry="12.5" style="stroke:#A80036;stroke-width:1.5;" width="73" x="207.92" y="276.5"/><line style="stroke:#A80036;stroke-width:1.5;" x1="207.92" x2="280.92" y1="305.5679" y2="305.5679"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="53" x="217.92" y="296.4659">Ringing</text></g><g id="HaveId"><rect fill="#FEFECE" filter="url(#fagroh412bl9h)" height="50" rx="12.5" ry="12.5" style="stroke:#A80036;stroke-width:1.5;" width="67" x="655.92" y="444"/><line style="stroke:#A80036;stroke-width:1.5;" x1="655.92" x2="722.92" y1="473.0679" y2="473.0679"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="47" x="665.92" y="463.9659">HaveId</text></g><g id="Starting"><rect fill="#FEFECE" filter="url(#fagroh412bl9h)" height="50" rx="12.5" ry="12.5" style="stroke:#A80036;stroke-width:1.5;" width="74" x="1216.42" y="444"/><line style="stroke:#A80036;stroke-width:1.5;" x1="1216.42" x2="1290.42" y1="473.0679" y2="473.0679"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="54" x="1226.42" y="463.9659">Starting</text></g><g id="Ongoing"><rect fill="#FEFECE" filter="url(#fagroh412bl9h)" height="50" rx="12.5" ry="12.5" style="stroke:#A80036;stroke-width:1.5;" width="79" x="1143.92" y="609"/><line style="stroke:#A80036;stroke-width:1.5;" x1="1143.92" x2="1222.92" y1="638.0679" y2="638.0679"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="59" x="1153.92" y="628.9659">Ongoing</text></g><!--MD5=[38f1f8b7f214ff6bc6d4b705f682283d]
link *start to Idle--><path d="M689.42,26.32 C689.42,38.72 689.42,61.43 689.42,81.62 " fill="none" id="*start-to-Idle" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="689.42,86.69,693.4457,77.7015,689.4343,81.69,685.4457,77.6786,689.42,86.69" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[4a14721c1eaf3d017c18f39545a6a6ef]
link Idle to Ringing--><path d="M635.22,126.97 C510.58,134.34 212.03,155.36 182.42,189 C166.28,207.35 172.55,221.64 182.42,244 C187.26,254.96 195.39,264.71 204.2,272.89 " fill="none" id="Idle-to-Ringing" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="208.01,276.3,203.9599,267.3224,204.2801,272.9702,198.6323,273.2903,208.01,276.3" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="96" x="184.42" y="203.897">call::event::RING</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="72" x="197.92" y="221.603">[call::RING] /</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="95" x="186.42" y="239.309">call::HandleRing</text><!--MD5=[b445053e7a1d5b3c2afc54b1d6f0c485]
link Ringing to Idle--><path d="M262.94,276.26 C270.37,266.35 278.94,254.72 286.42,244 C303.15,220.04 298.04,205.09 322.42,189 C372.05,156.25 539.56,137.03 630.12,128.78 " fill="none" id="Ringing-to-Idle" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="635.18,128.33,625.8614,125.142,630.1996,128.7724,626.5692,133.1106,635.18,128.33" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="109" x="332.92" y="212.897">call::event::Reject /</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="125" x="326.42" y="230.603">call::HandleRejectCall</text><!--MD5=[b445053e7a1d5b3c2afc54b1d6f0c485]
link Ringing to Idle--><path d="M281.16,298.6 C326.33,294.62 403.48,282.27 456.42,244 C480.1,226.89 469.25,206.8 492.42,189 C532.63,158.12 588.19,141.54 630.06,132.88 " fill="none" id="Ringing-to-Idle-1" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="635.1,131.86,625.4879,129.7135,630.1982,132.8461,627.0656,137.5564,635.1,131.86" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="111" x="501.92" y="212.897">call::event::Ended /</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="125" x="496.42" y="230.603">call::HandleRejectCall</text><!--MD5=[b445053e7a1d5b3c2afc54b1d6f0c485]
link Ringing to Idle--><path d="M207.88,296.57 C150.88,289.62 45,273.04 22.42,244 C7.42,224.7 6,207.1 22.42,189 C62.87,144.43 473.7,129.44 629.74,125.34 " fill="none" id="Ringing-to-Idle-2" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="635.18,125.19,626.0799,121.4233,630.1817,125.3189,626.2861,129.4207,635.18,125.19" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="92" x="47.92" y="203.897">call::event::CLIP</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="125" x="32.92" y="221.603">[call::ClipDND_NOK] /</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="138" x="26.42" y="239.309">call::HandleDND_Reject</text><!--MD5=[d9a236f899448a21faa88e2b2c7523ea]
link Idle to HaveId--><path d="M736.63,159.18 C768.99,186.44 809.23,227.35 827.42,274 C854.18,342.59 776.89,409.65 727.39,444.11 " fill="none" id="Idle-to-HaveId" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="722.99,447.14,732.6725,445.3374,727.1102,444.3074,728.1403,438.7451,722.99,447.14" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="92" x="871.92" y="288.897">call::event::CLIP</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="128" x="855.42" y="306.603">[call::ClipConnected] /</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="166" x="836.42" y="324.309">call::HandleClipWithoutRing</text><!--MD5=[d9a236f899448a21faa88e2b2c7523ea]
link Idle to HaveId--><path d="M743.83,134.16 C853.13,157.1 1083.05,219.65 1011.42,329 C947.61,426.42 799.41,455.86 728.54,464.52 " fill="none" id="Idle-to-HaveId-1" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="723.16,465.15,732.5662,468.0695,728.1257,464.565,731.6302,460.1244,723.16,465.15" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="92" x="1039.92" y="288.897">call::event::CLIP</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="115" x="1029.92" y="306.603">[call::ClipDND_OK] /</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="118" x="1028.42" y="324.309">call::HandleClipDND</text><!--MD5=[b42b0813981780530edef3df7548b0ab]
link HaveId to Idle--><path d="M666.4,443.93 C643.12,420.43 605.39,384.58 568.42,359 C544.56,342.49 525.51,353.79 510.42,329 C497.72,308.12 495.46,293.33 510.42,274 C543.03,231.89 584.69,277.08 626.42,244 C651.94,223.77 668.28,190.35 677.91,163.91 " fill="none" id="HaveId-to-Idle" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="679.63,159.05,672.8525,166.196,677.9592,163.7626,680.3926,168.8693,679.63,159.05" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="111" x="522.92" y="297.897">call::event::Ended /</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="131" x="514.42" y="315.603">call::HandleMissedCall</text><!--MD5=[b42b0813981780530edef3df7548b0ab]
link HaveId to Idle--><path d="M689.42,443.6 C689.42,385.08 689.42,236.26 689.42,164.25 " fill="none" id="HaveId-to-Idle-1" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="689.42,159.2,685.42,168.2,689.42,164.2,693.42,168.2,689.42,159.2" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="109" x="699.92" y="297.897">call::event::Reject /</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="125" x="693.42" y="315.603">call::HandleRejectCall</text><!--MD5=[4f7116d012c72546cb0d8b5f1cb34cc3]
link Idle to Idle--><path d="M743.74,110.63 C762.89,110.43 778.42,114.56 778.42,123 C778.42,130.65 765.66,134.76 749.02,135.31 " fill="none" id="Idle-to-Idle" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="743.74,135.37,752.7851,139.2669,748.7397,135.3129,752.6937,131.2674,743.74,135.37" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="92" x="808.92" y="110.397">call::event::CLIP</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="125" x="793.92" y="128.103">[call::ClipDND_NOK] /</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="138" x="787.42" y="145.809">call::HandleDND_Reject</text><!--MD5=[5038e0717032de67f19838e91765af9d]
link Idle to Starting--><path d="M743.72,125.88 C840.16,132.19 1041.83,159.22 1155.42,274 C1202.99,322.07 1231.99,397.91 1245.1,439.08 " fill="none" id="Idle-to-Starting" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="1246.62,443.93,1247.7368,434.1447,1245.1205,439.1601,1240.105,436.5439,1246.62,443.93" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="123" x="1195.42" y="297.897">call::event::StartCall /</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="118" x="1199.42" y="315.603">call::HandleStartCall</text><!--MD5=[a8a6e8911ee4b822779a5c15ea0fe9d5]
link Starting to Ongoing--><path d="M1290.55,489.72 C1303.05,498.42 1315.56,509.91 1322.42,524 C1333.13,545.97 1336.23,558.83 1322.42,579 C1301.4,609.72 1260.13,622.97 1228,628.68 " fill="none" id="Starting-to-Ongoing" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="1222.93,629.53,1232.4686,631.9825,1227.8608,628.7011,1231.1423,624.0933,1222.93,629.53" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="111" x="1334.42" y="547.897">call::event::Ended /</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="112" x="1335.42" y="565.603">call::HandleEndCall</text><!--MD5=[a8a6e8911ee4b822779a5c15ea0fe9d5]
link Starting to Ongoing--><path d="M1216.08,473.25 C1157.2,479.22 1047.05,494.18 1023.42,524 C1008.24,543.16 1009.17,559.14 1023.42,579 C1049.34,615.09 1100.64,627.38 1138.19,631.39 " fill="none" id="Starting-to-Ongoing-1" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="1143.63,631.93,1135.0616,627.0738,1138.6537,631.4438,1134.2837,635.0359,1143.63,631.93" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="109" x="1027.42" y="547.897">call::event::Reject /</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="112" x="1027.42" y="565.603">call::HandleEndCall</text><!--MD5=[a8a6e8911ee4b822779a5c15ea0fe9d5]
link Starting to Ongoing--><path d="M1216.16,486.4 C1200.94,495.19 1184.94,507.63 1176.42,524 C1163.57,548.71 1167.77,580.95 1173.69,603.94 " fill="none" id="Starting-to-Ongoing-2" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="1175.05,609,1176.5727,599.2696,1173.7501,604.1719,1168.8478,601.3494,1175.05,609" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="117" x="1186.92" y="547.897">call::event::Answer /</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="133" x="1180.42" y="565.603">call::HandleStartedCall</text><!--MD5=[2cebd8ac44a4363bc14d79ffcc983203]
link Ringing to Ongoing--><path d="M229.14,326.58 C215.86,350.87 201.48,388.36 220.42,414 C368.8,614.81 513.34,526.44 757.42,579 C894.7,608.56 1060.6,623.86 1138.68,629.87 " fill="none" id="Ringing-to-Ongoing" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="1143.69,630.26,1135.0253,625.5777,1138.7049,629.8743,1134.4083,633.5539,1143.69,630.26" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="117" x="305.92" y="465.397">call::event::Answer /</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="133" x="299.42" y="483.103">call::HandleAnswerCall</text><!--MD5=[1eb793f0abbdfe879580084477c36e66]
link Ringing to HaveId--><path d="M235.23,326.6 C227.43,351.64 220.48,390.38 241.42,414 C268.42,444.44 546.62,461.04 650.55,466.21 " fill="none" id="Ringing-to-HaveId" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="655.66,466.46,646.8647,462.0281,650.6659,466.2174,646.4765,470.0187,655.66,466.46" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="92" x="275.42" y="373.897">call::event::CLIP</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="128" x="258.92" y="391.603">[call::ClipConnected] /</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="155" x="245.42" y="409.309">call::HandleClipConnected</text><!--MD5=[1eb793f0abbdfe879580084477c36e66]
link Ringing to HaveId--><path d="M280.94,308.31 C315.88,315.38 368.58,330.14 405.42,359 C428.43,377.01 417.36,397.44 441.42,414 C505.29,457.96 598.53,467 650.58,468.36 " fill="none" id="Ringing-to-HaveId-1" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="655.8,468.47,646.8938,464.2654,650.8013,468.3557,646.7109,472.2633,655.8,468.47" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="92" x="456.92" y="373.897">call::event::CLIP</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="115" x="446.92" y="391.603">[call::ClipDND_OK] /</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="118" x="445.42" y="409.309">call::HandleClipDND</text><!--MD5=[5f70ee8c8facd2edf16dd4e5478bfbc0]
link HaveId to Ongoing--><path d="M719.92,494.04 C753.56,519.29 810.29,558.16 865.42,579 C958.54,614.19 1075.66,626.55 1138.56,630.81 " fill="none" id="HaveId-to-Ongoing" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="1143.73,631.15,1135.0125,626.5668,1138.7408,630.8212,1134.4864,634.5495,1143.73,631.15" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="109" x="879.92" y="538.897">call::event::Answer</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="119" x="876.42" y="556.603">[call::CallIncoming] /</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="133" x="869.42" y="574.309">call::HandleAnswerCall</text><!--MD5=[97d569762578c974cd2dfaf5367bfc1a]
link Ongoing to Ongoing--><path d="M1223.28,628.98 C1241.77,628.43 1257.92,630.1 1257.92,634 C1257.92,637.53 1244.66,639.24 1228.41,639.12 " fill="none" id="Ongoing-to-Ongoing" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="1223.28,639.02,1232.2101,643.1737,1228.2793,639.1057,1232.3472,635.1749,1223.28,639.02" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="100" x="1267.92" y="630.397">call::event::CLIP /</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="105" x="1266.92" y="648.103">call::HandleAddID</text><!--MD5=[97d569762578c974cd2dfaf5367bfc1a]
link Ongoing to Ongoing--><path d="M1223.24,626.86 C1282.93,621.02 1377.92,623.4 1377.92,634 C1377.92,644.29 1288.41,646.83 1228.57,641.63 " fill="none" id="Ongoing-to-Ongoing-1" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="1223.24,641.14,1231.8359,645.9473,1228.219,641.5978,1232.5685,637.9809,1223.24,641.14" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="160" x="1383.92" y="630.397">call::event::OngoingTimer /</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="123" x="1403.92" y="648.103">call::HandleCallTimer</text><!--MD5=[97d569762578c974cd2dfaf5367bfc1a]
link Ongoing to Ongoing--><path d="M1223.2,625.93 C1322.77,613.99 1549.92,616.68 1549.92,634 C1549.92,651.03 1330.25,653.91 1228.26,642.65 " fill="none" id="Ongoing-to-Ongoing-2" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="1223.2,642.07,1231.6844,647.0716,1228.1673,642.641,1232.5979,639.1239,1223.2,642.07" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="157" x="1555.92" y="630.397">call::event::AudioRequest /</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="152" x="1559.92" y="648.103">call::HandleAudioRequest</text><!--MD5=[08eaf5efa1f60c65a3812368f3ac4307]
link Ongoing to Idle--><path d="M1222.96,631.14 C1291.38,627 1427.33,614.42 1456.42,579 C1549.86,465.28 1437.6,371.59 1327.42,274 C1240.97,197.42 890.4,147.96 748.99,130.78 " fill="none" id="Ongoing-to-Idle" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="743.64,130.13,752.0959,135.1796,748.604,130.7291,753.0544,127.2372,743.64,130.13" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="111" x="1466.42" y="382.897">call::event::Ended /</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="112" x="1467.42" y="400.603">call::HandleEndCall</text><!--MD5=[08eaf5efa1f60c65a3812368f3ac4307]
link Ongoing to Idle--><path d="M1222.92,630.44 C1297.14,624.96 1453.88,609.99 1497.42,579 C1537.16,550.72 1638.88,437.36 1588.42,359 C1489.57,205.48 1390.16,238.56 1214.42,189 C1050.08,142.65 847.54,129.34 748.96,125.53 " fill="none" id="Ongoing-to-Idle-1" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="743.77,125.33,752.6153,129.6613,748.7666,125.5156,752.9123,121.6668,743.77,125.33" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="109" x="1605.42" y="382.897">call::event::Reject /</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="112" x="1605.42" y="400.603">call::HandleEndCall</text><!--MD5=[f81c42a19a41ff84caa28b19edd7dd9c]
<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="998px" preserveAspectRatio="none" style="width:2008px;height:998px;background:#FFFFFF;" version="1.1" viewBox="0 0 2008 998" width="2008px" zoomAndPan="magnify"><defs><filter height="300%" id="fmfti3qnk8mn9" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/><feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/><feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/></filter></defs><g><ellipse cx="1098.98" cy="16" fill="#000000" filter="url(#fmfti3qnk8mn9)" rx="10" ry="10" style="stroke:none;stroke-width:1.0;"/><g id="Idle"><rect fill="#FEFECE" filter="url(#fmfti3qnk8mn9)" height="71.7561" rx="12.5" ry="12.5" style="stroke:#A80036;stroke-width:1.5;" width="106" x="1083.98" y="234"/><line style="stroke:#A80036;stroke-width:1.5;" x1="1083.98" x2="1189.98" y1="263.0679" y2="263.0679"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="26" x="1123.98" y="253.9659">Idle</text><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacing" textLength="55" x="1088.98" y="280.896">on_entry /</text><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacing" textLength="83" x="1091.98" y="297.2401">call::HandleInit</text></g><g id="RingDelay"><rect fill="#FEFECE" filter="url(#fmfti3qnk8mn9)" height="50" rx="12.5" ry="12.5" style="stroke:#A80036;stroke-width:1.5;" width="88" x="623.98" y="423.5"/><line style="stroke:#A80036;stroke-width:1.5;" x1="623.98" x2="711.98" y1="452.5679" y2="452.5679"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="633.98" y="443.4659">RingDelay</text></g><g id="HaveId"><rect fill="#FEFECE" filter="url(#fmfti3qnk8mn9)" height="50" rx="12.5" ry="12.5" style="stroke:#A80036;stroke-width:1.5;" width="67" x="904.48" y="756"/><line style="stroke:#A80036;stroke-width:1.5;" x1="904.48" x2="971.48" y1="785.0679" y2="785.0679"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="47" x="914.48" y="775.9659">HaveId</text></g><g id="Starting"><rect fill="#FEFECE" filter="url(#fmfti3qnk8mn9)" height="50" rx="12.5" ry="12.5" style="stroke:#A80036;stroke-width:1.5;" width="74" x="1397.98" y="423.5"/><line style="stroke:#A80036;stroke-width:1.5;" x1="1397.98" x2="1471.98" y1="452.5679" y2="452.5679"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="54" x="1407.98" y="443.4659">Starting</text></g><g id="Ongoing"><rect fill="#FEFECE" filter="url(#fmfti3qnk8mn9)" height="50" rx="12.5" ry="12.5" style="stroke:#A80036;stroke-width:1.5;" width="79" x="1426.48" y="921"/><line style="stroke:#A80036;stroke-width:1.5;" x1="1426.48" x2="1505.48" y1="950.0679" y2="950.0679"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="59" x="1436.48" y="940.9659">Ongoing</text></g><g id="Ringing"><rect fill="#FEFECE" filter="url(#fmfti3qnk8mn9)" height="50" rx="12.5" ry="12.5" style="stroke:#A80036;stroke-width:1.5;" width="73" x="353.48" y="591"/><line style="stroke:#A80036;stroke-width:1.5;" x1="353.48" x2="426.48" y1="620.0679" y2="620.0679"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="53" x="363.48" y="610.9659">Ringing</text></g><g id="ExceptionsHandling"><rect fill="#FEFECE" filter="url(#fmfti3qnk8mn9)" height="50" rx="12.5" ry="12.5" style="stroke:#A80036;stroke-width:1.5;" width="154" x="1131.98" y="87"/><line style="stroke:#A80036;stroke-width:1.5;" x1="1131.98" x2="1285.98" y1="116.0679" y2="116.0679"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="134" x="1141.98" y="106.9659">ExceptionsHandling</text></g><!--MD5=[38f1f8b7f214ff6bc6d4b705f682283d]
link *start to Idle--><path d="M1098.88,26.07 C1098.75,53.34 1099.65,136.79 1113.98,204 C1115.72,212.14 1118.21,220.66 1120.92,228.75 " fill="none" id="*start-to-Idle" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="1122.62,233.72,1123.4712,223.908,1120.9918,228.9925,1115.9073,226.5131,1122.62,233.72" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[250825e2d3d713b0588fbcdf11c2fe59]
link Idle to RingDelay--><path d="M1083.73,274.04 C961.3,281.57 668.03,302.91 638.98,336 C618.86,358.92 633,394.11 647.73,418.8 " fill="none" id="Idle-to-RingDelay" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="650.48,423.29,649.1935,413.5255,647.8699,419.0254,642.37,417.7017,650.48,423.29" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="96" x="640.98" y="350.897">call::event::RING</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="72" x="654.48" y="368.603">[call::RING] /</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="95" x="642.98" y="386.309">call::HandleRing</text><!--MD5=[d9a236f899448a21faa88e2b2c7523ea]
link Idle to HaveId--><path d="M1083.77,283.88 C994.56,308.86 818.82,373.48 759.98,506 C750.06,528.34 744.92,541.75 759.98,561 C794.12,604.64 840.84,552.81 880.98,591 C925.51,633.36 935.62,709.12 937.69,750.7 " fill="none" id="Idle-to-HaveId" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="937.91,755.84,941.5198,746.6765,937.6953,750.8446,933.5272,747.0201,937.91,755.84" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="92" x="799.48" y="520.897">call::event::CLIP</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="128" x="782.98" y="538.603">[call::ClipConnected] /</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="166" x="763.98" y="556.309">call::HandleClipWithoutRing</text><!--MD5=[d9a236f899448a21faa88e2b2c7523ea]
link Idle to HaveId--><path d="M1102.89,306.12 C1063.4,349.24 1000.06,426.48 970.98,506 C937.28,598.17 968.58,629.27 951.98,726 C950.57,734.22 948.53,743.02 946.43,751.08 " fill="none" id="Idle-to-HaveId-1" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="945.13,755.99,951.3111,748.3223,946.4165,751.1584,943.5804,746.2638,945.13,755.99" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="92" x="986.48" y="520.897">call::event::CLIP</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="115" x="976.48" y="538.603">[call::ClipDND_OK] /</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="118" x="974.98" y="556.309">call::HandleClipDND</text><!--MD5=[b42b0813981780530edef3df7548b0ab]
link HaveId to Idle--><path d="M962.19,755.98 C998.58,718.21 1066.49,640.95 1097.98,561 C1131.24,476.58 1137.07,368.79 1137.56,311.34 " fill="none" id="HaveId-to-Idle" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="1137.59,306.28,1133.5386,315.257,1137.5614,311.2799,1141.5385,315.3027,1137.59,306.28" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="111" x="1127.48" y="529.897">call::event::Ended /</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="131" x="1118.98" y="547.603">call::HandleMissedCall</text><!--MD5=[b42b0813981780530edef3df7548b0ab]
link HaveId to Idle--><path d="M971.54,769.5 C1041.09,745.65 1199.47,680.02 1258.98,561 C1269.91,539.14 1264.78,529.75 1258.98,506 C1258.34,503.37 1192.51,377.23 1157.83,310.87 " fill="none" id="HaveId-to-Idle-1" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="1155.39,306.2,1156.0133,316.0291,1157.7058,310.6314,1163.1035,312.3239,1155.39,306.2" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="109" x="1275.48" y="529.897">call::event::Reject /</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="125" x="1268.98" y="547.603">call::HandleRejectCall</text><!--MD5=[4f7116d012c72546cb0d8b5f1cb34cc3]
link Idle to Idle--><path d="M1190.25,254.27 C1209.38,253.93 1224.98,259.17 1224.98,270 C1224.98,279.81 1212.17,285.04 1195.53,285.68 " fill="none" id="Idle-to-Idle" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="1190.25,285.73,1199.2951,289.6269,1195.2497,285.6729,1199.2037,281.6274,1190.25,285.73" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="92" x="1255.48" y="257.397">call::event::CLIP</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="125" x="1240.48" y="275.103">[call::ClipDND_NOK] /</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="138" x="1233.98" y="292.809">call::HandleDND_Reject</text><!--MD5=[5038e0717032de67f19838e91765af9d]
link Idle to Starting--><path d="M1171.41,306.16 C1180.08,315.58 1189.14,325.95 1196.98,336 C1214.95,359.04 1209.41,373.74 1232.98,391 C1280.56,425.83 1348.76,439.2 1392.46,444.33 " fill="none" id="Idle-to-Starting" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="1397.67,444.91,1389.1873,439.9057,1392.7029,444.3374,1388.2711,447.853,1397.67,444.91" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="123" x="1233.98" y="359.897">call::event::StartCall /</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="118" x="1237.98" y="377.603">call::HandleStartCall</text><!--MD5=[1bc642de75d5bfa6cbc248000611c07d]
link Starting to Idle--><path d="M1419.14,423.31 C1397.67,390.51 1361.98,336 1361.98,336 C1312.91,299.75 1244.08,283.67 1195.5,276.56 " fill="none" id="Starting-to-Idle" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="1190.27,275.82,1198.6202,281.0425,1195.2206,276.5211,1199.742,273.1215,1190.27,275.82" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="111" x="1398.98" y="359.897">call::event::Ended /</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="112" x="1399.98" y="377.603">call::HandleEndCall</text><!--MD5=[1bc642de75d5bfa6cbc248000611c07d]
link Starting to Idle--><path d="M1472.08,432.59 C1489.67,423.42 1508.99,409.77 1518.98,391 C1530.47,369.42 1534.75,354.68 1518.98,336 C1478.27,287.77 1292.01,275.32 1195.44,272.11 " fill="none" id="Starting-to-Idle-1" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="1190.34,271.95,1199.2099,276.2307,1195.3375,272.1071,1199.4612,268.2347,1190.34,271.95" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="109" x="1532.98" y="359.897">call::event::Reject /</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="112" x="1532.98" y="377.603">call::HandleEndCall</text><!--MD5=[a8a6e8911ee4b822779a5c15ea0fe9d5]
link Starting to Ongoing--><path d="M1439.41,473.62 C1441.09,483.61 1442.87,495.33 1443.98,506 C1460.01,659.49 1464.44,844.43 1465.6,915.35 " fill="none" id="Starting-to-Ongoing" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="1465.68,920.66,1469.5251,911.5928,1465.5943,915.6607,1461.5263,911.7299,1465.68,920.66" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="117" x="1469.48" y="694.897">call::event::Answer /</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="133" x="1462.98" y="712.603">call::HandleStartedCall</text><!--MD5=[b6e119c1cf60240eac697d9a2af36601]
link RingDelay to Ringing--><path d="M623.8,466.41 C614.95,469.68 605.69,473.02 596.98,476 C554.69,490.49 536.65,479.05 500.98,506 C477.67,523.61 485.18,539.89 464.98,561 C455.01,571.43 442.78,581.2 431.12,589.48 " fill="none" id="RingDelay-to-Ringing" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="426.85,592.46,436.5209,590.5961,430.9522,589.6013,431.947,584.0326,426.85,592.46" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="150" x="501.98" y="529.897">call::event::RingTimeout /</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="145" x="505.98" y="547.603">call::HandleRingTimeout</text><!--MD5=[e9cf3e05c1025ddae1e43d6a4c6a3140]
link RingDelay to HaveId--><path d="M666.8,473.69 C666.11,512.55 669.88,589.73 705.98,641 C753.9,709.06 846.71,749.52 899.26,767.96 " fill="none" id="RingDelay-to-HaveId" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="904.21,769.68,897.0094,762.9606,899.484,768.0474,894.3972,770.5221,904.21,769.68" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="100" x="741.48" y="612.397">call::event::CLIP /</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="166" x="709.98" y="630.103">call::HandleClipWithoutRing</text><!--MD5=[2cebd8ac44a4363bc14d79ffcc983203]
link Ringing to Ongoing--><path d="M374.19,641.29 C360.79,665.3 346.56,701.83 365.98,726 C579.52,991.7 779.91,828.39 1114.98,891 C1224.55,911.48 1354.42,929.96 1421.27,939.06 " fill="none" id="Ringing-to-Ongoing" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="1426.36,939.75,1417.9783,934.5782,1421.4052,939.0789,1416.9046,942.5058,1426.36,939.75" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="117" x="454.48" y="777.397">call::event::Answer /</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="133" x="447.98" y="795.103">call::HandleAnswerCall</text><!--MD5=[b445053e7a1d5b3c2afc54b1d6f0c485]
link Ringing to Idle--><path d="M353.3,609.3 C256.5,592.53 6,537.11 72.98,421 C110.69,355.63 147.83,358.12 219.98,336 C381.56,286.46 903.4,274.4 1078.83,271.71 " fill="none" id="Ringing-to-Idle" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="1083.92,271.64,1074.8528,267.7949,1078.9207,271.7257,1074.9899,275.7937,1083.92,271.64" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="109" x="83.48" y="444.897">call::event::Reject /</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="125" x="76.98" y="462.603">call::HandleRejectCall</text><!--MD5=[b445053e7a1d5b3c2afc54b1d6f0c485]
link Ringing to Idle--><path d="M356.96,590.98 C311.03,554.51 237.31,482.83 272.98,421 C310.69,355.63 348.05,358.83 419.98,336 C542.43,297.14 930.53,278.78 1078.71,273.05 " fill="none" id="Ringing-to-Idle-1" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="1083.88,272.85,1074.7377,269.1868,1078.8834,273.0356,1075.0347,277.1813,1083.88,272.85" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="111" x="282.48" y="444.897">call::event::Ended /</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="125" x="276.98" y="462.603">call::HandleRejectCall</text><!--MD5=[b445053e7a1d5b3c2afc54b1d6f0c485]
link Ringing to Idle--><path d="M393.47,590.71 C400.31,550.93 418.85,471.33 462.98,421 C515.81,360.75 545.63,360.31 621.98,336 C781.85,285.1 981.56,273.86 1078.61,271.51 " fill="none" id="Ringing-to-Idle-2" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="1083.72,271.39,1074.6202,267.6227,1078.7217,271.5185,1074.8258,275.62,1083.72,271.39" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="92" x="488.48" y="435.897">call::event::CLIP</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="125" x="473.48" y="453.603">[call::ClipDND_NOK] /</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="138" x="466.98" y="471.309">call::HandleDND_Reject</text><!--MD5=[1eb793f0abbdfe879580084477c36e66]
link Ringing to HaveId--><path d="M380.73,641.11 C373.05,665.67 366.38,703.28 386.98,726 C421.34,763.89 779.42,776.1 899.2,779.14 " fill="none" id="Ringing-to-HaveId" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="904.38,779.27,895.4858,775.04,899.3817,779.1415,895.2802,783.0373,904.38,779.27" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="92" x="420.98" y="685.897">call::event::CLIP</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="128" x="404.48" y="703.603">[call::ClipConnected] /</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="155" x="390.98" y="721.309">call::HandleClipConnected</text><!--MD5=[1eb793f0abbdfe879580084477c36e66]
link Ringing to HaveId--><path d="M426.49,622.17 C461.42,628.64 514.11,642.54 550.98,671 C574.11,688.85 562.42,710.19 586.98,726 C638.15,758.94 819.13,773.19 899.29,777.99 " fill="none" id="Ringing-to-HaveId-1" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="904.42,778.29,895.6636,773.7816,899.4282,778.0039,895.2059,781.7685,904.42,778.29" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="92" x="602.48" y="685.897">call::event::CLIP</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="115" x="592.48" y="703.603">[call::ClipDND_OK] /</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="118" x="590.98" y="721.309">call::HandleClipDND</text><!--MD5=[5f70ee8c8facd2edf16dd4e5478bfbc0]
link HaveId to Ongoing--><path d="M971.81,792.44 C1063.79,820.84 1318.39,899.44 1421.63,931.31 " fill="none" id="HaveId-to-Ongoing" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="1426.43,932.79,1419.003,926.3217,1421.6508,931.3206,1416.6519,933.9684,1426.43,932.79" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="109" x="1294.48" y="850.897">call::event::Answer</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="119" x="1290.98" y="868.603">[call::CallIncoming] /</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="133" x="1283.98" y="886.309">call::HandleAnswerCall</text><!--MD5=[97d569762578c974cd2dfaf5367bfc1a]
link Ongoing to Ongoing--><path d="M1505.84,940.98 C1524.33,940.43 1540.48,942.1 1540.48,946 C1540.48,949.53 1527.21,951.24 1510.96,951.12 " fill="none" id="Ongoing-to-Ongoing" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="1505.84,951.02,1514.7582,955.1992,1510.839,951.12,1514.9182,947.2008,1505.84,951.02" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="100" x="1550.48" y="942.397">call::event::CLIP /</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="105" x="1549.48" y="960.103">call::HandleAddID</text><!--MD5=[97d569762578c974cd2dfaf5367bfc1a]
link Ongoing to Ongoing--><path d="M1505.8,938.86 C1565.49,933.02 1660.48,935.4 1660.48,946 C1660.48,956.29 1570.97,958.83 1511.13,953.63 " fill="none" id="Ongoing-to-Ongoing-1" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="1505.8,953.14,1514.3959,957.9473,1510.779,953.5978,1515.1285,949.9809,1505.8,953.14" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="160" x="1666.48" y="942.397">call::event::OngoingTimer /</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="123" x="1686.48" y="960.103">call::HandleCallTimer</text><!--MD5=[97d569762578c974cd2dfaf5367bfc1a]
link Ongoing to Ongoing--><path d="M1505.76,937.93 C1605.33,925.99 1832.48,928.68 1832.48,946 C1832.48,963.03 1612.81,965.91 1510.82,954.65 " fill="none" id="Ongoing-to-Ongoing-2" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="1505.76,954.07,1514.2444,959.0716,1510.7273,954.641,1515.1579,951.1239,1505.76,954.07" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="157" x="1838.48" y="942.397">call::event::AudioRequest /</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="152" x="1842.48" y="960.103">call::HandleAudioRequest</text><!--MD5=[08eaf5efa1f60c65a3812368f3ac4307]
link Ongoing to Idle--><path d="M1505.6,936.4 C1571.86,919.43 1697.98,874.91 1697.98,782 C1697.98,447.5 1697.98,447.5 1697.98,447.5 C1697.98,394.23 1696.07,368.66 1653.98,336 C1583.56,281.35 1315.19,272.32 1195.36,271.06 " fill="none" id="Ongoing-to-Idle" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="1190.12,271.01,1199.0854,275.087,1195.1198,271.0529,1199.154,267.0873,1190.12,271.01" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="111" x="1700.98" y="612.397">call::event::Ended /</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="112" x="1701.98" y="630.103">call::HandleEndCall</text><!--MD5=[08eaf5efa1f60c65a3812368f3ac4307]
link Ongoing to Idle--><path d="M1505.78,938.32 C1610.37,919.64 1884.98,862.88 1884.98,782 C1884.98,447.5 1884.98,447.5 1884.98,447.5 C1884.98,305.96 1371.25,277.8 1195.28,272.3 " fill="none" id="Ongoing-to-Idle-1" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="1190.18,272.15,1199.0499,276.4307,1195.1775,272.3071,1199.3012,268.4347,1190.18,272.15" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="109" x="1888.98" y="612.397">call::event::Reject /</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="112" x="1888.98" y="630.103">call::HandleEndCall</text><!--MD5=[5376f9f495d2db7dc2fd7c9e57fb9170]
link *start to ExceptionsHandling--><path d="M1106.2,23.17 C1120.26,35.19 1152.11,62.4 1176.66,83.38 " fill="none" id="*start-to-ExceptionsHandling" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="1180.53,86.69,1176.2806,77.8051,1176.7267,83.4443,1171.0874,83.8904,1180.53,86.69" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[2c9bee2526b6f9583d2ab770193a3097]
link ExceptionsHandling to Idle--><path d="M1249.74,137.03 C1259.86,145.17 1269.4,155.23 1274.98,167 C1282.02,181.86 1283.79,190.11 1274.98,204 C1257.41,231.69 1224.55,247.8 1195.3,257.06 " fill="none" id="ExceptionsHandling-to-Idle" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="1190.26,258.6,1200.0381,259.7784,1195.0392,257.1306,1197.687,252.1317,1190.26,258.6" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="94" x="1301.48" y="181.897">internal_event /</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="132" x="1283.98" y="199.603">call::ExceptionHandler</text><!--MD5=[2c9bee2526b6f9583d2ab770193a3097]
link ExceptionsHandling to Idle--><path d="M1157.92,137.23 C1146.73,145.08 1136.34,154.95 1129.98,167 C1120.13,185.67 1120.94,209 1124.64,228.64 " fill="none" id="ExceptionsHandling-to-Idle-1" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="1125.63,233.55,1127.7496,223.9319,1124.6302,228.651,1119.9111,225.5316,1125.63,233.55" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="94" x="1151.48" y="181.897">internal_event /</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="132" x="1133.98" y="199.603">call::ExceptionHandler</text><!--MD5=[cd32fcd4410d5b21736431a750f5cf05]
@startuml

[*] - -> Idle
Idle : on_entry /\n call::handle_init
Idle - -> Ringing : call::event::RING\n [call::RING] /\n call::HandleRing
Idle : on_entry /\n call::HandleInit
Idle - -> RingDelay : call::event::RING\n [call::RING] /\n call::HandleRing
Idle - -> HaveId : call::event::CLIP\n [call::ClipConnected] /\n call::HandleClipWithoutRing
Idle - -> HaveId : call::event::CLIP\n [call::ClipDND_OK] /\n call::HandleClipDND
Idle - -> Idle : call::event::CLIP\n [call::ClipDND_NOK] /\n call::HandleDND_Reject
Idle - -> Starting : call::event::StartCall /\n call::HandleStartCall
Starting - -> Ongoing : call::event::Ended /\n call::HandleEndCall
Starting - -> Ongoing : call::event::Reject /\n call::HandleEndCall
Starting - -> Idle : call::event::Ended /\n call::HandleEndCall
Starting - -> Idle : call::event::Reject /\n call::HandleEndCall
Starting - -> Ongoing : call::event::Answer /\n call::HandleStartedCall
RingDelay - -> Ringing : call::event::RingTimeout /\n call::HandleRingTimeout
RingDelay - -> HaveId : call::event::CLIP /\n call::HandleClipWithoutRing
Ringing - -> Ongoing : call::event::Answer /\n call::HandleAnswerCall
Ringing - -> Idle : call::event::Reject /\n call::HandleRejectCall
Ringing - -> Idle : call::event::Ended /\n call::HandleRejectCall


@@ 49,6 56,10 @@ Ongoing - -> Ongoing : call::event::AudioRequest /\n call::HandleAudioRequest
Ongoing - -> Idle : call::event::Ended /\n call::HandleEndCall
Ongoing - -> Idle : call::event::Reject /\n call::HandleEndCall

[*] - -> ExceptionsHandling
ExceptionsHandling - -> Idle : internal_event /\n call::ExceptionHandler
ExceptionsHandling - -> Idle : internal_event /\n call::ExceptionHandler

@enduml

PlantUML version 1.2021.9(Sun Jul 25 12:13:56 CEST 2021)


M module-services/service-cellular/call/include/call/CallEvents.hpp => module-services/service-cellular/call/include/call/CallEvents.hpp +4 -0
@@ 18,6 18,10 @@ namespace call::event
    };
    struct RING
    {};

    /// event signaling that we should not delay sending RING to UI any further
    struct RingTimeout
    {};
    struct CLIP
    {
        const utils::PhoneNumber::View number;


M module-services/service-cellular/call/include/call/CellularCall.hpp => module-services/service-cellular/call/include/call/CellularCall.hpp +3 -0
@@ 45,6 45,7 @@ namespace call
        std::shared_ptr<call::api::GUI> gui;
        std::shared_ptr<call::api::DB> db;
        std::shared_ptr<call::api::Timer> timer;
        std::shared_ptr<call::api::TimerRing> ringTimer;
        std::shared_ptr<call::api::Api> modem;
        std::shared_ptr<sys::CpuSentinel> sentinel;
    };


@@ 59,6 60,7 @@ namespace call
        Call(ServiceCellular *owner,
             CellularMux *cmux,
             sys::TimerHandle timer,
             sys::TimerHandle timerRing,
             std::shared_ptr<sys::CpuSentinel> sentinel);
        ~Call();
        Call &operator=(Call &&other) noexcept;


@@ 70,6 72,7 @@ namespace call
        bool handle(const call::event::AudioRequest &);
        bool handle(const call::event::ModeChange &);
        bool handle(const call::event::OngoingTimer &);
        bool handle(const call::event::RingTimeout &);
        bool handle(const call::event::Ended &);
        bool handle(const call::event::Reject &);



M module-services/service-cellular/call/tests/test-CallMachine.cpp => module-services/service-cellular/call/tests/test-CallMachine.cpp +19 -5
@@ 73,6 73,13 @@ namespace mocks
        return timer;
    }

    auto timerRing()
    {
        fakeit::Mock<call::api::TimerRing> timer;
        fakeit::When(Method(timer, start)).AlwaysReturn();
        return timer;
    }

    auto api(bool dnd = false)
    {
        fakeit::Mock<call::api::Api> api;


@@ 98,6 105,7 @@ namespace mocks
        decltype(mocks::gui()) gui             = mocks::gui();
        decltype(mocks::db()) db               = mocks::db();
        decltype(mocks::timer()) timer         = mocks::timer();
        decltype(mocks::timerRing()) timerRing = mocks::timerRing();
        decltype(mocks::api()) api;
        call::Dependencies di{};
        std::shared_ptr<mocks::Sentinel> sentinel = std::make_shared<mocks::Sentinel>();


@@ 109,12 117,14 @@ namespace mocks
            auto gui_p       = mock_to_shared<call::api::GUI>(&gui.get());
            auto db_p        = mock_to_shared<call::api::DB>(&db.get());
            auto timer_p     = mock_to_shared<call::api::Timer>(&timer.get());
            auto timer_ring_p = mock_to_shared<call::api::TimerRing>(&timerRing.get());
            auto api_p       = mock_to_shared<call::api::Api>(&api.get());
            di               = call::Dependencies{std::move(audio_p),
            di                = call::Dependencies{std::move(audio_p),
                                    std::move(multicast_p),
                                    std::move(gui_p),
                                    std::move(db_p),
                                    std::move(timer_p),
                                    std::move(timer_ring_p),
                                    std::move(api_p),
                                    sentinel};
        }


@@ 140,12 150,15 @@ TEST_CASE("base positive call flow, answered, end from caller")
    fakeit::Verify(Method(di.audio, play)).Exactly(0);
    // 1st ring
    REQUIRE(machine->machine.process_event(call::event::RING{}));
    fakeit::Verify(Method(di.audio, play)).Exactly(1);
    fakeit::Verify(Method(di.gui, notifyRING)).Exactly(1);
    fakeit::Verify(Method(di.audio, play)).Exactly(0);
    fakeit::Verify(Method(di.timerRing, start)).Exactly(1);
    // 2nd ring - ignored
    REQUIRE(not machine->machine.process_event(call::event::RING{}));
    fakeit::Verify(Method(di.timerRing, start)).Exactly(1);

    REQUIRE(machine->machine.process_event(call::event::RingTimeout{}));
    // we have to wait for RingTimeout first
    fakeit::Verify(Method(di.audio, play)).Exactly(1);
    fakeit::Verify(Method(di.gui, notifyRING)).Exactly(1);

    REQUIRE(machine->machine.process_event(call::event::CLIP{number.getView()}));
    REQUIRE(machine->call.record.phoneNumber == number.getView());


@@ 197,6 210,7 @@ TEST_CASE("no CLIP at all, anonymus call answered, end from caller")
    fakeit::Verify(Method(di.audio, play)).Exactly(0);

    REQUIRE(machine->machine.process_event(call::event::RING{}));
    REQUIRE(machine->machine.process_event(call::event::RingTimeout{}));
    fakeit::Verify(Method(di.audio, play)).Exactly(1);
    fakeit::Verify(Method(di.gui, notifyRING)).Exactly(1);



@@ 230,7 244,7 @@ TEST_CASE("reject on PURE after RING")
    auto machine = std::make_unique<call::StateMachine>(di.get());

    REQUIRE(machine->machine.process_event(call::event::RING{}));
    fakeit::Verify(Method(di.audio, play)).Exactly(1);
    REQUIRE(machine->machine.process_event(call::event::RingTimeout{}));

    CalllogRecord record_when_called;
    fakeit::When(Method(di.db, endCall)).AlwaysDo([&record_when_called](const CalllogRecord &rec) {