Permalink
Browse files

Minor fixes

  • Loading branch information...
1 parent c1a2eb1 commit 32a42486046ed9d0ba5cac891b17f631c7bf01fc @Redth committed Aug 9, 2012
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.544
+// Runtime Version:4.0.30319.17626
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.544
+// Runtime Version:4.0.30319.17626
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -47,14 +47,14 @@ public override bool FinishedLaunching (UIApplication app, NSDictionary options)
public override void RegisteredForRemoteNotifications (UIApplication application, NSData deviceToken)
{
- var deviceToken = NSUserDefaults.StandardUserDefaults.StringForKey("PushDeviceToken");
+ var oldDeviceToken = NSUserDefaults.StandardUserDefaults.StringForKey("PushDeviceToken");
//There's probably a better way to do this
var strFormat = new NSString("%@");
var dt = new NSString(MonoTouch.ObjCRuntime.Messaging.IntPtr_objc_msgSend_IntPtr_IntPtr(new MonoTouch.ObjCRuntime.Class("NSString").Handle, new MonoTouch.ObjCRuntime.Selector("stringWithFormat:").Handle, strFormat.Handle, deviceToken.Handle));
var newDeviceToken = dt.ToString().Replace("<", "").Replace(">", "").Replace(" ", "");
- if (string.IsNullOrEmpty(deviceToken) || !deviceToken.Equals(newDeviceToken))
+ if (string.IsNullOrEmpty(oldDeviceToken) || !deviceToken.Equals(newDeviceToken))
{
//TODO: Put your own logic here to notify your server that the device token has changed/been created!
}
@@ -4,7 +4,7 @@
<VisualStudio>
<FlavorProperties GUID="{C089C8C0-30E0-4E22-80C0-CE093F111A43}">
<SilverlightMobileCSProjectFlavor>
- <FullDeploy>True</FullDeploy>
+ <FullDeploy>False</FullDeploy>
</SilverlightMobileCSProjectFlavor>
</FlavorProperties>
</VisualStudio>
@@ -10,9 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>PushSharp.Android</RootNamespace>
<AssemblyName>PushSharp.Android</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
- <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -10,9 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>PushSharp.Apple</RootNamespace>
<AssemblyName>PushSharp.Apple</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
- <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -10,9 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>PushSharp.Blackberry</RootNamespace>
<AssemblyName>PushSharp.Blackberry</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
- <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -32,6 +32,7 @@ public abstract class GCMBaseIntentService : IntentService
string TOKEN = "";
const string EXTRA_TOKEN = "token";
+ protected GCMBaseIntentService() : base() {}
public GCMBaseIntentService(string senderId) : base("GCMIntentService-" + senderId)
{
@@ -10,7 +10,6 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>PushSharp.Common</RootNamespace>
<AssemblyName>PushSharp.Common</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -10,13 +10,9 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>PushSharp.Sample</RootNamespace>
<AssemblyName>PushSharp.Sample</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
- <TargetFrameworkProfile>
- </TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
- <PlatformTarget>x86</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
@@ -49,6 +45,7 @@
</Compile>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="Test.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\PushSharp.Android\PushSharp.Google.csproj">
@@ -10,9 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>PushSharp.WindowsPhone</RootNamespace>
<AssemblyName>PushSharp.WindowsPhone</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
- <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
View
@@ -5,15 +5,15 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PushSharp", "PushSharp\Push
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PushSharp.Common", "PushSharp.Common\PushSharp.Common.csproj", "{836F225F-6CD9-48DE-910C-70F8A7CF54AA}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PushSharp.Google", "PushSharp.Android\PushSharp.Google.csproj", "{71E27C37-FBBF-481B-934B-1F7DBDE3C5D6}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Platforms", "Platforms", "{C09BBA3E-9CF3-4479-A4C3-3006820E2046}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PushSharp.WindowsPhone", "PushSharp.WindowsPhone\PushSharp.WindowsPhone.csproj", "{9947F510-BA9A-4045-A648-BAB687D8F513}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PushSharp.Apple", "PushSharp.Apple\PushSharp.Apple.csproj", "{83C67156-893D-4AFF-9169-DB34771989CB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PushSharp.Blackberry", "PushSharp.Blackberry\PushSharp.Blackberry.csproj", "{5250980B-BD11-4201-B083-AEDB8C62C471}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Platforms", "Platforms", "{C09BBA3E-9CF3-4479-A4C3-3006820E2046}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PushSharp.Google", "PushSharp.Android\PushSharp.Google.csproj", "{71E27C37-FBBF-481B-934B-1F7DBDE3C5D6}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{04A9AE38-795E-4CB5-A9AD-C1FA83DC342C}"
EndProject
@@ -39,16 +39,26 @@ Global
{09414728-3728-4105-A149-EC2E315355F9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{09414728-3728-4105-A149-EC2E315355F9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{09414728-3728-4105-A149-EC2E315355F9}.Release|x86.ActiveCfg = Release|Any CPU
- {836F225F-6CD9-48DE-910C-70F8A7CF54AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {836F225F-6CD9-48DE-910C-70F8A7CF54AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {836F225F-6CD9-48DE-910C-70F8A7CF54AA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {836F225F-6CD9-48DE-910C-70F8A7CF54AA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {836F225F-6CD9-48DE-910C-70F8A7CF54AA}.Debug|x86.ActiveCfg = Debug|Any CPU
- {836F225F-6CD9-48DE-910C-70F8A7CF54AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {836F225F-6CD9-48DE-910C-70F8A7CF54AA}.Release|Any CPU.Build.0 = Release|Any CPU
- {836F225F-6CD9-48DE-910C-70F8A7CF54AA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {836F225F-6CD9-48DE-910C-70F8A7CF54AA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {836F225F-6CD9-48DE-910C-70F8A7CF54AA}.Release|x86.ActiveCfg = Release|Any CPU
+ {1B9A3A8B-3690-4435-BF9C-B557BF2713DB}.Debug|Any CPU.ActiveCfg = Debug|x86
+ {1B9A3A8B-3690-4435-BF9C-B557BF2713DB}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+ {1B9A3A8B-3690-4435-BF9C-B557BF2713DB}.Debug|Mixed Platforms.Build.0 = Debug|x86
+ {1B9A3A8B-3690-4435-BF9C-B557BF2713DB}.Debug|x86.ActiveCfg = Debug|x86
+ {1B9A3A8B-3690-4435-BF9C-B557BF2713DB}.Debug|x86.Build.0 = Debug|x86
+ {1B9A3A8B-3690-4435-BF9C-B557BF2713DB}.Release|Any CPU.ActiveCfg = Release|x86
+ {1B9A3A8B-3690-4435-BF9C-B557BF2713DB}.Release|Mixed Platforms.ActiveCfg = Release|x86
+ {1B9A3A8B-3690-4435-BF9C-B557BF2713DB}.Release|Mixed Platforms.Build.0 = Release|x86
+ {1B9A3A8B-3690-4435-BF9C-B557BF2713DB}.Release|x86.ActiveCfg = Release|x86
+ {1B9A3A8B-3690-4435-BF9C-B557BF2713DB}.Release|x86.Build.0 = Release|x86
+ {5250980B-BD11-4201-B083-AEDB8C62C471}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {5250980B-BD11-4201-B083-AEDB8C62C471}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {5250980B-BD11-4201-B083-AEDB8C62C471}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {5250980B-BD11-4201-B083-AEDB8C62C471}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {5250980B-BD11-4201-B083-AEDB8C62C471}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {5250980B-BD11-4201-B083-AEDB8C62C471}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {5250980B-BD11-4201-B083-AEDB8C62C471}.Release|Any CPU.Build.0 = Release|Any CPU
+ {5250980B-BD11-4201-B083-AEDB8C62C471}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {5250980B-BD11-4201-B083-AEDB8C62C471}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {5250980B-BD11-4201-B083-AEDB8C62C471}.Release|x86.ActiveCfg = Release|Any CPU
{71E27C37-FBBF-481B-934B-1F7DBDE3C5D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{71E27C37-FBBF-481B-934B-1F7DBDE3C5D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{71E27C37-FBBF-481B-934B-1F7DBDE3C5D6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -59,16 +69,16 @@ Global
{71E27C37-FBBF-481B-934B-1F7DBDE3C5D6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{71E27C37-FBBF-481B-934B-1F7DBDE3C5D6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{71E27C37-FBBF-481B-934B-1F7DBDE3C5D6}.Release|x86.ActiveCfg = Release|Any CPU
- {9947F510-BA9A-4045-A648-BAB687D8F513}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {9947F510-BA9A-4045-A648-BAB687D8F513}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {9947F510-BA9A-4045-A648-BAB687D8F513}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {9947F510-BA9A-4045-A648-BAB687D8F513}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {9947F510-BA9A-4045-A648-BAB687D8F513}.Debug|x86.ActiveCfg = Debug|Any CPU
- {9947F510-BA9A-4045-A648-BAB687D8F513}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {9947F510-BA9A-4045-A648-BAB687D8F513}.Release|Any CPU.Build.0 = Release|Any CPU
- {9947F510-BA9A-4045-A648-BAB687D8F513}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {9947F510-BA9A-4045-A648-BAB687D8F513}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {9947F510-BA9A-4045-A648-BAB687D8F513}.Release|x86.ActiveCfg = Release|Any CPU
+ {836F225F-6CD9-48DE-910C-70F8A7CF54AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {836F225F-6CD9-48DE-910C-70F8A7CF54AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {836F225F-6CD9-48DE-910C-70F8A7CF54AA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {836F225F-6CD9-48DE-910C-70F8A7CF54AA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {836F225F-6CD9-48DE-910C-70F8A7CF54AA}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {836F225F-6CD9-48DE-910C-70F8A7CF54AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {836F225F-6CD9-48DE-910C-70F8A7CF54AA}.Release|Any CPU.Build.0 = Release|Any CPU
+ {836F225F-6CD9-48DE-910C-70F8A7CF54AA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {836F225F-6CD9-48DE-910C-70F8A7CF54AA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {836F225F-6CD9-48DE-910C-70F8A7CF54AA}.Release|x86.ActiveCfg = Release|Any CPU
{83C67156-893D-4AFF-9169-DB34771989CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{83C67156-893D-4AFF-9169-DB34771989CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{83C67156-893D-4AFF-9169-DB34771989CB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -79,29 +89,16 @@ Global
{83C67156-893D-4AFF-9169-DB34771989CB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{83C67156-893D-4AFF-9169-DB34771989CB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{83C67156-893D-4AFF-9169-DB34771989CB}.Release|x86.ActiveCfg = Release|Any CPU
- {5250980B-BD11-4201-B083-AEDB8C62C471}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {5250980B-BD11-4201-B083-AEDB8C62C471}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {5250980B-BD11-4201-B083-AEDB8C62C471}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {5250980B-BD11-4201-B083-AEDB8C62C471}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {5250980B-BD11-4201-B083-AEDB8C62C471}.Debug|x86.ActiveCfg = Debug|Any CPU
- {5250980B-BD11-4201-B083-AEDB8C62C471}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {5250980B-BD11-4201-B083-AEDB8C62C471}.Release|Any CPU.Build.0 = Release|Any CPU
- {5250980B-BD11-4201-B083-AEDB8C62C471}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {5250980B-BD11-4201-B083-AEDB8C62C471}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {5250980B-BD11-4201-B083-AEDB8C62C471}.Release|x86.ActiveCfg = Release|Any CPU
- {1B9A3A8B-3690-4435-BF9C-B557BF2713DB}.Debug|Any CPU.ActiveCfg = Debug|x86
- {1B9A3A8B-3690-4435-BF9C-B557BF2713DB}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
- {1B9A3A8B-3690-4435-BF9C-B557BF2713DB}.Debug|Mixed Platforms.Build.0 = Debug|x86
- {1B9A3A8B-3690-4435-BF9C-B557BF2713DB}.Debug|x86.ActiveCfg = Debug|x86
- {1B9A3A8B-3690-4435-BF9C-B557BF2713DB}.Debug|x86.Build.0 = Debug|x86
- {1B9A3A8B-3690-4435-BF9C-B557BF2713DB}.Release|Any CPU.ActiveCfg = Release|x86
- {1B9A3A8B-3690-4435-BF9C-B557BF2713DB}.Release|Mixed Platforms.ActiveCfg = Release|x86
- {1B9A3A8B-3690-4435-BF9C-B557BF2713DB}.Release|Mixed Platforms.Build.0 = Release|x86
- {1B9A3A8B-3690-4435-BF9C-B557BF2713DB}.Release|x86.ActiveCfg = Release|x86
- {1B9A3A8B-3690-4435-BF9C-B557BF2713DB}.Release|x86.Build.0 = Release|x86
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
+ {9947F510-BA9A-4045-A648-BAB687D8F513}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {9947F510-BA9A-4045-A648-BAB687D8F513}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {9947F510-BA9A-4045-A648-BAB687D8F513}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {9947F510-BA9A-4045-A648-BAB687D8F513}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {9947F510-BA9A-4045-A648-BAB687D8F513}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {9947F510-BA9A-4045-A648-BAB687D8F513}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {9947F510-BA9A-4045-A648-BAB687D8F513}.Release|Any CPU.Build.0 = Release|Any CPU
+ {9947F510-BA9A-4045-A648-BAB687D8F513}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {9947F510-BA9A-4045-A648-BAB687D8F513}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {9947F510-BA9A-4045-A648-BAB687D8F513}.Release|x86.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{9947F510-BA9A-4045-A648-BAB687D8F513} = {C09BBA3E-9CF3-4479-A4C3-3006820E2046}
@@ -110,4 +107,10 @@ Global
{71E27C37-FBBF-481B-934B-1F7DBDE3C5D6} = {C09BBA3E-9CF3-4479-A4C3-3006820E2046}
{1B9A3A8B-3690-4435-BF9C-B557BF2713DB} = {04A9AE38-795E-4CB5-A9AD-C1FA83DC342C}
EndGlobalSection
+ GlobalSection(MonoDevelopProperties) = preSolution
+ StartupItem = PushSharp.Sample\PushSharp.Sample.csproj
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
EndGlobal
@@ -67,7 +67,7 @@ public void StopGoogleCloudMessagingPushService(bool waitForQueueToFinish = true
gcmService.Stop(waitForQueueToFinish);
}
- public void StartWindowsPhonePushService(WindowsPhone.WindowsPhonePushChannelSettings channelSettings, PushServiceSettings serviceSettings = null)
+ public void StartWindowsPhonePushService(WindowsPhone.WindowsPhonePushChannelSettings channelSettings = null, PushServiceSettings serviceSettings = null)
{
wpService = new WindowsPhone.WindowsPhonePushService(channelSettings, serviceSettings);
wpService.Events.RegisterProxyHandler(this.Events);
@@ -10,9 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>PushSharp</RootNamespace>
<AssemblyName>PushSharp</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
- <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>

0 comments on commit 32a4248

Please sign in to comment.