Merge pull request #7 from hiddenswitch/develop

Develop
hiddenswitch · Sep 9, 2015 · b6c0d90 · b6c0d90
2 parents ec6199a + 81b3b80
commit b6c0d90
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 18 deletions.
diff --git a/LiveData.meta b/LiveData.meta
diff --git a/Services/Accounts/Accounts.cs b/Services/Accounts/Accounts.cs
@@ -211,14 +211,14 @@ static void HandleOnLogin (Error error, LoginUserResult response)
 		private static IEnumerator RegisterForPush ()
 		{
 			#if PUSH && UNITY_IOS
-			NotificationServices.RegisterForRemoteNotificationTypes (RemoteNotificationType.Alert | RemoteNotificationType.Badge | RemoteNotificationType.Sound);
-			var deviceToken = NotificationServices.deviceToken;
+			UnityEngine.iOS.NotificationServices.RegisterForNotifications (UnityEngine.iOS.NotificationType.Alert | UnityEngine.iOS.NotificationType.Badge | UnityEngine.iOS.NotificationType.Sound);
+			var deviceToken = UnityEngine.iOS.NotificationServices.deviceToken;
 
 			while (deviceToken == null) {
-				if (!string.IsNullOrEmpty (NotificationServices.registrationError)) {
+				if (!string.IsNullOrEmpty (UnityEngine.iOS.NotificationServices.registrationError)) {
 					yield break;
 				}
-				deviceToken = NotificationServices.deviceToken;
+				deviceToken = UnityEngine.iOS.NotificationServices.deviceToken;
 				yield return new WaitForEndOfFrame ();
 			}
 

diff --git a/UniWeb/DLL.meta b/UniWeb/DLL.meta
diff --git a/UniWeb/DLL/Ionic.Zlib.dll b/UniWeb/DLL/Ionic.Zlib.dll
diff --git a/UniWeb/DLL/Ionic.Zlib.dll.meta b/UniWeb/DLL/Ionic.Zlib.dll.meta
diff --git a/UniWeb/Plugins/Request.cs b/UniWeb/Plugins/Request.cs
@@ -1,4 +1,3 @@
-#define USE_GZIP
 #define USE_KEEPALIVE
 #define USE_COOKIES
 #define USE_SSL

diff --git a/UniWeb/Plugins/Response.cs b/UniWeb/Plugins/Response.cs
@@ -1,4 +1,3 @@
-#define USE_GZIP
 using System;
 using System.Collections.Generic;
 using System.IO;