fix winToast crash on windows7

boyan01 · boyan01 · commit e1a1dfa14b6f · 2021-11-19T16:52:31.000+08:00
diff --git a/packages/win_toast/CHANGELOG.md b/packages/win_toast/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.0.2 21/11/19
+
+* fix cause crash on Windows 7.
+
 ## 0.0.1 21/9/27
 
 * add basic functions.
diff --git a/packages/win_toast/pubspec.yaml b/packages/win_toast/pubspec.yaml
@@ -1,6 +1,6 @@
 name: win_toast
 description: a plugin help flutter app show toast on windows platform.
-version: 0.0.1
+version: 0.0.2
 homepage: https://github.com/MixinNetwork/flutter-plugins/tree/main/packages/win_toast
 
 environment:
diff --git a/packages/win_toast/windows/win_toast_plugin.cpp b/packages/win_toast/windows/win_toast_plugin.cpp
@@ -39,7 +39,7 @@ class Toast {
     if (image.size() != 0) {
       toastTemplate_.setImagePath(string2wString(image));
     }
-    for (auto action : actions) {
+    for (auto action: actions) {
       toastTemplate_.addAction(string2wString(action));
     }
   }
@@ -170,6 +170,7 @@ void WinToastPlugin::HandleMethodCall(
     std::unique_ptr<flutter::MethodResult<flutter::EncodableValue>> result) {
   if (!WinToast::isCompatible()) {
     result->Error("1", "Error, your system in not supported!");
+    return;
   }
   if (method_call.method_name().compare("initialize") == 0) {
     auto *arguments = std::get_if<flutter::EncodableMap>(method_call.arguments());
@@ -189,7 +190,7 @@ void WinToastPlugin::HandleMethodCall(
     auto type = std::get<int>(arguments->at(flutter::EncodableValue("type")));
     auto actions = std::get<flutter::EncodableList>(arguments->at(flutter::EncodableValue("actions")));
     std::vector<std::string> action_strs;
-    for (auto const &action : actions) {
+    for (auto const &action: actions) {
       action_strs.push_back(std::get<std::string>(action));
     }
     auto toast = std::make_shared<Toast>(type, title, subtitle, imagePath, std::move(action_strs));

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ class Toast {`
`39`	`39`	`if (image.size() != 0) {`
`40`	`40`	`toastTemplate_.setImagePath(string2wString(image));`
`41`	`41`	`}`
`42`		`- for (auto action : actions) {`
	`42`	`+ for (auto action: actions) {`
`43`	`43`	`toastTemplate_.addAction(string2wString(action));`
`44`	`44`	`}`
`45`	`45`	`}`
`@@ -170,6 +170,7 @@ void WinToastPlugin::HandleMethodCall(`
`170`	`170`	`std::unique_ptr<flutter::MethodResult<flutter::EncodableValue>> result) {`
`171`	`171`	`if (!WinToast::isCompatible()) {`
`172`	`172`	`result->Error("1", "Error, your system in not supported!");`
	`173`	`+ return;`
`173`	`174`	`}`
`174`	`175`	`if (method_call.method_name().compare("initialize") == 0) {`
`175`	`176`	`auto *arguments = std::get_if<flutter::EncodableMap>(method_call.arguments());`
`@@ -189,7 +190,7 @@ void WinToastPlugin::HandleMethodCall(`
`189`	`190`	`auto type = std::get<int>(arguments->at(flutter::EncodableValue("type")));`
`190`	`191`	`auto actions = std::get<flutter::EncodableList>(arguments->at(flutter::EncodableValue("actions")));`
`191`	`192`	`std::vector<std::string> action_strs;`
`192`		`- for (auto const &action : actions) {`
	`193`	`+ for (auto const &action: actions) {`
`193`	`194`	`action_strs.push_back(std::get<std::string>(action));`
`194`	`195`	`}`
`195`	`196`	`auto toast = std::make_shared<Toast>(type, title, subtitle, imagePath, std::move(action_strs));`