@saltcorn/mobile-app 1.5.0-beta.6 → 1.5.0-beta.7

package/package.json

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

package/src/init.js

@@ -171,7 +171,7 @@ const initI18Next = async () => {
   for (const key of Object.keys(
     saltcorn.data.models.config.available_languages
   )) {
-    if (Capacitor.platform !== "web") {
+    if (Capacitor.getPlatform() !== "web") {
       const localeFile = await readJSONCordova(
         `${key}.json`,
         `${cordova.file.applicationDirectory}public/data/locales`
@@ -306,7 +306,7 @@ const postShare = async (shareData) => {
 };
 
 const readSchemaIfNeeded = async () => {
-  if (Capacitor.platform !== "web") {
+  if (Capacitor.getPlatform() !== "web") {
     let tablesJSON = null;
     const { created_at } = await readJSONCordova(
       "tables_created_at.json",
@@ -327,7 +327,7 @@ const readSchemaIfNeeded = async () => {
 };
 
 const readSiteLogo = async () => {
-  if (Capacitor.platform === "web") return "";
+  if (Capacitor.getPlatform() === "web") return "";
   try {
     const base64 = await readTextCordova(
       "encoded_site_logo.txt",
@@ -358,7 +358,7 @@ const getEntryPoint = (roleId, state, mobileConfig) => {
 // device is ready
 export async function init(mobileConfig) {
   try {
-    if (Capacitor.platform === "web") {
+    if (Capacitor.getPlatform() === "web") {
       defineCustomElements(window);
       await customElements.whenDefined("jeep-sqlite");
       const jeepSqlite = document.createElement("jeep-sqlite");
@@ -428,10 +428,10 @@ export async function init(mobileConfig) {
     state.mobileConfig.networkState = (
       await Network.getStatus()
     ).connectionType;
-    if (Capacitor.platform === "android") {
+    if (Capacitor.getPlatform() === "android") {
       const shareData = await checkSendIntentReceived();
       if (shareData) return await postShare(shareData);
-    } else if (Capacitor.platform === "ios") {
+    } else if (Capacitor.getPlatform() === "ios") {
       window.addEventListener("sendIntentReceived", async () => {
         const shareData = await checkSendIntentReceived();
         if (shareData && notEmpty(shareData)) return await postShare(shareData);
@@ -486,7 +486,7 @@ export async function init(mobileConfig) {
         }
       }
 
-      if (Capacitor.platform === "ios") {
+      if (Capacitor.getPlatform() === "ios") {
         const shareData = await checkSendIntentReceived();
         if (shareData && notEmpty(shareData)) return await postShare(shareData);
       }

package/src/routing/routes/auth.js

@@ -33,10 +33,11 @@ const prepareAuthForm = () => {
 const getAuthLinks = (current, entryPoint) => {
   const links = { methods: [] };
   const state = saltcorn.data.state.getState();
+  const mobileConfig = state.mobileConfig;
   if (current !== "login") links.login = "javascript:execLink('/auth/login')";
   if (current !== "signup" && state.getConfig("allow_signup"))
     links.signup = "javascript:execLink('/auth/signup')";
-  if (state.getConfig("public_user_link"))
+  if (mobileConfig.showContinueAsPublicUser)
     links.publicUser = `javascript:publicLogin('${entryPoint}')`;
   for (const [name, auth] of Object.entries(state.auth_methods)) {
     links.methods.push({

package/src/routing/routes/notifications.js

@@ -46,7 +46,7 @@ export const postShare = async (context) => {
       saltcorn.markup.tags.script(`
       setTimeout(() => {
         ${
-          Capacitor.platform === "android"
+          Capacitor.getPlatform() === "android"
             ? "parent.saltcorn.mobileApp.common.finishShareIntent();"
             : "parent.saltcorn.mobileApp.navigation.gotoEntryView();"
         } 

package/www/index.html

@@ -16,7 +16,7 @@
       if (window.saltcorn) window.saltcorn.mobileApp = mobileApp;
       else window.saltcorn = { mobileApp };
 
-      if (Capacitor.platform !== "web") {
+      if (Capacitor.getPlatform() !== "web") {
         document.addEventListener("deviceready", () => {
           saltcorn.mobileApp.init(_sc_mobile_config);
         });