diff --git a/ios/Podfile.lock b/ios/Podfile.lock index c6b65e985..1af56f26d 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1,88 +1,95 @@ PODS: - device_info (0.0.1): - Flutter - - Firebase/Analytics (8.3.0): + - Firebase/Analytics (8.11.0): - Firebase/Core - - Firebase/Core (8.3.0): + - Firebase/Core (8.11.0): - Firebase/CoreOnly - - FirebaseAnalytics (~> 8.3.0) - - Firebase/CoreOnly (8.3.0): - - FirebaseCore (= 8.3.0) - - firebase_analytics (8.2.0): - - Firebase/Analytics (= 8.3.0) + - FirebaseAnalytics (~> 8.11.0) + - Firebase/CoreOnly (8.11.0): + - FirebaseCore (= 8.11.0) + - firebase_analytics (9.1.5): + - Firebase/Analytics (= 8.11.0) - firebase_core - Flutter - - firebase_core (1.4.0): - - Firebase/CoreOnly (= 8.3.0) + - firebase_core (1.12.0): + - Firebase/CoreOnly (= 8.11.0) - Flutter - - FirebaseAnalytics (8.3.0): - - FirebaseAnalytics/AdIdSupport (= 8.3.0) + - FirebaseAnalytics (8.11.0): + - FirebaseAnalytics/AdIdSupport (= 8.11.0) - FirebaseCore (~> 8.0) - FirebaseInstallations (~> 8.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.4) - - GoogleUtilities/MethodSwizzler (~> 7.4) - - GoogleUtilities/Network (~> 7.4) - - "GoogleUtilities/NSData+zlib (~> 7.4)" + - GoogleUtilities/AppDelegateSwizzler (~> 7.7) + - GoogleUtilities/MethodSwizzler (~> 7.7) + - GoogleUtilities/Network (~> 7.7) + - "GoogleUtilities/NSData+zlib (~> 7.7)" - nanopb (~> 2.30908.0) - - FirebaseAnalytics/AdIdSupport (8.3.0): + - FirebaseAnalytics/AdIdSupport (8.11.0): - FirebaseCore (~> 8.0) - FirebaseInstallations (~> 8.0) - - GoogleAppMeasurement (= 8.3.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.4) - - GoogleUtilities/MethodSwizzler (~> 7.4) - - GoogleUtilities/Network (~> 7.4) - - "GoogleUtilities/NSData+zlib (~> 7.4)" + - GoogleAppMeasurement (= 8.11.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.7) + - GoogleUtilities/MethodSwizzler (~> 7.7) + - GoogleUtilities/Network (~> 7.7) + - "GoogleUtilities/NSData+zlib (~> 7.7)" - nanopb (~> 2.30908.0) - - FirebaseCore (8.3.0): + - FirebaseCore (8.11.0): - FirebaseCoreDiagnostics (~> 8.0) - - GoogleUtilities/Environment (~> 7.4) - - GoogleUtilities/Logger (~> 7.4) - - FirebaseCoreDiagnostics (8.5.0): - - GoogleDataTransport (~> 9.0) - - GoogleUtilities/Environment (~> 7.4) - - GoogleUtilities/Logger (~> 7.4) + - GoogleUtilities/Environment (~> 7.7) + - GoogleUtilities/Logger (~> 7.7) + - FirebaseCoreDiagnostics (8.15.0): + - GoogleDataTransport (~> 9.1) + - GoogleUtilities/Environment (~> 7.7) + - GoogleUtilities/Logger (~> 7.7) - nanopb (~> 2.30908.0) - - FirebaseInstallations (8.5.0): + - FirebaseInstallations (8.15.0): - FirebaseCore (~> 8.0) - - GoogleUtilities/Environment (~> 7.4) - - GoogleUtilities/UserDefaults (~> 7.4) + - GoogleUtilities/Environment (~> 7.7) + - GoogleUtilities/UserDefaults (~> 7.7) - PromisesObjC (< 3.0, >= 1.2) - Flutter (1.0.0) - - GoogleAppMeasurement (8.3.0): - - GoogleAppMeasurement/AdIdSupport (= 8.3.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.4) - - GoogleUtilities/MethodSwizzler (~> 7.4) - - GoogleUtilities/Network (~> 7.4) - - "GoogleUtilities/NSData+zlib (~> 7.4)" + - GoogleAppMeasurement (8.11.0): + - GoogleAppMeasurement/AdIdSupport (= 8.11.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.7) + - GoogleUtilities/MethodSwizzler (~> 7.7) + - GoogleUtilities/Network (~> 7.7) + - "GoogleUtilities/NSData+zlib (~> 7.7)" - nanopb (~> 2.30908.0) - - GoogleAppMeasurement/AdIdSupport (8.3.0): - - GoogleUtilities/AppDelegateSwizzler (~> 7.4) - - GoogleUtilities/MethodSwizzler (~> 7.4) - - GoogleUtilities/Network (~> 7.4) - - "GoogleUtilities/NSData+zlib (~> 7.4)" + - GoogleAppMeasurement/AdIdSupport (8.11.0): + - GoogleAppMeasurement/WithoutAdIdSupport (= 8.11.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.7) + - GoogleUtilities/MethodSwizzler (~> 7.7) + - GoogleUtilities/Network (~> 7.7) + - "GoogleUtilities/NSData+zlib (~> 7.7)" - nanopb (~> 2.30908.0) - - GoogleDataTransport (9.1.0): + - GoogleAppMeasurement/WithoutAdIdSupport (8.11.0): + - GoogleUtilities/AppDelegateSwizzler (~> 7.7) + - GoogleUtilities/MethodSwizzler (~> 7.7) + - GoogleUtilities/Network (~> 7.7) + - "GoogleUtilities/NSData+zlib (~> 7.7)" + - nanopb (~> 2.30908.0) + - GoogleDataTransport (9.1.2): - GoogleUtilities/Environment (~> 7.2) - nanopb (~> 2.30908.0) - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/AppDelegateSwizzler (7.5.0): + - GoogleUtilities/AppDelegateSwizzler (7.7.0): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - - GoogleUtilities/Environment (7.5.0): + - GoogleUtilities/Environment (7.7.0): - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/Logger (7.5.0): + - GoogleUtilities/Logger (7.7.0): - GoogleUtilities/Environment - - GoogleUtilities/MethodSwizzler (7.5.0): + - GoogleUtilities/MethodSwizzler (7.7.0): - GoogleUtilities/Logger - - GoogleUtilities/Network (7.5.0): + - GoogleUtilities/Network (7.7.0): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (7.5.0)" - - GoogleUtilities/Reachability (7.5.0): + - "GoogleUtilities/NSData+zlib (7.7.0)" + - GoogleUtilities/Reachability (7.7.0): - GoogleUtilities/Logger - - GoogleUtilities/UserDefaults (7.5.0): + - GoogleUtilities/UserDefaults (7.7.0): - GoogleUtilities/Logger - nanopb (2.30908.0): - nanopb/decode (= 2.30908.0) @@ -91,12 +98,12 @@ PODS: - nanopb/encode (2.30908.0) - package_info (0.0.1): - Flutter - - path_provider (0.0.1): + - path_provider_ios (0.0.1): - Flutter - - PromisesObjC (2.0.0) - - shared_preferences (0.0.1): + - PromisesObjC (2.1.0) + - shared_preferences_ios (0.0.1): - Flutter - - url_launcher (0.0.1): + - url_launcher_ios (0.0.1): - Flutter - wakelock (0.0.1): - Flutter @@ -107,9 +114,9 @@ DEPENDENCIES: - firebase_core (from `.symlinks/plugins/firebase_core/ios`) - Flutter (from `Flutter`) - package_info (from `.symlinks/plugins/package_info/ios`) - - path_provider (from `.symlinks/plugins/path_provider/ios`) - - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`) - - url_launcher (from `.symlinks/plugins/url_launcher/ios`) + - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`) + - shared_preferences_ios (from `.symlinks/plugins/shared_preferences_ios/ios`) + - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) - wakelock (from `.symlinks/plugins/wakelock/ios`) SPEC REPOS: @@ -136,34 +143,34 @@ EXTERNAL SOURCES: :path: Flutter package_info: :path: ".symlinks/plugins/package_info/ios" - path_provider: - :path: ".symlinks/plugins/path_provider/ios" - shared_preferences: - :path: ".symlinks/plugins/shared_preferences/ios" - url_launcher: - :path: ".symlinks/plugins/url_launcher/ios" + path_provider_ios: + :path: ".symlinks/plugins/path_provider_ios/ios" + shared_preferences_ios: + :path: ".symlinks/plugins/shared_preferences_ios/ios" + url_launcher_ios: + :path: ".symlinks/plugins/url_launcher_ios/ios" wakelock: :path: ".symlinks/plugins/wakelock/ios" SPEC CHECKSUMS: device_info: d7d233b645a32c40dfdc212de5cf646ca482f175 - Firebase: 817b9171d0d51dccc458b94a5e8edff6b1dd323d - firebase_analytics: 25a03006c041a3be10bbd8e7313f87f59b9857bf - firebase_core: 72374607c8c6f5a0adc0559e5c5bf57deda975e3 - FirebaseAnalytics: 456f2c51599870a15ded4548d1f1f7b2cabf65a7 - FirebaseCore: a6dba751680d7033b9d3831e1cfc95ead0605118 - FirebaseCoreDiagnostics: 7bf55d386f9fc690d971b70a582142321a390eb8 - FirebaseInstallations: f2bc590b291d25fb40a9a05b8281c02a881b5117 - Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c - GoogleAppMeasurement: de70802583dedceb0bca18172b345307e8f410b8 - GoogleDataTransport: 85fd18ff3019bb85d3f2c551d04c481dedf71fc9 - GoogleUtilities: eea970f4a389963963bffe8d8fabe43540678b9c + Firebase: 44dd9724c84df18b486639e874f31436eaa9a20c + firebase_analytics: be4ce15dfece759ee3cdab7d116408b02946d574 + firebase_core: 443bccfd6aa6b42f07be365b500773dc69db2d87 + FirebaseAnalytics: 4e4b13031034e6561ed3bd1d47b6fdabbd6487c6 + FirebaseCore: 2f4f85b453cc8fea4bb2b37e370007d2bcafe3f0 + FirebaseCoreDiagnostics: 92e07a649aeb66352b319d43bdd2ee3942af84cb + FirebaseInstallations: 40bd9054049b2eae9a2c38ef1c3dd213df3605cd + Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a + GoogleAppMeasurement: aa3cb422fab2b05d2efac543a5720d1a85b9dea5 + GoogleDataTransport: 629c20a4d363167143f30ea78320d5a7eb8bd940 + GoogleUtilities: e0913149f6b0625b553d70dae12b49fc62914fd1 nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96 package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62 - path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c - PromisesObjC: 68159ce6952d93e17b2dfe273b8c40907db5ba58 - shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d - url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef + path_provider_ios: 7d7ce634493af4477d156294792024ec3485acd5 + PromisesObjC: 99b6f43f9e1044bd87a95a60beff28c2c44ddb72 + shared_preferences_ios: aef470a42dc4675a1cdd50e3158b42e3d1232b32 + url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f PODFILE CHECKSUM: a00077baecbb97321490c14848fceed3893ca92a 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 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 peers() { try { - List peers = json.decode(getByName('peers')); + var str = getByName('peers'); + if (str == "") return []; + List peers = json.decode(str); return peers .map((s) => s as List) .map((s) => diff --git a/lib/pages/connection_page.dart b/lib/pages/connection_page.dart index 4dba37a87..ae4b16cc8 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 ? [WebMenu()] : []; + final appBarActions = !isAndroid ? [WebMenu()] : []; @override final scrollController = ScrollController(); @@ -261,7 +261,7 @@ class _ConnectionPageState extends State { PopupMenuItem( child: Text(translate('Remove')), value: 'remove') ] + - (isWeb + (!isAndroid ? [] : [ PopupMenuItem( diff --git a/pubspec.lock b/pubspec.lock index bc2a6715e..056512dca 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -134,34 +134,27 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "6.1.2" - firebase: - dependency: transitive - description: - name: firebase - url: "https://pub.dartlang.org" - source: hosted - version: "9.0.2" firebase_analytics: dependency: "direct main" description: name: firebase_analytics url: "https://pub.dartlang.org" source: hosted - version: "8.3.4" + version: "9.1.5" firebase_analytics_platform_interface: dependency: transitive description: name: firebase_analytics_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.0.1" + version: "3.1.3" firebase_analytics_web: dependency: transitive description: name: firebase_analytics_web url: "https://pub.dartlang.org" source: hosted - version: "0.3.0+1" + version: "0.4.0+10" firebase_core: dependency: transitive description: @@ -175,14 +168,14 @@ packages: name: firebase_core_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "4.2.4" + version: "4.2.5" firebase_core_web: dependency: transitive description: name: firebase_core_web url: "https://pub.dartlang.org" source: hosted - version: "1.5.4" + version: "1.6.2" flutter: dependency: "direct main" description: flutter @@ -234,7 +227,7 @@ packages: source: sdk version: "0.0.0" http: - dependency: transitive + dependency: "direct main" description: name: http url: "https://pub.dartlang.org" @@ -680,5 +673,5 @@ packages: source: hosted version: "3.1.0" sdks: - dart: ">=2.15.0 <3.0.0" + dart: ">=2.16.0 <3.0.0" flutter: ">=2.10.0" diff --git a/pubspec.yaml b/pubspec.yaml index cdab37490..44d9337ab 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -36,7 +36,7 @@ dependencies: tuple: ^2.0.0 wakelock: ^0.5.2 device_info: ^2.0.2 - firebase_analytics: ^8.2.0 + firebase_analytics: ^9.1.5 package_info: ^2.0.2 url_launcher: ^6.0.9 shared_preferences: ^2.0.6 @@ -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