Document and Image Picker bug fix along with inline text submission

Fix WebController bug where inline text wouldn't be allowed and removed option to take picture and upload
because it seems to invalidate Webview cookies

Author: PRAN1999

SakaiClientiOS.xcodeproj/project.pbxproj

@@ -223,7 +223,6 @@
 		5113C13D2092D8F1001929DA /* SiteCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SiteCell.swift; sourceTree = "<group>"; };
 		5118956421194D0500BD86D1 /* SakaiClientiOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = SakaiClientiOS.entitlements; sourceTree = "<group>"; };
 		511D7579208DAA9600371998 /* HomeController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeController.swift; sourceTree = "<group>"; };
-		512183CA21E98FE2008BD3D1 /* NoDataView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = NoDataView.swift; path = ../../../../ReusableSource/ReusableSource/NoDataView.swift; sourceTree = "<group>"; };
 		512183D021EA1AF3008BD3D1 /* AppSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppSettings.swift; sourceTree = "<group>"; };
 		5126915421CEEE09004B20E7 /* FilterViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FilterViewController.swift; sourceTree = "<group>"; };
 		512748BC210D29A400A5A74E /* ResourcePageController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResourcePageController.swift; sourceTree = "<group>"; };
@@ -672,7 +671,6 @@
 				511114B820D881450077F872 /* PageView.swift */,
 				518AC34D2137840300037087 /* LoadingIndicator.swift */,
 				51EF2BC721DF5B5E003CAA57 /* InsetUILabel.swift */,
-				512183CA21E98FE2008BD3D1 /* NoDataView.swift */,
 			);
 			path = Reusable;
 			sourceTree = "<group>";

SakaiClientiOS.xcworkspace/xcuserdata/pran1999.xcuserdatad/UserInterfaceState.xcuserstate

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.2.0</string>
 	<key>CFBundleVersion</key>
-	<string>1544</string>
+	<string>1563</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>

SakaiClientiOS/Info.plist

