await ffi init

lib/main.dart

@@ -11,7 +11,11 @@ import 'pages/settings_page.dart';
 
 Future<Null> main() async {
   WidgetsFlutterBinding.ensureInitialized();
-  await Firebase.initializeApp();
+  var a = FFI.ffiModel.init();
+  var b = Firebase.initializeApp();
+  await a;
+  await b;
+  refreshCurrentUser();
   EasyLoading.instance.loadingStyle = EasyLoadingStyle.light;
   toAndroidChannelInit();
   runApp(App());
@@ -21,7 +25,6 @@ class App extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final analytics = FirebaseAnalytics.instance;
-    refreshCurrentUser();
     return MultiProvider(
       providers: [
         ChangeNotifierProvider.value(value: FFI.ffiModel),
@@ -37,7 +40,7 @@ class App extends StatelessWidget {
           primarySwatch: Colors.blue,
           visualDensity: VisualDensity.adaptivePlatformDensity,
         ),
-        home: !isAndroid ? WebHomePage() : HomePage(),
+        home: isWeb ? WebHomePage() : HomePage(),
         navigatorObservers: [
           FirebaseAnalyticsObserver(analytics: analytics),
         ],

lib/models/model.dart

@@ -22,7 +22,6 @@ class FfiModel with ChangeNotifier {
   Display _display = Display();
   var _decoding = false;
   bool _waitForImage = false;
-  bool _initialized = false;
   var _inputBlocked = false;
   final _permissions = Map<String, bool>();
   bool? _secure;
@@ -32,8 +31,6 @@ class FfiModel with ChangeNotifier {
 
   get permissions => _permissions;
 
-  get initialized => _initialized;
-
   get display => _display;
 
   get secure => _secure;
@@ -51,12 +48,10 @@ class FfiModel with ChangeNotifier {
   FfiModel() {
     Translator.call = translate;
     clear();
-    () async {
-      await PlatformFFI.init();
-      _initialized = true;
-      print("FFI initialized");
-      notifyListeners();
-    }();
+  }
+
+  Future<void> init() async {
+    await PlatformFFI.init();
   }
 
   void updatePermission(Map<String, dynamic> evt) {

lib/pages/connection_page.dart

@@ -113,9 +113,6 @@ class _ConnectionPageState extends State<ConnectionPage> {
   }
 
   Widget getSearchBarUI() {
-    if (!FFI.ffiModel.initialized) {
-      return Container();
-    }
     var w = Padding(
       padding: const EdgeInsets.fromLTRB(16.0, 8.0, 16.0, 0.0),
       child: Container(
@@ -197,9 +194,6 @@ class _ConnectionPageState extends State<ConnectionPage> {
   }
 
   Widget getPeers() {
-    if (!FFI.ffiModel.initialized) {
-      return Container();
-    }
     final size = MediaQuery.of(context).size;
     final space = 8.0;
     var width = size.width - 2 * space;