commit 49f1b578d72039540f6d18c24611b89d98ff5344
author atraczyk <andreastraczyk@gmail.com> Thu Oct 27 12:33:28 2016 -0400
committer Nicolas Jager <nicolas.jager@savoirfairelinux.com> Tue Nov 08 12:54:25 2016 -0400
tree b4f3844443769349ee4e55326aa5b7fa1b76f115
parent bd8238046f1fd861dc0ffed125ea30d2aa9f51bf

solution: merging various changes

- combines API violation fixes, asset and certificate changes, and the
  adding of qrcode dependency

Change-Id: I0d26c589fabef3b6c46bac19bf6bc0d0adfe76f1
Tuleap: #1234

MainPage.xaml.cpp

diff --git a/MainPage.xaml.cpp b/MainPage.xaml.cpp
index 6d025ff..d0f44c2 100644
--- a/MainPage.xaml.cpp
+++ b/MainPage.xaml.cpp
@@ -46,13 +46,13 @@
 using namespace Windows::ApplicationModel::Activation;

 using namespace Windows::Graphics::Display;

 using namespace Windows::System;

+using namespace Concurrency;

 

 MainPage::MainPage()

 {

     InitializeComponent();

 

-

-

+    UserModel::instance->getUserData();

 

     Window::Current->SizeChanged += ref new WindowSizeChangedEventHandler(this, &MainPage::OnResize);

 

@@ -76,11 +76,11 @@
                        Platform::Object^>(this, &MainPage::DisplayProperties_DpiChanged));

 

     visibilityChangedEventToken = Window::Current->VisibilityChanged +=

-                                      ref new WindowVisibilityChangedEventHandler(this, &MainPage::Application_VisibilityChanged);

+        ref new WindowVisibilityChangedEventHandler(this, &MainPage::Application_VisibilityChanged);

     applicationSuspendingEventToken = Application::Current->Suspending +=

-                                          ref new SuspendingEventHandler(this, &MainPage::Application_Suspending);

+        ref new SuspendingEventHandler(this, &MainPage::Application_Suspending);

     applicationResumingEventToken = Application::Current->Resuming +=

-                                        ref new EventHandler<Object^>(this, &MainPage::Application_Resuming);

+        ref new EventHandler<Object^>(this, &MainPage::Application_Resuming);

 }

 

 void

@@ -126,7 +126,6 @@
 {

     RingD::instance->startDaemon();

     showLoadingOverlay(true, false);

-

 }

 

 void

@@ -371,9 +370,9 @@
     newSession->Reason = ExtendedExecutionReason::SavingData;

     newSession->Description = "Extended Execution";

     sessionRevokedToken = (newSession->Revoked += ref new TypedEventHandler<Object^,

-                           ExtendedExecutionRevokedEventArgs^>(this, &MainPage::SessionRevoked));

+        ExtendedExecutionRevokedEventArgs^>(this, &MainPage::SessionRevoked));

     return create_task(newSession->RequestExtensionAsync())

-    .then([=](ExtendedExecutionResult result) {

+        .then([=](ExtendedExecutionResult result){

         try {

             switch (result)

             {

@@ -398,4 +397,4 @@
             RingDebug::instance->WriteLine("Exception: Extended Execution Request");

         }

     });

-}
\ No newline at end of file
+}