@saltcorn/mobile-app 1.1.1-beta.1 → 1.1.1-beta.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@saltcorn/mobile-app",
   "displayName": "Saltcorn mobile app",
-  "version": "1.1.1-beta.1",
+  "version": "1.1.1-beta.2",
   "description": "Saltcorn mobile app for Android and iOS",
   "main": "index.js",
   "scripts": {

package/share_extension_files/AppDelegate.swift

@@ -0,0 +1,81 @@
+import UIKit
+import Capacitor
+import SendIntent
+
+
+@UIApplicationMain
+class AppDelegate: UIResponder, UIApplicationDelegate {
+
+    var window: UIWindow?
+    let store = ShareStore.store
+
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
+        // Override point for customization after application launch.
+        return true
+    }
+
+    func applicationWillResignActive(_ application: UIApplication) {
+        // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
+        // Use this method to pause ongoing tasks, disable timers, and invalidate graphics rendering callbacks. Games should use this method to pause the game.
+    }
+
+    func applicationDidEnterBackground(_ application: UIApplication) {
+        // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
+        // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
+    }
+
+    func applicationWillEnterForeground(_ application: UIApplication) {
+        // Called as part of the transition from the background to the active state; here you can undo many of the changes made on entering the background.
+    }
+
+    func applicationDidBecomeActive(_ application: UIApplication) {
+        // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
+    }
+
+    func applicationWillTerminate(_ application: UIApplication) {
+        // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
+    }
+
+    func application(_ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey: Any] = [:]) -> Bool {
+        var success = true
+        if CAPBridge.handleOpenUrl(url, options) {
+            success = ApplicationDelegateProxy.shared.application(app, open: url, options: options)
+        }
+        
+        guard let components = NSURLComponents(url: url, resolvingAgainstBaseURL: true),
+                let params = components.queryItems else {
+                    return false
+                }
+        let titles = params.filter { $0.name == "title" }
+        let descriptions = params.filter { $0.name == "description" }
+        let types = params.filter { $0.name == "type" }
+        let urls = params.filter { $0.name == "url" }
+        
+        store.shareItems.removeAll()
+    
+        if(titles.count > 0){
+            for index in 0...titles.count-1 {
+                var shareItem: JSObject = JSObject()
+                shareItem["title"] = titles[index].value!
+                shareItem["description"] = descriptions[index].value!
+                shareItem["type"] = types[index].value!
+                shareItem["url"] = urls[index].value!
+                store.shareItems.append(shareItem)
+            }
+        }
+        
+        store.processed = false
+        let nc = NotificationCenter.default
+        nc.post(name: Notification.Name("triggerSendIntent"), object: nil )
+        
+        return success
+    }
+
+    func application(_ application: UIApplication, continue userActivity: NSUserActivity, restorationHandler: @escaping ([UIUserActivityRestoring]?) -> Void) -> Bool {
+        // Called when the app was launched with an activity, including Universal Links.
+        // Feel free to add additional processing here, but if you want the App API to support
+        // tracking app url opens, make sure to keep this call
+        return ApplicationDelegateProxy.shared.application(application, continue: userActivity, restorationHandler: restorationHandler)
+    }
+
+}

package/share_extension_files/Info.plist

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>NSExtension</key>
+    <dict>
+        <key>NSExtensionAttributes</key>
+        <dict>
+                <key>NSExtensionActivationRule</key>
+                <dict>
+                    <key>NSExtensionActivationSupportsFileWithMaxCount</key>
+                    <integer>5</integer>
+                    <key>NSExtensionActivationSupportsImageWithMaxCount</key>
+                    <integer>5</integer>
+                    <key>NSExtensionActivationSupportsMovieWithMaxCount</key>
+                    <integer>5</integer>
+                    <key>NSExtensionActivationSupportsText</key>
+                    <true/>
+                    <key>NSExtensionActivationSupportsWebPageWithMaxCount</key>
+                    <integer>1</integer>
+                    <key>NSExtensionActivationSupportsWebURLWithMaxCount</key>
+                    <integer>1</integer>
+                    <key>NSExtensionActivationUsesStrictMatching</key>
+                    <false/>
+                </dict>
+        </dict>
+        <key>NSExtensionMainStoryboard</key>
+        <string>MainInterface</string>
+        <key>NSExtensionPointIdentifier</key>
+        <string>com.apple.share-services</string>
+    </dict>
+</dict>
+</plist>

