Skip to content

Commit 5f9eafe

Browse files
author
Chris
committed
reverted implicit using / added deviceIdentifier
1 parent fa8f975 commit 5f9eafe

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+157
-67
lines changed

‎Notifo.sln

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sample", "sample", "{4270D4
1111
EndProject
1212
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{514F5B61-451C-41EA-801F-9AE1B052A971}"
1313
EndProject
14-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Notifo.SDK.UnitTests", "tests\Notifo.SDK.UnitTests\Notifo.SDK.UnitTests.csproj", "{1F863C31-C0C7-42F7-9609-B122866B6356}"
15-
EndProject
1614
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Notifo.SDK.Core", "sdk\Notifo.SDK\Notifo.SDK.Core.csproj", "{4F928A67-C5E7-44E2-BE71-6ED155AFED9C}"
1715
EndProject
1816
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sdk", "sdk", "{4D2C377A-D9F6-4EF3-A342-1B5A84F391DB}"
@@ -32,6 +30,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample.iOS.Shared", "sample
3230
EndProject
3331
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Notifo.SDK.Worker", "sdk\Notifo.SDK.Worker\Notifo.SDK.Worker.csproj", "{938B1A56-1C33-40CB-8569-8625997945C8}"
3432
EndProject
33+
Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "Notifo.SDK.UnitTests", "tests\Notifo.SDK.UnitTests\Notifo.SDK.UnitTests.csproj", "{A5CE866E-E762-4A36-BC4D-4CB6ACB53F2B}"
34+
EndProject
3535
Global
3636
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3737
Debug|Any CPU = Debug|Any CPU
@@ -78,18 +78,6 @@ Global
7878
{DD43F8B0-1925-477A-9FF5-BE3E01350E30}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
7979
{DD43F8B0-1925-477A-9FF5-BE3E01350E30}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
8080
{DD43F8B0-1925-477A-9FF5-BE3E01350E30}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU
81-
{1F863C31-C0C7-42F7-9609-B122866B6356}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
82-
{1F863C31-C0C7-42F7-9609-B122866B6356}.Debug|Any CPU.Build.0 = Debug|Any CPU
83-
{1F863C31-C0C7-42F7-9609-B122866B6356}.Debug|iPhone.ActiveCfg = Debug|Any CPU
84-
{1F863C31-C0C7-42F7-9609-B122866B6356}.Debug|iPhone.Build.0 = Debug|Any CPU
85-
{1F863C31-C0C7-42F7-9609-B122866B6356}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
86-
{1F863C31-C0C7-42F7-9609-B122866B6356}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
87-
{1F863C31-C0C7-42F7-9609-B122866B6356}.Release|Any CPU.ActiveCfg = Release|Any CPU
88-
{1F863C31-C0C7-42F7-9609-B122866B6356}.Release|Any CPU.Build.0 = Release|Any CPU
89-
{1F863C31-C0C7-42F7-9609-B122866B6356}.Release|iPhone.ActiveCfg = Release|Any CPU
90-
{1F863C31-C0C7-42F7-9609-B122866B6356}.Release|iPhone.Build.0 = Release|Any CPU
91-
{1F863C31-C0C7-42F7-9609-B122866B6356}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
92-
{1F863C31-C0C7-42F7-9609-B122866B6356}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
9381
{4F928A67-C5E7-44E2-BE71-6ED155AFED9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
9482
{4F928A67-C5E7-44E2-BE71-6ED155AFED9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
9583
{4F928A67-C5E7-44E2-BE71-6ED155AFED9C}.Debug|iPhone.ActiveCfg = Debug|Any CPU
@@ -118,7 +106,6 @@ Global
118106
{C4EF6311-9993-40BD-BEF8-3C495F571302}.Debug|Any CPU.Build.0 = Debug|Any CPU
119107
{C4EF6311-9993-40BD-BEF8-3C495F571302}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
120108
{C4EF6311-9993-40BD-BEF8-3C495F571302}.Debug|iPhone.ActiveCfg = Debug|Any CPU
121-
{C4EF6311-9993-40BD-BEF8-3C495F571302}.Debug|iPhone.Build.0 = Debug|Any CPU
122109
{C4EF6311-9993-40BD-BEF8-3C495F571302}.Debug|iPhone.Deploy.0 = Debug|Any CPU
123110
{C4EF6311-9993-40BD-BEF8-3C495F571302}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
124111
{C4EF6311-9993-40BD-BEF8-3C495F571302}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
@@ -127,7 +114,6 @@ Global
127114
{C4EF6311-9993-40BD-BEF8-3C495F571302}.Release|Any CPU.Build.0 = Release|Any CPU
128115
{C4EF6311-9993-40BD-BEF8-3C495F571302}.Release|Any CPU.Deploy.0 = Release|Any CPU
129116
{C4EF6311-9993-40BD-BEF8-3C495F571302}.Release|iPhone.ActiveCfg = Release|Any CPU
130-
{C4EF6311-9993-40BD-BEF8-3C495F571302}.Release|iPhone.Build.0 = Release|Any CPU
131117
{C4EF6311-9993-40BD-BEF8-3C495F571302}.Release|iPhone.Deploy.0 = Release|Any CPU
132118
{C4EF6311-9993-40BD-BEF8-3C495F571302}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
133119
{C4EF6311-9993-40BD-BEF8-3C495F571302}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
@@ -168,20 +154,32 @@ Global
168154
{938B1A56-1C33-40CB-8569-8625997945C8}.Release|iPhone.Build.0 = Release|Any CPU
169155
{938B1A56-1C33-40CB-8569-8625997945C8}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
170156
{938B1A56-1C33-40CB-8569-8625997945C8}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
157+
{A5CE866E-E762-4A36-BC4D-4CB6ACB53F2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
158+
{A5CE866E-E762-4A36-BC4D-4CB6ACB53F2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
159+
{A5CE866E-E762-4A36-BC4D-4CB6ACB53F2B}.Debug|iPhone.ActiveCfg = Debug|Any CPU
160+
{A5CE866E-E762-4A36-BC4D-4CB6ACB53F2B}.Debug|iPhone.Build.0 = Debug|Any CPU
161+
{A5CE866E-E762-4A36-BC4D-4CB6ACB53F2B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
162+
{A5CE866E-E762-4A36-BC4D-4CB6ACB53F2B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
163+
{A5CE866E-E762-4A36-BC4D-4CB6ACB53F2B}.Release|Any CPU.ActiveCfg = Release|Any CPU
164+
{A5CE866E-E762-4A36-BC4D-4CB6ACB53F2B}.Release|Any CPU.Build.0 = Release|Any CPU
165+
{A5CE866E-E762-4A36-BC4D-4CB6ACB53F2B}.Release|iPhone.ActiveCfg = Release|Any CPU
166+
{A5CE866E-E762-4A36-BC4D-4CB6ACB53F2B}.Release|iPhone.Build.0 = Release|Any CPU
167+
{A5CE866E-E762-4A36-BC4D-4CB6ACB53F2B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
168+
{A5CE866E-E762-4A36-BC4D-4CB6ACB53F2B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
171169
EndGlobalSection
172170
GlobalSection(SolutionProperties) = preSolution
173171
HideSolutionNode = FALSE
174172
EndGlobalSection
175173
GlobalSection(NestedProjects) = preSolution
176174
{2536F86F-CA74-469A-AFAC-A8BE7B71CED3} = {4270D4B1-5081-4E4F-8BDF-61ED888E936E}
177175
{DD43F8B0-1925-477A-9FF5-BE3E01350E30} = {4270D4B1-5081-4E4F-8BDF-61ED888E936E}
178-
{1F863C31-C0C7-42F7-9609-B122866B6356} = {514F5B61-451C-41EA-801F-9AE1B052A971}
179176
{4F928A67-C5E7-44E2-BE71-6ED155AFED9C} = {4D2C377A-D9F6-4EF3-A342-1B5A84F391DB}
180177
{258DEE06-BB0D-404B-B981-43B091744BD3} = {4D2C377A-D9F6-4EF3-A342-1B5A84F391DB}
181178
{C4EF6311-9993-40BD-BEF8-3C495F571302} = {4270D4B1-5081-4E4F-8BDF-61ED888E936E}
182179
{1B35BAEA-5666-408C-BED4-DB6114F3070E} = {4270D4B1-5081-4E4F-8BDF-61ED888E936E}
183180
{7D4A0E79-8075-42A6-ACC5-E5B666F75313} = {4270D4B1-5081-4E4F-8BDF-61ED888E936E}
184181
{938B1A56-1C33-40CB-8569-8625997945C8} = {4D2C377A-D9F6-4EF3-A342-1B5A84F391DB}
182+
{A5CE866E-E762-4A36-BC4D-4CB6ACB53F2B} = {514F5B61-451C-41EA-801F-9AE1B052A971}
185183
EndGlobalSection
186184
GlobalSection(ExtensibilityGlobals) = postSolution
187185
SolutionGuid = {87BCC08F-EAE5-4433-97FE-0DE5A56DBF78}

‎sample/Sample.Android/Resources/Resource.designer.cs

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎sample/Sample.Android/Sample.Android.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
1717
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
1818
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
19-
<AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
2019
<TargetFrameworkVersion>v12.0</TargetFrameworkVersion>
2120
<AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
2221
<AndroidUseAapt2>true</AndroidUseAapt2>
@@ -134,7 +133,7 @@
134133
<Name>Notifo.SDK.Core</Name>
135134
</ProjectReference>
136135
<ProjectReference Include="..\Sample\Sample.csproj">
137-
<Project>{D59C868F-F97E-4931-B667-094C1FBC822E}</Project>
136+
<Project>{DD43F8B0-1925-477A-9FF5-BE3E01350E30}</Project>
138137
<Name>Sample</Name>
139138
</ProjectReference>
140139
</ItemGroup>

‎sample/Sample.iOS/Entitlements.plist

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
<?xml version="1.0" encoding="UTF-8" ?>
1+
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
5+
<key>com.apple.security.application-groups</key>
6+
<array>
7+
<string>group.io.notifo.xamarin.sample</string>
8+
</array>
59
</dict>
610
</plist>
7-

‎sample/Sample.iOS/Sample.iOS.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
<CodesignKey>iPhone Developer</CodesignKey>
6666
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
6767
<MtouchDebug>true</MtouchDebug>
68+
<CodesignProvision>VS: io.notifo.xamarin.sample Development</CodesignProvision>
6869
</PropertyGroup>
6970
<PropertyGroup>
7071
<CodeAnalysisRuleSet>..\..\Notifo.ruleset</CodeAnalysisRuleSet>

‎sample/Sample/NotifoStartup.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
// All rights reserved. Licensed under the MIT license.
66
// ==========================================================================
77

8+
using System;
89
using Notifo.SDK;
910
using Notifo.SDK.FirebasePlugin;
1011
using Xamarin.Forms;
@@ -16,15 +17,21 @@ public static class NotifoStartup
1617
public static INotifoMobilePush UseDefaults(this INotifoMobilePush notifo)
1718
{
1819
notifo
19-
.SetSharedName("notifo.Sample")
20+
.SetSharedName("group.io.notifo.xamarin.sample")
2021
.SetBaseUrl(Constants.ApiUrl)
2122
.UseFirebasePluginEventsProvider();
2223

2324
notifo.OnNotificationOpened += Current_OnNotificationOpened;
25+
notifo.OnLog += JustLog;
2426

2527
return notifo;
2628
}
2729

30+
private static void JustLog(object source, NotificationLogEventArgs e)
31+
{
32+
Console.WriteLine($"DEBUG: Log {e.Message} Message Args: {e.MessageArgs}", e.Message, e.MessageArgs);
33+
}
34+
2835
private static void Current_OnNotificationOpened(object source, NotificationEventArgs e)
2936
{
3037
Device.BeginInvokeOnMainThread(() =>

‎sample/SampleNotificationServiceExtension/Entitlements.plist

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
<?xml version="1.0" encoding="UTF-8" ?>
1+
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
5+
<key>com.apple.security.application-groups</key>
6+
<array>
7+
<string>group.io.notifo.xamarin.sample</string>
8+
</array>
59
</dict>
610
</plist>

‎sample/SampleNotificationServiceExtension/NotificationService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public override async void DidReceiveNotificationRequest(UNNotificationRequest r
3434
BestAttemptContent = (UNMutableNotificationContent)request.Content.MutableCopy();
3535

3636
NotifoIO.Current
37-
.SetSharedName("notifo.Sample")
37+
.SetSharedName("group.io.notifo.xamarin.sample")
3838
.SetNotificationHandler(new NotificationHandler());
3939

4040
await NotifoIO.Current.DidReceiveNotificationRequestAsync(request, BestAttemptContent);

‎sample/SampleNotificationServiceExtension/SampleNotificationServiceExtension.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
<MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
4848
<MtouchVerbosity>
4949
</MtouchVerbosity>
50+
<CodesignProvision>VS: io.notifo.xamarin.sample.SampleNotificationServiceExtension Development</CodesignProvision>
5051
</PropertyGroup>
5152
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
5253
<DebugType>pdbonly</DebugType>

‎sdk/Notifo.SDK.Worker/Notifo.SDK.Worker.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<AssemblyName>Notifo.Xamarin.Worker</AssemblyName>
66
<GenerateDocumentationFile>true</GenerateDocumentationFile>
77
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
8-
<ImplicitUsings>enable</ImplicitUsings>
98
<LangVersion>latest</LangVersion>
109
<RootNamespace>Notifo.SDK</RootNamespace>
1110
<TargetFrameworks>monoandroid12.0;</TargetFrameworks>
@@ -44,8 +43,7 @@
4443
</ItemGroup>
4544

4645
<ItemGroup Condition="'$(TargetFramework)' == 'monoandroid12.0'">
47-
<PackageReference Include="Xamarin.Android.Arch.Work.Runtime">
48-
<Version>1.0.0.3</Version>
46+
<PackageReference Include="Xamarin.Android.Arch.Work.Runtime" Version="1.0.0.3">
4947
</PackageReference>
5048
</ItemGroup>
5149
</Project>

0 commit comments

Comments
 (0)