bump delivery-calculator version

Author: functora

apps

@@ -7,7 +7,7 @@ package directory
   flags: +os-string
 
 package miso
-  flags: +logview
+  flags: -logview
 
 packages:
   pub/miso/*.cabal

cabal.project

@@ -1,6 +1,6 @@
 cabal-version: 2.2
 name:          delivery-calculator
-version:       0.1.0.20
+version:       0.1.0.21
 synopsis:      Delivery Calculator
 category:      Web
 build-type:    Simple

ghcjs/delivery-calculator/delivery-calculator.cabal

@@ -129,7 +129,7 @@ updateModel (InitUpdate mShortSt) prevSt = do
     liftIO . sink $ Tick id
     mvSink <- newMVar sink
     let nextSt = prevSt {modelSink = mvSink}
-    Jsm.selectStorage ("current-" <> vsn) $ \case
+    Jsm.selectStorage ("delivery-calculator-" <> vsn) $ \case
       Nothing ->
         Jsm.fetchInstallReferrerUri $ \case
           Nothing -> do
@@ -141,8 +141,14 @@ updateModel (InitUpdate mShortSt) prevSt = do
               .~ False
             opfsSync sink nextSt
           Just ref -> do
-            longSt <- unGooglePlayLink ref
-            let mLongSt = Just longSt
+            mLongSt <-
+              handleAny
+                ( \e -> do
+                    Jsm.popupText $ displayException e
+                    pure Nothing
+                )
+                . fmap Just
+                $ unGooglePlayLink ref
             let st =
                   ( mShortSt <|> mLongSt
                   )
@@ -212,7 +218,7 @@ updateModel (EvalUpdate f) st = do
             . PureUpdate
             $ unload
         longUri <- mkLongUri next
-        Jsm.insertStorage ("current-" <> vsn) longUri
+        Jsm.insertStorage ("delivery-calculator-" <> vsn) longUri
         shortUri <- mkShortUri next
         uriViewer <-
           newFieldPair mempty

ghcjs/delivery-calculator/src/Main.hs

@@ -1,8 +1,8 @@
 platforms:
   android:
     appName: Delivery Calculator
-    versionCode: 20
-    versionName: 0.1.0.20
+    versionCode: 21
+    versionName: 0.1.0.21
     packageName: com.functora.delivery_calculator
     manifest:
       - file: AndroidManifest.xml

ghcjs/delivery-calculator/trapeze.yaml

@@ -108,7 +108,7 @@ export async function opfsWrite(value, { opfsDir, opfsFile }) {
     await stream.write(value);
     await stream.close();
   } catch (e) {
-    alert(
+    console.log(
       "OPFS write failure: " +
         e.toString() +
         " dir: " +
@@ -130,14 +130,14 @@ export async function opfsRead({ opfsDir, opfsFile }) {
     const res = await resolveDataUrl(uri);
     return res;
   } catch (e) {
-    // alert(
-    //   "OPFS read failure: " +
-    //     e.toString() +
-    //     " dir: " +
-    //     opfsDir +
-    //     " file: " +
-    //     opfsFile,
-    // );
+    console.log(
+      "OPFS read failure: " +
+        e.toString() +
+        " dir: " +
+        opfsDir +
+        " file: " +
+        opfsFile,
+    );
     return null;
   }
 }
@@ -152,7 +152,7 @@ export async function opfsList(opfsDir) {
     }
     return res;
   } catch (e) {
-    alert("OPFS list failure: " + e.toString() + " dir: " + opfsDir);
+    console.log("OPFS list failure: " + e.toString() + " dir: " + opfsDir);
     return [];
   }
 }
@@ -164,7 +164,7 @@ export async function opfsRemove({ opfsDir, opfsFile }) {
     const file = await dir.getFileHandle(opfsFile);
     await file.remove();
   } catch (e) {
-    alert(
+    console.log(
       "OPFS remove failure: " +
         e.toString() +
         " dir: " +

ghcjs/miso-functora/js/main.js

@@ -23,6 +23,7 @@ module Functora.Miso.Jsm.Generic
     setValue,
     scrollTo,
     fetchInstallReferrerUri,
+    isNativePlatform,
   )
 where
 
@@ -321,5 +322,14 @@ scrollTo uid = do
     arg = [("behavior", "smooth"), ("block", "center")]
 
 fetchInstallReferrerUri :: (Maybe Unicode -> JSM ()) -> JSM ()
-fetchInstallReferrerUri =
-  genericPromise @[Unicode] @Unicode "fetchInstallReferrerUri" mempty
+fetchInstallReferrerUri f = do
+  isNative <- isNativePlatform
+  if isNative
+    then genericPromise @[Unicode] @Unicode "fetchInstallReferrerUri" mempty f
+    else f Nothing
+
+isNativePlatform :: JSM Bool
+isNativePlatform = do
+  pkg <- getPkg
+  res <- pkg ^. JS.js0 ("isNativePlatform" :: Unicode)
+  ghcjsPure $ JS.isTruthy res