commit d83bc54973391b217991ee091fb8b0c2ab8af99c
author Nicolas Jager <nicolas.jager@savoirfairelinux.com> Fri Sep 16 12:07:31 2016 -0400
committer Nicolas Jager <nicolas.jager@savoirfairelinux.com> Fri Sep 16 12:09:55 2016 -0400
tree 2cd58208c72dbbba782f39fd57b01efb2e760b04
parent 1f46d9992cd4638bd1f4e8137833c69520aed491

fix : dispatcher locked

Change-Id: I8a6c2cf99e70c682420699fa6a0b66e996f0eb36
Tuleap: #1046

RingD.cpp

diff --git a/RingD.cpp b/RingD.cpp
index ccd7f00..03e0b25 100644
--- a/RingD.cpp
+++ b/RingD.cpp
@@ -38,12 +38,6 @@
 using namespace RingClientUWP::ViewModel;

 

 void

-debugOutputWrapper(const std::string& str)

-{

-    MSG_(str);

-}

-

-void

 RingClientUWP::RingD::reloadAccountList()

 {

     RingClientUWP::ViewModel::AccountsViewModel::instance->clearAccountList();

@@ -178,6 +172,8 @@
         using SharedCallback = std::shared_ptr<DRing::CallbackWrapperBase>;

         using namespace std::placeholders;

 

+        auto dispatcher = CoreApplication::MainView->CoreWindow->Dispatcher;

+

         std::map<std::string, SharedCallback> callHandlers = {

             // use IncomingCall only to register the call client sided, use StateChange to determine the impact on the UI

             DRing::exportable_callback<DRing::CallSignal::IncomingCall>([this](

@@ -266,6 +262,13 @@
                     reloadAccountList();

                 }));

             }),

+            DRing::exportable_callback<DRing::Debug::MessageSend>([&](const std::string& toto)

+            {

+                dispatcher->RunAsync(CoreDispatcherPriority::Normal,

+                ref new DispatchedHandler([=]() {

+                    RingDebug::instance->print(toto);

+                }));

+            })

             /* to remove from daemon API, this callback is never used */

             //DRing::exportable_callback<DRing::CallSignal::NewCallCreated>([&](

             //            const std::string& accountId,

@@ -276,11 +279,6 @@
 

         registerCallHandlers(callHandlers);

 

-        std::map<std::string, SharedCallback> dringDebugOutHandler;

-        dringDebugOutHandler.insert(DRing::exportable_callback<DRing::Debug::MessageSend>

-                                    (std::bind(&debugOutputWrapper, _1)));

-        registerCallHandlers(dringDebugOutHandler);

-

         std::map<std::string, SharedCallback> getAppPathHandler =

         {

             DRing::exportable_callback<DRing::ConfigurationSignal::GetAppDataPath>