Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Sensus.Android.Shared/AndroidSensusServiceHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,8 @@ public void SetService(AndroidSensusService service)
_wakeLock = (_service.GetSystemService(global::Android.Content.Context.PowerService) as PowerManager).NewWakeLock(WakeLockFlags.Partial, "SENSUS");
_wakeLockAcquisitionCount = 0;
_deviceId = Settings.Secure.GetString(_service.ContentResolver, Settings.Secure.AndroidId);

Microsoft.AppCenter.AppCenter.SetUserId(_deviceId);
}
}

Expand Down
38 changes: 19 additions & 19 deletions Sensus.Android/Sensus.Android.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,24 @@ Store. It is possible to run and debug this project on physical and virtual Andr
<JavaMaximumHeapSize>2G</JavaMaximumHeapSize>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.AppCenter, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AppCenter.1.13.2\lib\MonoAndroid403\Microsoft.AppCenter.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter.Analytics, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AppCenter.Analytics.1.13.2\lib\MonoAndroid403\Microsoft.AppCenter.Analytics.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter.Analytics.Android.Bindings, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AppCenter.Analytics.1.13.2\lib\MonoAndroid403\Microsoft.AppCenter.Analytics.Android.Bindings.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter.Android.Bindings, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AppCenter.1.13.2\lib\MonoAndroid403\Microsoft.AppCenter.Android.Bindings.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter.Crashes, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AppCenter.Crashes.1.13.2\lib\MonoAndroid403\Microsoft.AppCenter.Crashes.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter.Crashes.Android.Bindings, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AppCenter.Crashes.1.13.2\lib\MonoAndroid403\Microsoft.AppCenter.Crashes.Android.Bindings.dll</HintPath>
</Reference>
<Reference Include="Mono.Android" />
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down Expand Up @@ -301,24 +319,6 @@ Store. It is possible to run and debug this project on physical and virtual Andr
<Reference Include="Xamarin.Azure.NotificationHubs.Android">
<HintPath>..\packages\Xamarin.Azure.NotificationHubs.Android.0.5.0\lib\MonoAndroid403\Xamarin.Azure.NotificationHubs.Android.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter.Android.Bindings">
<HintPath>..\packages\Microsoft.AppCenter.1.11.0\lib\MonoAndroid403\Microsoft.AppCenter.Android.Bindings.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter">
<HintPath>..\packages\Microsoft.AppCenter.1.11.0\lib\MonoAndroid403\Microsoft.AppCenter.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter.Analytics.Android.Bindings">
<HintPath>..\packages\Microsoft.AppCenter.Analytics.1.11.0\lib\MonoAndroid403\Microsoft.AppCenter.Analytics.Android.Bindings.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter.Analytics">
<HintPath>..\packages\Microsoft.AppCenter.Analytics.1.11.0\lib\MonoAndroid403\Microsoft.AppCenter.Analytics.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter.Crashes.Android.Bindings">
<HintPath>..\packages\Microsoft.AppCenter.Crashes.1.11.0\lib\MonoAndroid403\Microsoft.AppCenter.Crashes.Android.Bindings.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter.Crashes">
<HintPath>..\packages\Microsoft.AppCenter.Crashes.1.11.0\lib\MonoAndroid403\Microsoft.AppCenter.Crashes.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
</Reference>
Expand Down Expand Up @@ -387,7 +387,7 @@ Store. It is possible to run and debug this project on physical and virtual Andr
<ItemGroup>
<AndroidAsset Include="Assets\README.txt" />
</ItemGroup>
<ItemGroup>
<ItemGroup>
<Folder Include="Resources\values-v21\" />
<Folder Include="Resources\layout\" />
</ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions Sensus.Android/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
<package id="Estimote.Android.Proximity" version="1.0.3" targetFramework="monoandroid90" />
<package id="ExifLib.PCL" version="1.0.2-pre01" targetFramework="MonoAndroid60" />
<package id="FastAndroidCamera" version="2.0.0" targetFramework="monoandroid71" />
<package id="Microsoft.AppCenter" version="1.11.0" targetFramework="monoandroid90" />
<package id="Microsoft.AppCenter.Analytics" version="1.11.0" targetFramework="monoandroid90" />
<package id="Microsoft.AppCenter.Crashes" version="1.11.0" targetFramework="monoandroid90" />
<package id="Microsoft.AppCenter" version="1.13.2" targetFramework="xamarinios10" />
<package id="Microsoft.AppCenter.Analytics" version="1.13.2" targetFramework="xamarinios10" />
<package id="Microsoft.AppCenter.Crashes" version="1.13.2" targetFramework="xamarinios10" />
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="MonoAndroid50" />
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="MonoAndroid44" />
<package id="Microsoft.CSharp" version="4.5.0" targetFramework="monoandroid81" />
Expand Down
40 changes: 20 additions & 20 deletions Sensus.iOS.Tests/Sensus.iOS.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\Xamarin.Forms.3.2.0.839982\build\netstandard2.0\Xamarin.Forms.props" Condition="Exists('..\packages\Xamarin.Forms.3.2.0.839982\build\netstandard2.0\Xamarin.Forms.props')" />
<Import Project="..\ExampleScriptProbeAgent.Shared\ExampleScriptProbeAgent.Shared.projitems" Label="Shared" Condition="Exists('..\ExampleScriptProbeAgent.Shared\ExampleScriptProbeAgent.Shared.projitems')" />
Expand Down Expand Up @@ -80,6 +80,24 @@
<CodesignKey>iPhone Developer</CodesignKey>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.AppCenter, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AppCenter.1.13.2\lib\Xamarin.iOS10\Microsoft.AppCenter.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter.Analytics, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AppCenter.Analytics.1.13.2\lib\Xamarin.iOS10\Microsoft.AppCenter.Analytics.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter.Analytics.iOS.Bindings, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AppCenter.Analytics.1.13.2\lib\Xamarin.iOS10\Microsoft.AppCenter.Analytics.iOS.Bindings.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter.Crashes, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AppCenter.Crashes.1.13.2\lib\Xamarin.iOS10\Microsoft.AppCenter.Crashes.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter.Crashes.iOS.Bindings, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AppCenter.Crashes.1.13.2\lib\Xamarin.iOS10\Microsoft.AppCenter.Crashes.iOS.Bindings.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter.iOS.Bindings, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AppCenter.1.13.2\lib\Xamarin.iOS10\Microsoft.AppCenter.iOS.Bindings.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
Expand Down Expand Up @@ -216,24 +234,6 @@
<Reference Include="TTGSnackbar">
<HintPath>..\packages\TTGSnackbar.1.3.5\lib\Xamarin.iOS10\TTGSnackbar.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter">
<HintPath>..\packages\Microsoft.AppCenter.1.11.0\lib\Xamarin.iOS10\Microsoft.AppCenter.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter.iOS.Bindings">
<HintPath>..\packages\Microsoft.AppCenter.1.11.0\lib\Xamarin.iOS10\Microsoft.AppCenter.iOS.Bindings.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter.Analytics">
<HintPath>..\packages\Microsoft.AppCenter.Analytics.1.11.0\lib\Xamarin.iOS10\Microsoft.AppCenter.Analytics.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter.Analytics.iOS.Bindings">
<HintPath>..\packages\Microsoft.AppCenter.Analytics.1.11.0\lib\Xamarin.iOS10\Microsoft.AppCenter.Analytics.iOS.Bindings.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter.Crashes">
<HintPath>..\packages\Microsoft.AppCenter.Crashes.1.11.0\lib\Xamarin.iOS10\Microsoft.AppCenter.Crashes.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter.Crashes.iOS.Bindings">
<HintPath>..\packages\Microsoft.AppCenter.Crashes.1.11.0\lib\Xamarin.iOS10\Microsoft.AppCenter.Crashes.iOS.Bindings.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
</Reference>
Expand Down Expand Up @@ -415,4 +415,4 @@
<Import Project="..\packages\xunit.runner.devices.2.4.48\build\xamarinios10\xunit.runner.devices.targets" Condition="Exists('..\packages\xunit.runner.devices.2.4.48\build\xamarinios10\xunit.runner.devices.targets')" />
<Import Project="..\packages\Xamarin.Forms.3.2.0.839982\build\netstandard2.0\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.3.2.0.839982\build\netstandard2.0\Xamarin.Forms.targets')" />
<Import Project="..\packages\Xamarin.Swift4.4.0.0.1\build\Xamarin.Swift4.targets" Condition="Exists('..\packages\Xamarin.Swift4.4.0.0.1\build\Xamarin.Swift4.targets')" />
</Project>
</Project>
6 changes: 3 additions & 3 deletions Sensus.iOS.Tests/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
<package id="BouncyCastle" version="1.8.3" targetFramework="xamarinios10" />
<package id="Estimote.iOS.Indoor" version="3.0.0" targetFramework="xamarinios10" />
<package id="Estimote.iOS.Proximity" version="1.2.0" targetFramework="xamarinios10" />
<package id="Microsoft.AppCenter" version="1.11.0" targetFramework="xamarinios10" />
<package id="Microsoft.AppCenter.Analytics" version="1.11.0" targetFramework="xamarinios10" />
<package id="Microsoft.AppCenter.Crashes" version="1.11.0" targetFramework="xamarinios10" />
<package id="Microsoft.AppCenter" version="1.13.2" targetFramework="xamarinios10" />
<package id="Microsoft.AppCenter.Analytics" version="1.13.2" targetFramework="xamarinios10" />
<package id="Microsoft.AppCenter.Crashes" version="1.13.2" targetFramework="xamarinios10" />
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="xamarinios10" />
<package id="PCLCrypto" version="2.0.147" targetFramework="xamarinios10" />
<package id="PCLStorage" version="1.0.2" targetFramework="xamarinios10" />
Expand Down
40 changes: 20 additions & 20 deletions Sensus.iOS/Sensus.iOS.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ Store. It is possible to run and debug this project on physical and virtual iOS
<CodesignProvision>Sensus App Store</CodesignProvision>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<NoWarn>1701</NoWarn>
<MtouchUseLlvm>true</MtouchUseLlvm>
<MtouchUseLlvm>true</MtouchUseLlvm>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Ad-Hoc|iPhone' ">
<Optimize>true</Optimize>
Expand All @@ -94,6 +94,24 @@ Store. It is possible to run and debug this project on physical and virtual iOS
<CodesignKey>iPhone Developer</CodesignKey>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.AppCenter, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AppCenter.1.13.2\lib\Xamarin.iOS10\Microsoft.AppCenter.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter.Analytics, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AppCenter.Analytics.1.13.2\lib\Xamarin.iOS10\Microsoft.AppCenter.Analytics.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter.Analytics.iOS.Bindings, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AppCenter.Analytics.1.13.2\lib\Xamarin.iOS10\Microsoft.AppCenter.Analytics.iOS.Bindings.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter.Crashes, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AppCenter.Crashes.1.13.2\lib\Xamarin.iOS10\Microsoft.AppCenter.Crashes.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter.Crashes.iOS.Bindings, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AppCenter.Crashes.1.13.2\lib\Xamarin.iOS10\Microsoft.AppCenter.Crashes.iOS.Bindings.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter.iOS.Bindings, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AppCenter.1.13.2\lib\Xamarin.iOS10\Microsoft.AppCenter.iOS.Bindings.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Band.iOS">
<HintPath>..\dependencies\msband\ios\Microsoft.Band.iOS.dll</HintPath>
</Reference>
Expand Down Expand Up @@ -236,24 +254,6 @@ Store. It is possible to run and debug this project on physical and virtual iOS
<Reference Include="Estimote.iOS.Proximity">
<HintPath>..\packages\Estimote.iOS.Proximity.1.2.0\lib\xamarinios10\Estimote.iOS.Proximity.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter">
<HintPath>..\packages\Microsoft.AppCenter.1.11.0\lib\Xamarin.iOS10\Microsoft.AppCenter.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter.iOS.Bindings">
<HintPath>..\packages\Microsoft.AppCenter.1.11.0\lib\Xamarin.iOS10\Microsoft.AppCenter.iOS.Bindings.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter.Analytics">
<HintPath>..\packages\Microsoft.AppCenter.Analytics.1.11.0\lib\Xamarin.iOS10\Microsoft.AppCenter.Analytics.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter.Analytics.iOS.Bindings">
<HintPath>..\packages\Microsoft.AppCenter.Analytics.1.11.0\lib\Xamarin.iOS10\Microsoft.AppCenter.Analytics.iOS.Bindings.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter.Crashes">
<HintPath>..\packages\Microsoft.AppCenter.Crashes.1.11.0\lib\Xamarin.iOS10\Microsoft.AppCenter.Crashes.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter.Crashes.iOS.Bindings">
<HintPath>..\packages\Microsoft.AppCenter.Crashes.1.11.0\lib\Xamarin.iOS10\Microsoft.AppCenter.Crashes.iOS.Bindings.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
</Reference>
Expand Down Expand Up @@ -379,7 +379,7 @@ Store. It is possible to run and debug this project on physical and virtual iOS
<ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Icon-Small-50x50%401x.png" />
<ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Icon-Small-50x50%402x.png" />
<ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Icon-App-1024x1024%401x.png" />
</ItemGroup>
</ItemGroup>
<ItemGroup>
<BundleResource Include="Resources\check.png" />
<BundleResource Include="Resources\hamburger.png" />
Expand Down
4 changes: 4 additions & 0 deletions Sensus.iOS/iOSSensusServiceHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,10 @@ public iOSSensusServiceHelper()
// time the app is killed and restarted. but the NRE condition above should be very rare.
_deviceId = Guid.NewGuid().ToString();
}
finally
{
Microsoft.AppCenter.AppCenter.SetUserId(_deviceId);
}

try
{
Expand Down
6 changes: 3 additions & 3 deletions Sensus.iOS/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
<package id="Estimote.iOS.Indoor" version="3.0.0" targetFramework="xamarinios10" />
<package id="Estimote.iOS.Proximity" version="1.2.0" targetFramework="xamarinios10" />
<package id="ExifLib.PCL" version="1.0.1" targetFramework="xamarinios10" />
<package id="Microsoft.AppCenter" version="1.11.0" targetFramework="xamarinios10" />
<package id="Microsoft.AppCenter.Analytics" version="1.11.0" targetFramework="xamarinios10" />
<package id="Microsoft.AppCenter.Crashes" version="1.11.0" targetFramework="xamarinios10" />
<package id="Microsoft.AppCenter" version="1.13.2" targetFramework="xamarinios10" />
<package id="Microsoft.AppCenter.Analytics" version="1.13.2" targetFramework="xamarinios10" />
<package id="Microsoft.AppCenter.Crashes" version="1.13.2" targetFramework="xamarinios10" />
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="xamarinios10" />
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="xamarinios10" />
<package id="Microsoft.CSharp" version="4.5.0" targetFramework="xamarinios10" />
Expand Down