@@ -103,6 +103,7 @@ class PagesController: UIViewController {
         guard let tabBarController = tabBarController as? TabController else {
             return
         }
+        tabBarController.popupController = nil
         // If a new tab is selected, the UITabBarController will handle
         // presentation and dismissal of the popup bar
         if tabBarController.isMovingToNewTabFromPages {
@@ -122,23 +123,9 @@ class PagesController: UIViewController {
         }
         tabBarController.popupController = popupController
 
-        if tabBarController.shouldOpenPopup {
-            // If the user is trying to submit, presenting the Document
-            // Picker or Image Picker will dismiss the popup due to a
-            // WebKit bug. So, the popup should be reopened once the picker
-            // has dismissed and should not reload the page to save any
-            // potential submission
-            webController.setNeedsLoad(to: false)
-            tabBarController.presentPopupBar(withContentViewController: popupController,
-                                             openPopup: true,
-                                             animated: true,
-                                             completion: nil)
-            tabBarController.shouldOpenPopup = false
-        } else {
-            tabBarController.presentPopupBar(withContentViewController: popupController,
-                                             animated: true,
-                                             completion: nil)
-        }
+        tabBarController.presentPopupBar(withContentViewController: popupController,
+                                         animated: true,
+                                         completion: nil)
         // When popping back to PagesController, LNPopupController
         // encounters a bug where it is entirely removed from the view
         // hierarchy and causes a black space to appear in its place.

SakaiClientiOS/Sources/Assignment/PagesController.swift

@@ -20,6 +20,7 @@ enum SakaiEndpoint {
     case announcements(Int, Int), siteAnnouncements(String, Int, Int)
     case siteGradebook(String), siteAssignments(String), siteResources(String)
 
+
     func getEndpoint() -> String {
         switch self {
         case .sites:

SakaiClientiOS/Sources/Models/Networking/SakaiEndpoint.swift

@@ -15,12 +15,6 @@ class TabController: UITabBarController, UITabBarControllerDelegate {
     /// the tabBarController that it is currently presenting a popup
     weak var popupController: UIViewController?
 
-    /// Determines if the popup should be opened when a view controller is
-    /// presenting the popup bar.
-    ///
-    /// See PagesController
-    var shouldOpenPopup = false
-
     var isMovingToNewTabFromPages = false
 
     override func viewDidLoad() {
@@ -37,19 +31,24 @@ class TabController: UITabBarController, UITabBarControllerDelegate {
     override func present(_ viewControllerToPresent: UIViewController,
                           animated flag: Bool,
                           completion: (() -> Void)? = nil) {
-        if popupController != nil &&
-            (viewControllerToPresent is UIDocumentPickerViewController ||
-            viewControllerToPresent is UIImagePickerController) {
-            // If a Document or Image Picker is being shown, a WebKit bug
-            // will cause the popupController to be closed. So, once a
-            // document or image has been selected, the popup controller
-            // should reopen once the picker controller is dismissed. This
-            // property will be used in PagesController
-            shouldOpenPopup = true
+
+        if let picker = viewControllerToPresent as? UIImagePickerController, picker.sourceType == .camera {
+            presentErrorAlert(string: "Taking a picture with the Camera is not supported for upload")
+            picker.delegate?.imagePickerControllerDidCancel?(picker)
+            return
+        }
+
+        if popupController != nil && isPicker(viewControllerToPresent) {
+            let visible = (popupController as? UINavigationController)?.visibleViewController
+            visible?.present(viewControllerToPresent, animated: true, completion: nil)
+            return
         }
-        super.present(viewControllerToPresent,
-                      animated: flag,
-                      completion: completion)
+        super.present(viewControllerToPresent, animated: flag, completion: completion)
+    }
+
+    private func isPicker(_ viewController: UIViewController) -> Bool {
+        return viewController is UIDocumentPickerViewController ||
+               viewController is UIImagePickerController
     }
 
     override func tabBar(_ tabBar: UITabBar, didSelect item: UITabBarItem) {

SakaiClientiOS/Sources/TabController.swift

@@ -34,10 +34,10 @@ class WebController: UIViewController {
 
     private lazy var toolBarArray: [UIBarButtonItem] = {
         let backImage = UIImage(named: "back_button")
-        let back = UIBarButtonItem(image: backImage, style: .plain, target: self, action: #selector(goBack))
+        let back = UIBarButtonItem(image: backImage, style: .plain, target: webView, action: #selector(webView.goBack))
 
         let forwardImage = UIImage(named: "forward_button")
-        let forward = UIBarButtonItem(image: forwardImage, style: .plain, target: self, action: #selector(goForward))
+        let forward = UIBarButtonItem(image: forwardImage, style: .plain, target: webView, action: #selector(webView.goForward))
 
         let action = UIBarButtonItem(barButtonSystemItem: .action, target: self, action: #selector(presentActions))
         let flex = UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: nil, action: nil)
@@ -135,16 +135,16 @@ class WebController: UIViewController {
             self?.webView = webView
             self?.loadURL(urlOpt: self?.url)
             self?.didInitialize = true
-        }
 
-        super.viewDidLoad()
+            self?.setToolbarItems(self?.toolBarArray, animated: true)
 
-        setToolbarItems(toolBarArray, animated: true)
+            self?.navigationItem.leftBarButtonItem
+                = UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(self?.dismissController))
+            self?.navigationItem.rightBarButtonItem
+                = UIBarButtonItem(barButtonSystemItem: .refresh, target: self, action: #selector(self?.loadWebview))
+        }
 
-        navigationItem.leftBarButtonItem
-            = UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(dismissController))
-        navigationItem.rightBarButtonItem
-            = UIBarButtonItem(barButtonSystemItem: .refresh, target: self, action: #selector(loadWebview))
+        super.viewDidLoad()
     }
 
     override func observeValue(forKeyPath keyPath: String?,
@@ -256,6 +256,7 @@ extension WebController: WKUIDelegate, WKNavigationDelegate {
                  decidePolicyFor navigationAction: WKNavigationAction,
                  decisionHandler: @escaping (WKNavigationActionPolicy) -> Void) {
 
+
         guard let url = navigationAction.request.url else {
             decisionHandler(.cancel)
             return
@@ -293,8 +294,6 @@ extension WebController: WKUIDelegate, WKNavigationDelegate {
             $('.Mrphs-siteHierarchy').remove();
             $('#toolMenuWrap').remove();
             $('#skipNav').remove();
-            var selectedElement = document.querySelector('#content');
-            document.body.innerHTML = selectedElement.innerHTML;
         """)
     }
 
@@ -312,17 +311,6 @@ extension WebController: WKUIDelegate, WKNavigationDelegate {
 // MARK: Selector actions
 
 extension WebController {
-    @objc private func goBack() {
-        if webView.canGoBack {
-            webView.goBack()
-        }
-    }
-
-    @objc private func goForward() {
-        if webView.canGoForward {
-            webView.goForward()
-        }
-    }
 
     @objc private func dismissController() {
         dismissAction()