package/share_extension_files/ShareViewController.swift

@@ -0,0 +1,193 @@
+//
+//  ShareViewController.swift
+//  mindlib
+//
+//  Created by Carsten Klaffke on 05.07.20.
+//
+
+import MobileCoreServices
+import Social
+import UIKit
+
+class ShareItem {
+    
+    public var title: String?
+    public var type: String?
+    public var url: String?
+}
+
+class ShareViewController: UIViewController {
+    
+    private var shareItems: [ShareItem] = []
+    
+    override public func viewDidAppear(_ animated: Bool) {
+       super.viewDidAppear(animated)
+       self.extensionContext!.completeRequest(returningItems: [], completionHandler: nil)
+    }
+    
+    private func sendData() {
+        let queryItems = shareItems.map {
+            [
+                URLQueryItem(
+                    name: "title",
+                    value: $0.title?.addingPercentEncoding(withAllowedCharacters: .urlHostAllowed) ?? ""),
+                URLQueryItem(name: "description", value: ""),
+                URLQueryItem(
+                    name: "type",
+                    value: $0.type?.addingPercentEncoding(withAllowedCharacters: .urlHostAllowed) ?? ""),
+                URLQueryItem(
+                    name: "url",
+                    value: $0.url?.addingPercentEncoding(withAllowedCharacters: .urlHostAllowed) ?? ""),
+            ]
+        }.flatMap({ $0 })
+        var urlComps = URLComponents(string: "scappscheme://")!
+        urlComps.queryItems = queryItems
+        openURL(urlComps.url!)
+    }
+    
+    fileprivate func createSharedFileUrl(_ url: URL?) -> String {
+        let fileManager = FileManager.default
+        
+        let copyFileUrl =
+        fileManager.containerURL(forSecurityApplicationGroupIdentifier: "YOUR_APP_GROUP_ID")!
+            .absoluteString.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)! + url!
+            .lastPathComponent.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!
+        try? Data(contentsOf: url!).write(to: URL(string: copyFileUrl)!)
+        
+        return copyFileUrl
+    }
+    
+    func saveScreenshot(_ image: UIImage, _ index: Int) -> String {
+        let fileManager = FileManager.default
+        
+        let copyFileUrl =
+        fileManager.containerURL(forSecurityApplicationGroupIdentifier: "YOUR_APP_GROUP_ID")!
+            .absoluteString.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!
+        + "/screenshot_\(index).png"
+        do {
+            try image.pngData()?.write(to: URL(string: copyFileUrl)!)
+            return copyFileUrl
+        } catch {
+            print(error.localizedDescription)
+            return ""
+        }
+    }
+    
+    fileprivate func handleTypeUrl(_ attachment: NSItemProvider)
+    async throws -> ShareItem
+    {
+        let results = try await attachment.loadItem(forTypeIdentifier: kUTTypeURL as String, options: nil)
+        let url = results as! URL?
+        let shareItem: ShareItem = ShareItem()
+        
+        if url!.isFileURL {
+            shareItem.title = url!.lastPathComponent
+            shareItem.type = "application/" + url!.pathExtension.lowercased()
+            shareItem.url = createSharedFileUrl(url)
+        } else {
+            shareItem.title = url!.absoluteString
+            shareItem.url = url!.absoluteString
+            shareItem.type = "text/plain"
+        }
+        
+        return shareItem
+    }
+    
+    fileprivate func handleTypeText(_ attachment: NSItemProvider)
+    async throws -> ShareItem
+    {
+        let results = try await attachment.loadItem(forTypeIdentifier: kUTTypeText as String, options: nil)
+        let shareItem: ShareItem = ShareItem()
+        let text = results as! String
+        shareItem.title = text
+        shareItem.type = "text/plain"
+        return shareItem
+    }
+    
+    fileprivate func handleTypeMovie(_ attachment: NSItemProvider)
+    async throws -> ShareItem
+    {
+        let results = try await attachment.loadItem(forTypeIdentifier: kUTTypeMovie as String, options: nil)
+        let shareItem: ShareItem = ShareItem()
+        
+        let url = results as! URL?
+        shareItem.title = url!.lastPathComponent
+        shareItem.type = "video/" + url!.pathExtension.lowercased()
+        shareItem.url = createSharedFileUrl(url)
+        return shareItem
+    }
+    
+    fileprivate func handleTypeImage(_ attachment: NSItemProvider, _ index: Int)
+    async throws -> ShareItem
+    {
+        let data = try await attachment.loadItem(forTypeIdentifier: kUTTypeImage as String, options: nil)
+        
+        let shareItem: ShareItem = ShareItem()
+            switch data {
+                case let image as UIImage:
+                    shareItem.title = "screenshot_\(index)"
+                    shareItem.type = "image/png"
+                    shareItem.url = self.saveScreenshot(image, index)
+                case let url as URL:
+                    shareItem.title = url.lastPathComponent
+                    shareItem.type = "image/" + url.pathExtension.lowercased()
+                    shareItem.url = self.createSharedFileUrl(url)
+                default:
+                    print("Unexpected image data:", type(of: data))
+        }
+        return shareItem
+    }
+    
+    override public func viewDidLoad() {
+        super.viewDidLoad()
+        
+        shareItems.removeAll()
+        
+        let extensionItem = extensionContext?.inputItems[0] as! NSExtensionItem
+        Task {
+            try await withThrowingTaskGroup(
+                of: ShareItem.self,
+                body: { taskGroup in
+                    
+                    for (index, attachment) in extensionItem.attachments!.enumerated() {
+                        if attachment.hasItemConformingToTypeIdentifier(kUTTypeURL as String) {
+                            taskGroup.addTask {
+                                return try await self.handleTypeUrl(attachment)
+                            }
+                        } else if attachment.hasItemConformingToTypeIdentifier(kUTTypeText as String) {
+                            taskGroup.addTask {
+                                return try await self.handleTypeText(attachment)
+                            }
+                        } else if attachment.hasItemConformingToTypeIdentifier(kUTTypeMovie as String) {
+                            taskGroup.addTask {
+                                return try await self.handleTypeMovie(attachment)
+                            }
+                        } else if attachment.hasItemConformingToTypeIdentifier(kUTTypeImage as String) {
+                            taskGroup.addTask {
+                                return try await self.handleTypeImage(attachment, index)
+                            }
+                        }
+                    }
+                    
+                    for try await item in taskGroup {
+                        self.shareItems.append(item)
+                    }
+                })
+            
+            self.sendData()
+            
+        }
+    }
+    
+    @objc func openURL(_ url: URL) {
+        var responder: UIResponder? = self
+        while responder != nil {
+            if let application = responder as? UIApplication {
+                application.open(url, options: [:], completionHandler: nil)
+                return
+            }
+            responder = responder?.next
+        }
+    }
+    
+}

