Removed events from UIApplication that were crashing Unity

Hitcents · Apr 16, 2015 · bb1cdcc · bb1cdcc
1 parent c56fccf
commit bb1cdcc
Show file tree

Hide file tree

Showing 2 changed files with 70 additions and 67 deletions.
diff --git a/Assets/Tests/UIApplicationTests.cs b/Assets/Tests/UIApplicationTests.cs
@@ -14,20 +14,21 @@ public void SharedApplication()
         Assert.AreNotEqual(IntPtr.Zero, app.Handle);
     }
 
-    [Test]
-    public void ApplicationEvents()
-    {
-        var app = UIApplication.SharedApplication;
-
-        app.DidBecomeActive += (sender, e) =>
-        {
-            Console.WriteLine("DidBecomeActive!");
-        };
-        app.WillResignActive += (sender, e) =>
-        {
-            Console.WriteLine("WillResignActive!");
-        };
-    }
+// These events are removed temporarily until we find a workaround
+//    [Test]
+//    public void ApplicationEvents()
+//    {
+//        var app = UIApplication.SharedApplication;
+//
+//        app.DidBecomeActive += (sender, e) =>
+//        {
+//            Console.WriteLine("DidBecomeActive!");
+//        };
+//        app.WillResignActive += (sender, e) =>
+//        {
+//            Console.WriteLine("WillResignActive!");
+//        };
+//    }
 
     [Test]
     public void SharedApplicationDispose()

diff --git a/Assets/iOS4Unity/UIApplication.cs b/Assets/iOS4Unity/UIApplication.cs
@@ -22,59 +22,61 @@ public override IntPtr ClassHandle
         internal UIApplication(IntPtr handle)
             : base(handle)
         {
-            ObjC.MessageSend(Handle, "setDelegate:", Handle);
-        }
-
-        public event EventHandler DidBecomeActive
-        {
-            add { Callbacks.Subscribe(this, "applicationDidBecomeActive:", value); }
-            remove { Callbacks.Unsubscribe(this, "applicationDidBecomeActive:", value); }
-        }
-
-        public event EventHandler WillResignActive
-        {
-            add { Callbacks.Subscribe(this, "applicationWillResignActive:", value); }
-            remove { Callbacks.Unsubscribe(this, "applicationWillResignActive:", value); }
-        }
-
-        public event EventHandler WillEnterForeground
-        {
-            add { Callbacks.Subscribe(this, "applicationWillEnterForeground:", value); }
-            remove { Callbacks.Unsubscribe(this, "applicationWillEnterForeground:", value); }
-        }
-
-        public event EventHandler WillTerminate
-        {
-            add { Callbacks.Subscribe(this, "applicationWillTerminate:", value); }
-            remove { Callbacks.Unsubscribe(this, "applicationWillTerminate:", value); }
-        }
-
-        public event EventHandler DidReceiveMemoryWarning
-        {
-            add { Callbacks.Subscribe(this, "applicationDidReceiveMemoryWarning:", value); }
-            remove { Callbacks.Unsubscribe(this, "applicationDidReceiveMemoryWarning:", value); }
-        }
-
-        public event EventHandler<NSErrorEventArgs> FailedToRegisterForRemoteNotifications
-        {
-            add
-            {
-                if (_failed == null)
-                    _failed = new Dictionary<object, IntPtrHandler2>();
-                IntPtrHandler2 callback = (_, i) => value(this, new NSErrorEventArgs { Error = Runtime.GetNSObject<NSError>(i) });
-                _failed[value] = callback;
-                Callbacks.Subscribe(this, "application:didFailToRegisterForRemoteNotificationsWithError:", callback);
-            }
-            remove
-            {
-                IntPtrHandler2 callback;
-                if (_failed != null && _failed.TryGetValue(value, out callback))
-                {
-                    _failed.Remove(value);
-                    Callbacks.Unsubscribe(this, "application:didFailToRegisterForRemoteNotificationsWithError:", callback);
-                }
-            }
-        }
+            //Overwriting this delegate crashes Unity, will revisit this
+            //ObjC.MessageSend(Handle, "setDelegate:", Handle);
+        }
+
+        //These events cause issues in Unity, will revisit this
+//        public event EventHandler DidBecomeActive
+//        {
+//            add { Callbacks.Subscribe(this, "applicationDidBecomeActive:", value); }
+//            remove { Callbacks.Unsubscribe(this, "applicationDidBecomeActive:", value); }
+//        }
+//
+//        public event EventHandler WillResignActive
+//        {
+//            add { Callbacks.Subscribe(this, "applicationWillResignActive:", value); }
+//            remove { Callbacks.Unsubscribe(this, "applicationWillResignActive:", value); }
+//        }
+//
+//        public event EventHandler WillEnterForeground
+//        {
+//            add { Callbacks.Subscribe(this, "applicationWillEnterForeground:", value); }
+//            remove { Callbacks.Unsubscribe(this, "applicationWillEnterForeground:", value); }
+//        }
+//
+//        public event EventHandler WillTerminate
+//        {
+//            add { Callbacks.Subscribe(this, "applicationWillTerminate:", value); }
+//            remove { Callbacks.Unsubscribe(this, "applicationWillTerminate:", value); }
+//        }
+//
+//        public event EventHandler DidReceiveMemoryWarning
+//        {
+//            add { Callbacks.Subscribe(this, "applicationDidReceiveMemoryWarning:", value); }
+//            remove { Callbacks.Unsubscribe(this, "applicationDidReceiveMemoryWarning:", value); }
+//        }
+//
+//        public event EventHandler<NSErrorEventArgs> FailedToRegisterForRemoteNotifications
+//        {
+//            add
+//            {
+//                if (_failed == null)
+//                    _failed = new Dictionary<object, IntPtrHandler2>();
+//                IntPtrHandler2 callback = (_, i) => value(this, new NSErrorEventArgs { Error = Runtime.GetNSObject<NSError>(i) });
+//                _failed[value] = callback;
+//                Callbacks.Subscribe(this, "application:didFailToRegisterForRemoteNotificationsWithError:", callback);
+//            }
+//            remove
+//            {
+//                IntPtrHandler2 callback;
+//                if (_failed != null && _failed.TryGetValue(value, out callback))
+//                {
+//                    _failed.Remove(value);
+//                    Callbacks.Unsubscribe(this, "application:didFailToRegisterForRemoteNotificationsWithError:", callback);
+//                }
+//            }
+//        }
 
         public static UIApplication SharedApplication
         {