From 79fb05439bedb7f42805803f7a359b4841c8a655 Mon Sep 17 00:00:00 2001 From: Kha Truong <64438356+khatruong2009@users.noreply.github.com> Date: Wed, 28 Jun 2023 11:33:21 -0700 Subject: [PATCH 1/4] datastore-flutter events update 1. Changed the argument for Amplify.Hub.listen because it does not expect a list. 2. Changed the type of the stream variable to DataStoreHubEvent to match the expected class. --- src/fragments/lib-v1/datastore/flutter/datastore-events.mdx | 4 ++-- src/fragments/lib/datastore/flutter/datastore-events.mdx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/fragments/lib-v1/datastore/flutter/datastore-events.mdx b/src/fragments/lib-v1/datastore/flutter/datastore-events.mdx index 31b57a979ec..70dafc7230a 100644 --- a/src/fragments/lib-v1/datastore/flutter/datastore-events.mdx +++ b/src/fragments/lib-v1/datastore/flutter/datastore-events.mdx @@ -11,7 +11,7 @@ class MyApp extends StatefulWidget { } class _MyAppState extends State { - StreamSubscription? stream; + late StreamSubscription? stream; // Initialize a boolean indicating if the network is up bool networkIsUp = false; @@ -20,7 +20,7 @@ class _MyAppState extends State { ... void observeEvents() { - stream = Amplify.Hub.listen([HubChannel.DataStore], (hubEvent) { + stream = Amplify.Hub.listen(HubChannel.DataStore, (hubEvent) { if (hubEvent.eventName == 'networkStatus') { setState(() { final status = hubEvent.payload as NetworkStatusEvent?; diff --git a/src/fragments/lib/datastore/flutter/datastore-events.mdx b/src/fragments/lib/datastore/flutter/datastore-events.mdx index 31b57a979ec..70dafc7230a 100644 --- a/src/fragments/lib/datastore/flutter/datastore-events.mdx +++ b/src/fragments/lib/datastore/flutter/datastore-events.mdx @@ -11,7 +11,7 @@ class MyApp extends StatefulWidget { } class _MyAppState extends State { - StreamSubscription? stream; + late StreamSubscription? stream; // Initialize a boolean indicating if the network is up bool networkIsUp = false; @@ -20,7 +20,7 @@ class _MyAppState extends State { ... void observeEvents() { - stream = Amplify.Hub.listen([HubChannel.DataStore], (hubEvent) { + stream = Amplify.Hub.listen(HubChannel.DataStore, (hubEvent) { if (hubEvent.eventName == 'networkStatus') { setState(() { final status = hubEvent.payload as NetworkStatusEvent?; From 0bcf3db6eb28129dd8106960d93dacec17025b73 Mon Sep 17 00:00:00 2001 From: Kha Truong <64438356+khatruong2009@users.noreply.github.com> Date: Thu, 13 Jul 2023 09:43:45 -0700 Subject: [PATCH 2/4] removed duplicate from Kyle's PR --- .../lib-v1/datastore/flutter/datastore-events.mdx | 8 ++++---- src/fragments/lib/datastore/flutter/datastore-events.mdx | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/fragments/lib-v1/datastore/flutter/datastore-events.mdx b/src/fragments/lib-v1/datastore/flutter/datastore-events.mdx index 70dafc7230a..d61cb298827 100644 --- a/src/fragments/lib-v1/datastore/flutter/datastore-events.mdx +++ b/src/fragments/lib-v1/datastore/flutter/datastore-events.mdx @@ -11,7 +11,7 @@ class MyApp extends StatefulWidget { } class _MyAppState extends State { - late StreamSubscription? stream; + late StreamSubscription? hubSubscription; // Initialize a boolean indicating if the network is up bool networkIsUp = false; @@ -20,10 +20,10 @@ class _MyAppState extends State { ... void observeEvents() { - stream = Amplify.Hub.listen(HubChannel.DataStore, (hubEvent) { + hubSubscription = Amplify.Hub.listen(HubChannel.DataStore, (hubEvent) { if (hubEvent.eventName == 'networkStatus') { + final status = hubEvent.payload as NetworkStatusEvent?; setState(() { - final status = hubEvent.payload as NetworkStatusEvent?; networkIsUp = status?.active ?? false; }); } @@ -35,7 +35,7 @@ class _MyAppState extends State { @override void dispose() { - stream?.cancel(); + hubSubscription?.cancel(); super.dispose(); } } diff --git a/src/fragments/lib/datastore/flutter/datastore-events.mdx b/src/fragments/lib/datastore/flutter/datastore-events.mdx index 70dafc7230a..76418837a8e 100644 --- a/src/fragments/lib/datastore/flutter/datastore-events.mdx +++ b/src/fragments/lib/datastore/flutter/datastore-events.mdx @@ -11,7 +11,7 @@ class MyApp extends StatefulWidget { } class _MyAppState extends State { - late StreamSubscription? stream; + StreamSubscription? stream; // Initialize a boolean indicating if the network is up bool networkIsUp = false; @@ -20,7 +20,7 @@ class _MyAppState extends State { ... void observeEvents() { - stream = Amplify.Hub.listen(HubChannel.DataStore, (hubEvent) { + stream = Amplify.Hub.listen([HubChannel.DataStore], (hubEvent) { if (hubEvent.eventName == 'networkStatus') { setState(() { final status = hubEvent.payload as NetworkStatusEvent?; From ca2097305dc0e9ce1652140d4a6b146410fedb65 Mon Sep 17 00:00:00 2001 From: Kha Truong <64438356+khatruong2009@users.noreply.github.com> Date: Thu, 13 Jul 2023 09:44:27 -0700 Subject: [PATCH 3/4] removed duplicate part 2 --- src/fragments/lib/datastore/flutter/datastore-events.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fragments/lib/datastore/flutter/datastore-events.mdx b/src/fragments/lib/datastore/flutter/datastore-events.mdx index 76418837a8e..31b57a979ec 100644 --- a/src/fragments/lib/datastore/flutter/datastore-events.mdx +++ b/src/fragments/lib/datastore/flutter/datastore-events.mdx @@ -11,7 +11,7 @@ class MyApp extends StatefulWidget { } class _MyAppState extends State { - StreamSubscription? stream; + StreamSubscription? stream; // Initialize a boolean indicating if the network is up bool networkIsUp = false; From f678080fe83a2c88c674fa1ee41db4c9860e6cbb Mon Sep 17 00:00:00 2001 From: Katie Goines <30757403+katiegoines@users.noreply.github.com> Date: Tue, 18 Jul 2023 11:09:42 -0700 Subject: [PATCH 4/4] Update datastore-events.mdx commit to trigger required checks --- src/fragments/lib-v1/datastore/flutter/datastore-events.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fragments/lib-v1/datastore/flutter/datastore-events.mdx b/src/fragments/lib-v1/datastore/flutter/datastore-events.mdx index d61cb298827..fe15ee25093 100644 --- a/src/fragments/lib-v1/datastore/flutter/datastore-events.mdx +++ b/src/fragments/lib-v1/datastore/flutter/datastore-events.mdx @@ -13,7 +13,7 @@ class MyApp extends StatefulWidget { class _MyAppState extends State { late StreamSubscription? hubSubscription; - // Initialize a boolean indicating if the network is up + // Initialize a boolean indicating if the network is up bool networkIsUp = false; // Initialize the libraries