Commit 49f1b578 authored by atraczyk's avatar atraczyk Committed by Nicolas Jager

solution: merging various changes

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

Change-Id: I0d26c589fabef3b6c46bac19bf6bc0d0adfe76f1
Tuleap: #1234
parent bd823804
Assets/LockScreenLogo.scale-200.png

1.4 KB | W: | H:

Assets/LockScreenLogo.scale-200.png

3.59 KB | W: | H:

Assets/LockScreenLogo.scale-200.png
Assets/LockScreenLogo.scale-200.png
Assets/LockScreenLogo.scale-200.png
Assets/LockScreenLogo.scale-200.png
  • 2-up
  • Swipe
  • Onion skin
Assets/SplashScreen.scale-200.png

7.52 KB | W: | H:

Assets/SplashScreen.scale-200.png

35.7 KB | W: | H:

Assets/SplashScreen.scale-200.png
Assets/SplashScreen.scale-200.png
Assets/SplashScreen.scale-200.png
Assets/SplashScreen.scale-200.png
  • 2-up
  • Swipe
  • Onion skin
Assets/Square150x150Logo.scale-200.png

2.87 KB | W: | H:

Assets/Square150x150Logo.scale-200.png

28.9 KB | W: | H:

Assets/Square150x150Logo.scale-200.png
Assets/Square150x150Logo.scale-200.png
Assets/Square150x150Logo.scale-200.png
Assets/Square150x150Logo.scale-200.png
  • 2-up
  • Swipe
  • Onion skin
Assets/Square44x44Logo.scale-200.png

1.61 KB | W: | H:

Assets/Square44x44Logo.scale-200.png

7.08 KB | W: | H:

Assets/Square44x44Logo.scale-200.png
Assets/Square44x44Logo.scale-200.png
Assets/Square44x44Logo.scale-200.png
Assets/Square44x44Logo.scale-200.png
  • 2-up
  • Swipe
  • Onion skin
Assets/StoreLogo.png

1.42 KB | W: | H:

Assets/StoreLogo.png

3.68 KB | W: | H:

Assets/StoreLogo.png
Assets/StoreLogo.png
Assets/StoreLogo.png
Assets/StoreLogo.png
  • 2-up
  • Swipe
  • Onion skin
Assets/Wide310x150Logo.scale-200.png

3.13 KB | W: | H:

Assets/Wide310x150Logo.scale-200.png

21.5 KB | W: | H:

