fix for web

lib/main.dart

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:provider/provider.dart';
 import 'package:firebase_analytics/firebase_analytics.dart';
-import 'package:firebase_analytics/observer.dart';
 import 'package:firebase_core/firebase_core.dart';
 import 'common.dart';
 import 'models/model.dart';
@@ -21,7 +20,7 @@ Future<Null> main() async {
 class App extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
-    final analytics = FirebaseAnalytics();
+    final analytics = FirebaseAnalytics.instance;
     refreshCurrentUser();
     return MultiProvider(
       providers: [
@@ -38,7 +37,7 @@ class App extends StatelessWidget {
           primarySwatch: Colors.blue,
           visualDensity: VisualDensity.adaptivePlatformDensity,
         ),
-        home: isWeb ? WebHomePage() : HomePage(),
+        home: !isAndroid ? WebHomePage() : HomePage(),
         navigatorObservers: [
           FirebaseAnalyticsObserver(analytics: analytics),
         ],

lib/models/model.dart

@@ -715,7 +715,9 @@ class FFI {
 
   static List<Peer> peers() {
     try {
-      List<dynamic> peers = json.decode(getByName('peers'));
+      var str = getByName('peers');
+      if (str == "") return [];
+      List<dynamic> peers = json.decode(str);
       return peers
           .map((s) => s as List<dynamic>)
           .map((s) =>

lib/pages/connection_page.dart

@@ -19,7 +19,7 @@ class ConnectionPage extends StatefulWidget implements PageShape {
   final title = translate("Connection");
 
   @override
-  final appBarActions = isWeb ? <Widget>[WebMenu()] : <Widget>[];
+  final appBarActions = !isAndroid ? <Widget>[WebMenu()] : <Widget>[];
 
   @override
   _ConnectionPageState createState() => _ConnectionPageState();
@@ -257,7 +257,7 @@ class _ConnectionPageState extends State<ConnectionPage> {
             PopupMenuItem<String>(
                 child: Text(translate('Remove')), value: 'remove')
           ] +
-          (isWeb
+          (!isAndroid
               ? []
               : [
                   PopupMenuItem<String>(