package/src/helpers/common.js

@@ -4,6 +4,7 @@ import { apiCall } from "./api";
 import { Camera, CameraResultType } from "@capacitor/camera";
 import { Geolocation } from "@capacitor/geolocation";
 import { ScreenOrientation } from "@capacitor/screen-orientation";
+import { SendIntent } from "send-intent";
 
 const orientationChangeListeners = new Set();
 
@@ -80,13 +81,13 @@ export function clearTopAlerts() {
 }
 
 export function errorAlert(error) {
+  console.error(error);
   showAlerts([
     {
       type: "error",
       msg: error.message ? error.message : "An error occured.",
     },
   ]);
-  console.error(error);
 }
 
 // TODO combine with loadEncodedFile
@@ -187,3 +188,34 @@ export function registerScreenOrientationListener(name, listener) {
 export async function getScreenOrientation() {
   return await ScreenOrientation.orientation();
 }
+
+export async function sendIntentCallback() {
+  console.log("sendIntentCallback");
+  try {
+    const received = await SendIntent.checkSendIntentReceived();
+    console.log("received: ", received);
+    if (received) {
+      const response = await apiCall({
+        method: "POST",
+        path: "/notifications/share-handler",
+        body: received,
+      });
+      console.log("Share data sent to server.");
+      console.log(response);
+      if (response.data.error) {
+        errorAlert(response.data.error);
+      } else {
+        showAlerts([
+          {
+            type: "success",
+            msg:
+              "Shared: " +
+              (received.title || received.text || received.url || ""),
+          },
+        ]);
+      }
+    }
+  } catch (error) {
+    console.log("Error in sendIntentCallback: ", error);
+  }
+}

package/src/helpers/navigation.js

@@ -228,7 +228,7 @@ export function isHtmlFile() {
   return iframe.getAttribute("is-html-file") === "true";
 }
 
-async function reload() {
+export async function reload() {
   const currentRoute = currentLocation();
   if (!currentRoute) await gotoEntryView();
   await handleRoute(currentRoute, currentQuery(true));
@@ -336,12 +336,13 @@ export async function replaceIframeInnerContent(content) {
 }
 
 export function splitPathQuery(url) {
-  let path = url;
-  let query = undefined;
-  const queryStart = url.indexOf("?");
-  if (queryStart > 0) {
-    path = url.substring(0, queryStart);
-    query = url.substring(queryStart);
-  }
-  return { path, query };
+  if (url === "/") return { path: "/", query: undefined, hash: undefined };
+  const urlObj =
+    url.startsWith("http://") || url.startsWith("https://")
+      ? new URL(url)
+      : new URL(`http://${url}`);
+  const path = url.split("?")[0];
+  const query = urlObj.search?.substring(1);
+  const hash = urlObj.hash?.substring(1);
+  return { path, query, hash };
 }

package/src/init.js

@@ -22,6 +22,7 @@ import {
   gotoEntryView,
   addRoute,
 } from "./helpers/navigation.js";
+import { sendIntentCallback } from "./helpers/common.js";
 
 import i18next from "i18next";
 import i18nextSprintfPostProcessor from "i18next-sprintf-postprocessor";
@@ -319,6 +320,7 @@ export async function init({
 
     state.mobileConfig.networkState = await Network.getStatus();
     Network.addListener("networkStatusChange", networkChangeCallback);
+
     const networkDisabled = state.mobileConfig.networkState === "none";
     const jwt = state.mobileConfig.jwt;
     const alerts = [];
@@ -365,6 +367,11 @@ export async function init({
           });
         }
       }
+      if (state.mobileConfig.allowOfflineMode) {
+        await sendIntentCallback();
+        window.addEventListener("sendIntentReceived", sendIntentCallback);
+      }
+
       let page = null;
       if (!lastLocation) {
         addRoute({ route: entryPoint, query: undefined });

package/www/js/iframe_view_utils.js

@@ -311,10 +311,10 @@ function invalidate_pagings(currentQuery) {
 async function set_state_fields(kvs, disablePjax, e) {
   try {
     showLoadSpinner();
-    let newhref = get_current_state_url(e);
+    const current = get_current_state_url(e);
     let queryParams = [];
     const { path, query } =
-      parent.saltcorn.mobileApp.navigation.splitPathQuery(newhref);
+      parent.saltcorn.mobileApp.navigation.splitPathQuery(current);
     let currentQuery = query || {};
     if (Object.keys(kvs).some((k) => !is_paging_param(k))) {
       currentQuery = invalidate_pagings(currentQuery);
@@ -333,6 +333,8 @@ async function set_state_fields(kvs, disablePjax, e) {
     if (disablePjax)
       await parent.saltcorn.mobileApp.navigation.handleRoute(path, queryStr);
     else await pjax_to(path, queryStr, e);
+  } catch (error) {
+    parent.saltcorn.mobileApp.common.errorAlert(error);
   } finally {
     removeLoadSpinner();
   }
@@ -376,32 +378,29 @@ async function pjax_to(href, query, e) {
     }
 }
 
-async function set_state_field(key, value) {
+async function set_state_field(key, value, e) {
   try {
     showLoadSpinner();
-    const query = updateQueryStringParameter(
-      parent.saltcorn.mobileApp.navigation.currentQuery(),
-      key,
-      value
-    );
-    await parent.saltcorn.mobileApp.navigation.handleRoute(
-      parent.saltcorn.mobileApp.navigation.currentLocation(),
-      query
-    );
+    const newhref = get_current_state_url(e);
+    const { path, query } =
+      parent.saltcorn.mobileApp.navigation.splitPathQuery(newhref);
+    await pjax_to(path, updateQueryStringParameter(query, key, value), e);
+  } catch (error) {
+    parent.saltcorn.mobileApp.common.errorAlert(error);
   } finally {
     removeLoadSpinner();
   }
 }
 
-async function unset_state_field(key) {
+async function unset_state_field(key, e) {
   try {
     showLoadSpinner();
-    const href = parent.saltcorn.mobileApp.navigation.currentLocation();
-    const query = removeQueryStringParameter(
-      parent.saltcorn.mobileApp.navigation.currentLocation(),
-      key
-    );
-    await parent.saltcorn.mobileApp.navigation.handleRoute(href, query);
+    const newhref = get_current_state_url(e);
+    const { path, query } =
+      parent.saltcorn.mobileApp.navigation.splitPathQuery(newhref);
+    await pjax_to(path, removeQueryStringParameter(query, key), e);
+  } catch (error) {
+    parent.saltcorn.mobileApp.common.errorAlert(error);
   } finally {
     removeLoadSpinner();
   }
@@ -623,50 +622,58 @@ function openInAppBrowser(url, domId) {
   }
 }
 
-async function select_id(id) {
+async function select_id(id, e) {
   try {
     showLoadSpinner();
-    const newQuery = updateQueryStringParameter(
-      parent.saltcorn.mobileApp.navigation.currentQuery(),
-      "id",
-      id
-    );
-    await parent.handleRoute(
-      parent.saltcorn.mobileApp.navigation.currentLocation(),
-      newQuery
-    );
+    const newhref = get_current_state_url(e);
+    const { path, query } =
+      parent.saltcorn.mobileApp.navigation.splitPathQuery(newhref);
+    await pjax_to(path, updateQueryStringParameter(query, "id", id), e);
+  } catch (error) {
+    parent.saltcorn.mobileApp.common.errorAlert(error);
   } finally {
     removeLoadSpinner();
   }
 }
 
-async function check_state_field(that) {
+async function check_state_field(that, e) {
   try {
     showLoadSpinner();
+    const newhref = get_current_state_url(e);
+    const { path, query } =
+      parent.saltcorn.mobileApp.navigation.splitPathQuery(newhref);
+    const checked = that.checked;
     const name = that.name;
-    const newQuery = that.checked
-      ? updateQueryStringParameter(
-          parent.saltcorn.mobileApp.navigation.currentQuery(),
-          name,
-          that.value
-        )
-      : removeQueryStringParameter(name);
-    await parent.saltcorn.mobileApp.navigation.handleRoute(
-      parent.saltcorn.mobileApp.navigation.currentLocation(),
-      newQuery
-    );
+    const value = encodeURIComponent(that.value);
+    const newQuery = checked
+      ? updateQueryStringParameter(query, name, value)
+      : removeQueryStringParameter(query, name);
+    await pjax_to(path, newQuery, e);
+  } catch (error) {
+    parent.saltcorn.mobileApp.common.errorAlert(error);
   } finally {
     removeLoadSpinner();
   }
 }
 
-async function clear_state() {
+async function clear_state(omit_fields_str, e) {
   try {
     showLoadSpinner();
-    await parent.saltcorn.mobileApp.navigation.handleRoute(
-      parent.saltcorn.mobileApp.navigation.currentLocation(),
-      undefined
-    );
+    const newhref = get_current_state_url(e);
+    const { path, query, hash } =
+      parent.saltcorn.mobileApp.navigation.splitPathQuery(newhref);
+    let newQuery = "";
+    if (omit_fields_str) {
+      const omit_fields = omit_fields_str.split(",");
+      const params = new URLSearchParams(query);
+      for (const f of omit_fields) {
+        if (params.get(f))
+          updateQueryStringParameter(newQuery, f, params.get(f));
+      }
+    }
+    await pjax_to(path, newQuery, e);
+  } catch (error) {
+    parent.saltcorn.mobileApp.common.errorAlert(error);
   } finally {
     removeLoadSpinner();
   }