CustomTabs: Fixes NavigationEvent

Also adds support for the missing ExtraCallback callback on the custom tabs session.
This fixes #13

Author: Redth

customtabs/samples/ChromeCustomTabsSample/MainActivity.cs

@@ -56,6 +56,9 @@ protected override void OnCreate (Bundle bundle)
             customTabs.NavigationEvent += (navigationEvent, extras) => {
                 Android.Util.Log.Debug (TAG, "Navigation: " + navigationEvent);
             };
+            customTabs.ExtraCallback += (sender, args) => {
+                Android.Util.Log.Debug (TAG, "Extra Callback: " + args.CallbackName);
+            };
 
 
             simpleLaunch = FindViewById<Button> (Resource.Id.buttonSimpleLaunch);

customtabs/source/Additions/Additions.cs

@@ -6,25 +6,45 @@ namespace Android.Support.CustomTabs
     public partial class CustomTabsClient
     {
         public delegate void OnNavigationEventDelegate (int navigationEvent, Bundle extras);
+        public delegate void ExtraCallbackDelegate (string callbackName, Bundle args);
 
-        public CustomTabsSession NewSession (OnNavigationEventDelegate callback)
+        public CustomTabsSession NewSession (OnNavigationEventDelegate onNavigationEventHandler)
         {
-            return NewSession (new CustomTabsCallbackImpl (callback));
+            return NewSession (new CustomTabsCallbackImpl (onNavigationEventHandler));
+        }
+
+        public CustomTabsSession NewSession (OnNavigationEventDelegate onNavigationEventHandler, ExtraCallbackDelegate extraCallbackHandler)
+        {
+            return NewSession (new CustomTabsCallbackImpl (onNavigationEventHandler, extraCallbackHandler));
         }
 
         internal class CustomTabsCallbackImpl : CustomTabsCallback
         {
-            OnNavigationEventDelegate callback;
+            OnNavigationEventDelegate onNavigationEventHandler;
+            ExtraCallbackDelegate extraCallbackHandler;
+
+
+            public CustomTabsCallbackImpl (OnNavigationEventDelegate onNavigationEventHandler)
+            {
+                this.onNavigationEventHandler = onNavigationEventHandler;
+            }
+
+            public CustomTabsCallbackImpl (OnNavigationEventDelegate onNavigationEventHandler, ExtraCallbackDelegate extraCallbackHandler)
+            {
+                this.onNavigationEventHandler = onNavigationEventHandler;
+                this.extraCallbackHandler = extraCallbackHandler;
+            }
 
-            public CustomTabsCallbackImpl (OnNavigationEventDelegate callback)
+            public override void OnNavigationEvent (int navigationEvent, Bundle extras)
             {
-                this.callback = callback;
+                if (onNavigationEventHandler != null)
+                    onNavigationEventHandler (navigationEvent, extras);
             }
 
-            public void OnNavigationEvent (int navigationEvent, Bundle extras)
+            public override void ExtraCallback (string callbackName, Bundle args)
             {
-                if (callback != null)
-                    callback (navigationEvent, extras);
+                if (extraCallbackHandler != null)
+                    extraCallbackHandler (callbackName, args);
             }
         }
     }

customtabs/source/Additions/CustomTabsActivityManager.cs

@@ -33,6 +33,10 @@ public CustomTabsSession Session {
                         var evt = NavigationEvent;
                         if (evt != null)
                             evt (navEvent, extras);
+                    }, (callbackName, args) => {
+                        var evt = ExtraCallback;
+                        if (evt != null)
+                            evt (this, new ExtraCallbackEventArgs { CallbackName = callbackName, Args = args });
                     });
                 }
 
@@ -43,13 +47,21 @@ public CustomTabsSession Session {
         CustomTabsServiceConnectionImpl connection;
 
         public delegate void NavigationEventDelegate (int navigationEvent, Bundle extras);
+        public delegate void ExtraCallbackDelegate (object sender, ExtraCallbackEventArgs e);
         public delegate void CustomTabsServiceConnectedDelegate (ComponentName name, CustomTabsClient client);
         public delegate void CustomTabsServiceDisconnectedDelegate (ComponentName name);
 
         public event NavigationEventDelegate NavigationEvent;
+        public event ExtraCallbackDelegate ExtraCallback;
         public event CustomTabsServiceConnectedDelegate CustomTabsServiceConnected;
         public event CustomTabsServiceDisconnectedDelegate CustomTabsServiceDisconnected;
 
+        public class ExtraCallbackEventArgs
+        {
+            public string CallbackName { get; set; }
+            public Bundle Args { get; set; }
+        }
+
         public CustomTabsActivityManager (Activity parentActivity)
         {
             ParentActivity = parentActivity;
@@ -113,7 +125,7 @@ public void LaunchUrl (string url, CustomTabsIntent customTabsIntent = null)
                 customTabsIntent = new CustomTabsIntent.Builder ()
                     .Build ();                    
             }
-                
+
             CustomTabsHelper.AddKeepAliveExtra (ParentActivity, customTabsIntent.Intent);
 
             customTabsIntent.LaunchUrl (ParentActivity, Android.Net.Uri.Parse (url));