Fixes #309, update to set activity on init and oncreate, never null. (#…

…323)
xamarin · Jun 25, 2018 · 76f2b1d · 76f2b1d
1 parent 7d41c50
commit 76f2b1d
Showing 1 changed file with 15 additions and 14 deletions.
diff --git a/Xamarin.Essentials/Platform/Platform.android.cs b/Xamarin.Essentials/Platform/Platform.android.cs
@@ -29,8 +29,11 @@ public static void Init(Application application)
             application.RegisterActivityLifecycleCallbacks(lifecycleListener);
         }
 
-        public static void Init(Activity activity, Bundle bundle) =>
-           Init(activity.Application);
+        public static void Init(Activity activity, Bundle bundle)
+        {
+            Init(activity.Application);
+            lifecycleListener.Activity = activity;
+        }
 
         public static void OnRequestPermissionsResult(int requestCode, string[] permissions, Permission[] grantResults) =>
             Permissions.OnRequestPermissionsResult(requestCode, permissions, grantResults);
@@ -110,26 +113,24 @@ class ActivityLifecycleContextListener : Java.Lang.Object, Application.IActivity
         internal Context Context =>
             Activity ?? Application.Context;
 
-        internal Activity Activity =>
-            currentActivity.TryGetTarget(out var a) ? a : null;
-
-        void Application.IActivityLifecycleCallbacks.OnActivityCreated(Activity activity, Bundle savedInstanceState)
+        internal Activity Activity
         {
+           get => currentActivity.TryGetTarget(out var a) ? a : null;
+           set => currentActivity.SetTarget(value);
         }
 
+        void Application.IActivityLifecycleCallbacks.OnActivityCreated(Activity activity, Bundle savedInstanceState) =>
+            Activity = activity;
+
         void Application.IActivityLifecycleCallbacks.OnActivityDestroyed(Activity activity)
         {
         }
 
-        void Application.IActivityLifecycleCallbacks.OnActivityPaused(Activity activity)
-        {
-            currentActivity.SetTarget(null);
-        }
+        void Application.IActivityLifecycleCallbacks.OnActivityPaused(Activity activity) =>
+            Activity = activity;
 
-        void Application.IActivityLifecycleCallbacks.OnActivityResumed(Activity activity)
-        {
-            currentActivity.SetTarget(activity);
-        }
+        void Application.IActivityLifecycleCallbacks.OnActivityResumed(Activity activity) =>
+            Activity = activity;
 
         void Application.IActivityLifecycleCallbacks.OnActivitySaveInstanceState(Activity activity, Bundle outState)
         {