Revert VC changes, do modal popover fixes jamesmontemagno#130

Need to make sure it is over current context
alexgab · Nov 23, 2016 · e9b7f6b · e9b7f6b
1 parent 8b06e59
commit e9b7f6b
Showing 1 changed file with 19 additions and 24 deletions.
diff --git a/src/Media.Plugin.iOS/MediaImplementation.cs b/src/Media.Plugin.iOS/MediaImplementation.cs
@@ -267,36 +267,25 @@ private static MediaPickerController SetupController(MediaPickerDelegate mpDeleg
             return picker;
         }
 
-        /// <summary>
-        /// Gets the visible view controller.
-        /// </summary>
-        /// <returns>The visible view controller.</returns>
-        UIViewController GetVisibleViewController()
+        private Task<MediaFile> GetMediaAsync(UIImagePickerControllerSourceType sourceType, string mediaType, StoreCameraMediaOptions options = null)
         {
-            var rootController = UIApplication.SharedApplication.KeyWindow.RootViewController;
-
-            if (rootController.PresentedViewController == null)
-                return rootController;
+            UIWindow window = UIApplication.SharedApplication.KeyWindow;
+            if (window == null)
+                throw new InvalidOperationException("There's no current active window");
 
-            if (rootController.PresentedViewController is UINavigationController)
-            {
-                return ((UINavigationController)rootController.PresentedViewController).VisibleViewController;
-            }
+            UIViewController viewController = window.RootViewController;
 
-            if (rootController.PresentedViewController is UITabBarController)
+            if (viewController == null)
             {
-                return ((UITabBarController)rootController.PresentedViewController).SelectedViewController;
+                window = UIApplication.SharedApplication.Windows.OrderByDescending(w => w.WindowLevel).FirstOrDefault(w => w.RootViewController != null);
+                if (window == null)
+                    throw new InvalidOperationException("Could not find current view controller");
+                else
+                    viewController = window.RootViewController;
             }
 
-            return rootController.PresentedViewController;
-        }
-
-        private Task<MediaFile> GetMediaAsync(UIImagePickerControllerSourceType sourceType, string mediaType, StoreCameraMediaOptions options = null)
-        {
-
-
-            var viewController = GetVisibleViewController();
-
+            while (viewController.PresentedViewController != null)
+                viewController = viewController.PresentedViewController;
 
             MediaPickerDelegate ndelegate = new MediaPickerDelegate(viewController, sourceType, options);
             var od = Interlocked.CompareExchange(ref pickerDelegate, ndelegate, null);
@@ -312,7 +301,13 @@ private Task<MediaFile> GetMediaAsync(UIImagePickerControllerSourceType sourceTy
                 ndelegate.DisplayPopover();
             }
             else
+            {
+                if (UIDevice.CurrentDevice.CheckSystemVersion(9, 0))
+                {
+                    picker.ModalPresentationStyle = UIModalPresentationStyle.OverCurrentContext;
+                }
                 viewController.PresentViewController(picker, true, null);
+            }
 
             return ndelegate.Task.ContinueWith(t =>
             {