From 08b39bcf8a76bc3c6e91851d2d2b5ee58e64bedd Mon Sep 17 00:00:00 2001 From: Jagandeep Brar Date: Tue, 27 Apr 2021 16:14:56 -0500 Subject: [PATCH] fix(Settings): Safe-guard connection test headers map cast --- .../configuration_radarr/pages/connection_details.dart | 2 +- .../configuration_sonarr/pages/connection_details.dart | 3 ++- .../configuration_tautulli/pages/connection_details.dart | 7 ++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/modules/settings/routes/configuration_radarr/pages/connection_details.dart b/lib/modules/settings/routes/configuration_radarr/pages/connection_details.dart index 935e829e..20eceaab 100644 --- a/lib/modules/settings/routes/configuration_radarr/pages/connection_details.dart +++ b/lib/modules/settings/routes/configuration_radarr/pages/connection_details.dart @@ -135,7 +135,7 @@ class _State extends State<_Widget> with LunaScrollControllerMixin { Radarr( host: _profile.radarrHost, apiKey: _profile.radarrKey, - headers: Map.from(_profile.radarrHeaders), + headers: Map.from(_profile.radarrHeaders ?? {}), ) .system .status() diff --git a/lib/modules/settings/routes/configuration_sonarr/pages/connection_details.dart b/lib/modules/settings/routes/configuration_sonarr/pages/connection_details.dart index 45c826ff..6f5d443e 100644 --- a/lib/modules/settings/routes/configuration_sonarr/pages/connection_details.dart +++ b/lib/modules/settings/routes/configuration_sonarr/pages/connection_details.dart @@ -147,7 +147,8 @@ class _State extends State<_Widget> with LunaScrollControllerMixin { Sonarr( host: _profile.sonarrHost, apiKey: _profile.sonarrKey, - headers: Map.from(_profile.sonarrHeaders)) + headers: + Map.from(_profile.sonarrHeaders ?? {})) .system .getStatus() .then((_) => showLunaSuccessSnackBar( diff --git a/lib/modules/settings/routes/configuration_tautulli/pages/connection_details.dart b/lib/modules/settings/routes/configuration_tautulli/pages/connection_details.dart index f26ae0c8..4fd9be78 100644 --- a/lib/modules/settings/routes/configuration_tautulli/pages/connection_details.dart +++ b/lib/modules/settings/routes/configuration_tautulli/pages/connection_details.dart @@ -113,14 +113,14 @@ class _State extends State<_Widget> with LunaScrollControllerMixin { icon: Icons.wifi_tethering_rounded, onTap: () async { ProfileHiveObject _profile = Database.currentProfileObject; - if (_profile.tautulliHost == null || _profile.tautulliHost.isEmpty) { + if (_profile?.tautulliHost?.isEmpty ?? true) { showLunaErrorSnackBar( title: 'Host Required', message: 'Host is required to connect to Tautulli', ); return; } - if (_profile.tautulliKey == null || _profile.tautulliKey.isEmpty) { + if (_profile?.tautulliKey?.isEmpty ?? true) { showLunaErrorSnackBar( title: 'API Key Required', message: 'API key is required to connect to Tautulli', @@ -130,7 +130,8 @@ class _State extends State<_Widget> with LunaScrollControllerMixin { Tautulli( host: _profile.tautulliHost, apiKey: _profile.tautulliKey, - headers: Map.from(_profile.tautulliHeaders)) + headers: + Map.from(_profile?.tautulliHeaders ?? {})) .miscellaneous .arnold() .then((_) => showLunaSuccessSnackBar(