wip

.fvm/fvm_config.json

@@ -1,4 +1,4 @@
 {
-  "flutterSdkVersion": "3.13.9",
+  "flutterSdkVersion": "3.16.5",
   "flavors": {}
 }

lib/config/route_handlers.dart

@@ -12,10 +12,10 @@ import 'package:keevault/widgets/vault.dart';
 import '../widgets/blocking_overlay.dart';
 import '../widgets/change_email_prefs.dart';
 import '../widgets/change_password.dart';
-import '../widgets/root.dart';
+import '../widgets/root.dart' as kv_root;
 
 var rootHandler = Handler(handlerFunc: (BuildContext? context, Map<String, List<String>> params) {
-  return const RootWidget();
+  return const kv_root.RootWidget();
 });
 
 var vaultHandler = Handler(handlerFunc: (BuildContext? context, Map<String, List<String>> params) {

lib/main.dart

@@ -2,6 +2,7 @@ import 'dart:async';
 
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:keevault/config/platform.dart';
 import 'package:keevault/logging/logger.dart';
 import 'package:keevault/payment_service.dart';
 import 'package:keevault/widgets/dialog_utils.dart';
@@ -29,9 +30,11 @@ void main() async {
         url: 'https://matomo.kee.pm/js/',
         dispatchSettings: DispatchSettings.persistent(onLoad: DispatchSettings.whereNotOlderThan(Duration(days: 14))),
       );
-      // Responsibility to check initialisation completed is deferred to any
-      // Flutter views that actually want to use the IAP feature
-      unawaited(PaymentService.instance.initConnection());
+      if (!KeeVaultPlatform.isWeb) {
+        // Responsibility to check initialisation completed is deferred to any
+        // Flutter views that actually want to use the IAP feature
+        unawaited(PaymentService.instance.initConnection());
+      }
       WidgetsFlutterBinding.ensureInitialized();
       l.i('Initialized WidgetsFlutterBinding');
       var suffixList = await rootBundle.loadString('assets/public_suffix_list.dat');