From 49c2bf9616c47dd85acc692d5b2a8ac4d32712f5 Mon Sep 17 00:00:00 2001
From: rustdesk <info@rustdesk.com>
Date: Thu, 14 Apr 2022 11:00:24 +0800
Subject: [PATCH] fix for web

---
 lib/main.dart                  |  5 ++---
 lib/models/model.dart          |  4 +++-
 lib/pages/connection_page.dart |  4 ++--
 pubspec.lock                   | 14 ++++++++++++++
 pubspec.yaml                   |  1 +
 5 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/lib/main.dart b/lib/main.dart
index 3fd4488df..f02e8409a 100644
--- a/lib/main.dart
+++ b/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),
         ],
diff --git a/lib/models/model.dart b/lib/models/model.dart
index 396accbe6..1df6f51c1 100644
--- a/lib/models/model.dart
+++ b/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) =>
diff --git a/lib/pages/connection_page.dart b/lib/pages/connection_page.dart
index 5252d2b1b..0cd12882e 100644
--- a/lib/pages/connection_page.dart
+++ b/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>(
diff --git a/pubspec.lock b/pubspec.lock
index 15ab65033..056512dca 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -226,6 +226,20 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  http:
+    dependency: "direct main"
+    description:
+      name: http
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.13.4"
+  http_parser:
+    dependency: transitive
+    description:
+      name: http_parser
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "4.0.0"
   image:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 1dec95c2a..44d9337ab 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -45,6 +45,7 @@ dependencies:
   draggable_float_widget: ^0.0.2
   settings_ui: ^2.0.2
   flutter_breadcrumb: ^1.0.1
+  http: ^0.13.4
 
 dev_dependencies:
   flutter_launcher_icons: ^0.9.1