Assets/Wide310x150Logo.scale-200.png
Assets/Wide310x150Logo.scale-200.png
Assets/Wide310x150Logo.scale-200.png
Assets/Wide310x150Logo.scale-200.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -46,13 +46,13 @@ using namespace Windows::UI::Xaml::Navigation;
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 @@ MainPage::MainPage()
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 @@ RingClientUWP::MainPage::OnNavigatedTo(NavigationEventArgs ^ e)
{
RingD::instance->startDaemon();
showLoadingOverlay(true, false);
}
void
......@@ -371,9 +370,9 @@ MainPage::BeginExtendedExecution()
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 @@ MainPage::BeginExtendedExecution()
RingDebug::instance->WriteLine("Exception: Extended Execution Request");
}
});
}
\ No newline at end of file
}
This diff is collapsed.
<?xml version="1.0" encoding="utf-8"?>
<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
<Identity Name="ring-client-uwp-multi-device" Publisher="CN=user" Version="2.0.3.0" />
<Identity Name="Savoir-faireLinux.GNURing" Publisher="CN=8121A5F7-3CA1-4CAA-92B2-4F595B011941" Version="1.1.0.0" />
<mp:PhoneIdentity PhoneProductId="2385953f-9019-423d-aa82-d1bbacfa258b" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
<Properties>
<DisplayName>ring-client-uwp</DisplayName>
<PublisherDisplayName>Savoir-Faire Linux</PublisherDisplayName>
<DisplayName>GNU Ring</DisplayName>
<PublisherDisplayName>Savoir-faire Linux</PublisherDisplayName>
<Logo>Assets\StoreLogo.png</Logo>
</Properties>
<Dependencies>
......@@ -15,7 +15,7 @@
</Resources>
<Applications>
<Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="RingClientUWP.App">
<uap:VisualElements DisplayName="ring-client-uwp-md" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" Description="ring-client-uwp" BackgroundColor="transparent">
<uap:VisualElements DisplayName="GNU Ring" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" Description="ring-client-uwp" BackgroundColor="transparent">
<uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png">
</uap:DefaultTile>
<uap:SplashScreen Image="Assets\SplashScreen.png" />
......@@ -32,13 +32,11 @@
<uap:Capability Name="blockedChatMessages" />
<uap:Capability Name="chat" />
<uap:Capability Name="contacts" />
<uap:Capability Name="enterpriseAuthentication" />
<uap:Capability Name="musicLibrary" />
<uap:Capability Name="objects3D" />
<uap:Capability Name="phoneCall" />
<uap:Capability Name="picturesLibrary" />
<uap:Capability Name="removableStorage" />
<uap:Capability Name="sharedUserCertificates" />
<uap:Capability Name="userAccountInformation" />
<uap:Capability Name="videosLibrary" />
<uap:Capability Name="voipCall" />
......@@ -48,4 +46,4 @@
<DeviceCapability Name="proximity" />
<DeviceCapability Name="webcam" />
</Capabilities>
</Package>
\ No newline at end of file
</Package>
......@@ -43,6 +43,8 @@ using namespace RingClientUWP;
using namespace RingClientUWP::Utils;
using namespace RingClientUWP::ViewModel;
using namespace Windows::System;
void
RingClientUWP::RingD::reloadAccountList()
{
......@@ -535,6 +537,18 @@ RingClientUWP::RingD::startDaemon()
};
registerCallHandlers(getAppPathHandler);
std::map<std::string, SharedCallback> getAppUserNameHandler =
{
DRing::exportable_callback<DRing::ConfigurationSignal::GetAppUserName>
([this](std::vector<std::string>* unames) {
unames->emplace_back(Utils::toString(
UserModel::instance->firstName +
"." +
UserModel::instance->lastName));
})
};
registerCallHandlers(getAppUserNameHandler);
std::map<std::string, SharedCallback> incomingVideoHandlers =
{
DRing::exportable_callback<DRing::VideoSignal::DeviceEvent>
......@@ -834,6 +848,13 @@ RingClientUWP::CallStatus RingClientUWP::RingD::translateCallStatus(String^ stat
return CallStatus::NONE;
}
String^
RingD::getUserName()
{
auto users = User::FindAllAsync();
return nullptr;
}
Vector<String^>^ RingClientUWP::RingD::translateKnownRingDevices(const std::map<std::string, std::string> devices)
{
auto devicesList = ref new Vector<String^>();
......
......@@ -89,6 +89,7 @@ internal:
void placeCall(Contact^ contact);
/*void cancelOutGoingCall2(String^ callId);*/ // marche pas
CallStatus translateCallStatus(String^ state);
String^ getUserName();
Vector<String^>^ translateKnownRingDevices(const std::map<std::string, std::string> devices);
void hangUpCall2(String^ callId);
......
#include "pch.h"
#include "UserModel.h"
using namespace RingClientUWP;
void
UserModel::getUserData()
{
create_task(User::FindAllAsync())
.then([=](IVectorView<User^>^ users) {
for (size_t index = 0; index < users->Size; index++) {
auto user = users->GetAt(index);
if (user->AuthenticationStatus == UserAuthenticationStatus::LocallyAuthenticated &&
user->Type == UserType::LocalUser) {
User^ currentUser = user;
create_task(currentUser->GetPropertyAsync(KnownUserProperties::FirstName))
.then([=](Object^ result) {
firstName = safe_cast<String^>(result);
});
create_task(currentUser->GetPropertyAsync(KnownUserProperties::LastName))
.then([&](Object^ result) {
lastName = safe_cast<String^>(result);
});
}
}
});
}
\ No newline at end of file
#pragma once
#include <pch.h>
using namespace Platform;
using namespace Windows::Foundation;
using namespace Windows::Foundation::Collections;
namespace RingClientUWP
{
public ref class UserModel sealed
{
internal:
/* singleton */
static property UserModel^ instance
{
UserModel^ get()
{
static UserModel^ instance_ = ref new UserModel();
return instance_;
}
}
property String^ firstName;
property String^ lastName;
void getUserData();
private:
UserModel() { };
};
}
\ No newline at end of file
......@@ -21,7 +21,10 @@
using namespace Platform;
using namespace Platform::Collections;
using namespace Windows::Foundation;
using namespace Windows::Foundation::Collections;
using namespace Windows::Storage;
using namespace Windows::System;
typedef Windows::UI::Xaml::Visibility VIS;
......
C:\Users\andreas.traczyk\Desktop\tests\ring-client-uwp_1.1.0.0\ring-client-uwp_1.1.0.0_x64.appxbundle
File added
File added
File added
File added
.build/
\ No newline at end of file
......@@ -38,6 +38,7 @@
#include "Contact.h"
#include "ContactsViewModel.h"
#include "Conversation.h"
#include "UserModel.h"
#include "MainPage.xaml.h"
#include "SmartPanelItem.h"
#include "SmartPanelItemsViewModel.h"
......
This diff is collapsed.
......@@ -97,13 +97,13 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<PackageCertificateKeyFile>ring-client-uwp_TemporaryKey.pfx</PackageCertificateKeyFile>
<PackageCertificateKeyFile>ring-client-uwp_StoreKey.pfx</PackageCertificateKeyFile>
<AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
<AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
<AppxBundle>Always</AppxBundle>
<AppxBundlePlatforms>x64</AppxBundlePlatforms>
<PackageCertificateThumbprint>13DE1E90818B523E210522CE40C78F2AD099C412</PackageCertificateThumbprint>
<AppxPackageDir>C:\Users\user\Desktop\</AppxPackageDir>
<PackageCertificateThumbprint>6E2CEF8A6A6A44314AB297CE41FC3BC8F2890973</PackageCertificateThumbprint>
<AppxPackageDir>C:\</AppxPackageDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<ClCompile>
......@@ -144,9 +144,10 @@
<AdditionalIncludeDirectories>contrib\qrencode-win32;..\ring-daemon\MSVC;..\ring-daemon\src\media;..\ring-daemon\src;..\ring-daemon\src\dring;..\ring-daemon\contrib\include;..\ring-daemon\contrib\include\pjlib;..\ring-daemon\contrib\pjproject\third_party\speex\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32_NATIVE;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<WholeProgramOptimization>false</WholeProgramOptimization>
<CompileAsWinRT>true</CompileAsWinRT>
</ClCompile>
<Link>
<AdditionalLibraryDirectories>$(SolutionDir)..\ring-daemon\contrib\boost\stage\lib;$(SolutionDir)..\ring-daemon\contrib\lib\x64;$(SolutionDir)..\ring-daemon\MSVC\x64\ReleaseLib\bin;C:\msys64\home\user\ring-project\ring-project\ring-client-uwp\x64\Release-Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)..\ring-daemon\contrib\boost\stage\lib;$(SolutionDir)..\ring-daemon\contrib\bin\x64;$(SolutionDir)..\ring-daemon\contrib\lib\x64;$(SolutionDir)..\ring-daemon\MSVC\x64\ReleaseLib\bin;$(SolutionDir)x64\Release-Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
......@@ -155,13 +156,14 @@
<ForceFileOutput>MultiplyDefinedSymbolOnly</ForceFileOutput>
</Link>
<Link>
<AdditionalDependencies>winsqlite3.lib;shell32.lib;strmiids.lib;dring.lib;WindowsApp.lib;qrcodelib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>shell32.lib;strmiids.lib;dring.lib;WindowsApp.lib;qrcodelib.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<Link>
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
</Link>
<Link>
<AdditionalOptions>/nodefaultlib:libcmt.lib /ignore:4006,4049,4099 %(AdditionalOptions)</AdditionalOptions>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
......@@ -198,6 +200,7 @@
</ClInclude>
<ClInclude Include="SmartPanelItem.h" />
<ClInclude Include="SmartPanelItemsViewModel.h" />
<ClInclude Include="UserModel.h" />
<ClInclude Include="UserPreferences.h" />
<ClInclude Include="Utils.h" />
<ClInclude Include="Video.h" />
......@@ -255,12 +258,7 @@
<None Include="..\FFmpegInterop\ffmpeg\Build\Windows10\x64\bin\swscale-4.dll">
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
</None>
<None Include="..\ring-daemon\contrib\redist\msvcr100.dll">
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
</None>
<None Include="..\ring-daemon\contrib\redist\pthreadVC2.dll">
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
</None>
<None Include="ring-client-uwp_StoreKey.pfx" />
<None Include="ring-client-uwp_TemporaryKey.pfx" />
</ItemGroup>
<ItemGroup>
......@@ -325,6 +323,7 @@
</ClCompile>
<ClCompile Include="SmartPanelItem.cpp" />
<ClCompile Include="SmartPanelItemsViewModel.cpp" />
<ClCompile Include="UserModel.cpp" />
<ClCompile Include="UserPreferences.cpp" />
<ClCompile Include="Video.cpp" />
<ClCompile Include="VideoCaptureManager.cpp" />
......@@ -344,6 +343,9 @@
<PRIResource Include="localization\Fr-fr\Resources.resw" />
<PRIResource Include="localization\US-en\Resources.resw" />
</ItemGroup>
<ItemGroup>
<None Include="Package.StoreAssociation.xml" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment