From 9a5e35b024eed80a64e2c96f715101ba4c5767c4 Mon Sep 17 00:00:00 2001 From: Yegor Vialov Date: Mon, 25 May 2020 12:34:53 +0000 Subject: [PATCH] Fix notification event data --- .../keyboardcrumbs/hassclient/NotificationActionReceiver.java | 3 +++ lib/main.dart | 4 +--- pubspec.yaml | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/android/app/src/main/java/com/keyboardcrumbs/hassclient/NotificationActionReceiver.java b/android/app/src/main/java/com/keyboardcrumbs/hassclient/NotificationActionReceiver.java index 949f37f..bc04126 100644 --- a/android/app/src/main/java/com/keyboardcrumbs/hassclient/NotificationActionReceiver.java +++ b/android/app/src/main/java/com/keyboardcrumbs/hassclient/NotificationActionReceiver.java @@ -48,6 +48,9 @@ public class NotificationActionReceiver extends BroadcastReceiver { } else { dataToSend.put("type", "fire_event"); requestData.put("event_type", "ha_client_event"); + JSONObject eventData = new JSONObject(); + eventData.put("action", actionData.getString("action")); + requestData.put("event_data", eventData); } dataToSend.put("data", requestData); String stringRequest = dataToSend.toString(); diff --git a/lib/main.dart b/lib/main.dart index 47ea6f3..5d6deb9 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -16,10 +16,8 @@ import 'package:http/http.dart' as http; import 'package:charts_flutter/flutter.dart' as charts; import 'package:flutter_markdown/flutter_markdown.dart'; import 'package:flutter_custom_tabs/flutter_custom_tabs.dart'; -//import 'package:firebase_messaging/firebase_messaging.dart'; import 'package:flutter_secure_storage/flutter_secure_storage.dart'; import 'package:device_info/device_info.dart'; -//import 'package:flutter_local_notifications/flutter_local_notifications.dart'; import 'package:in_app_purchase/in_app_purchase.dart'; import 'plugins/dynamic_multi_column_layout.dart'; import 'plugins/spoiler_card.dart'; @@ -161,7 +159,7 @@ EventBus eventBus = new EventBus(); //FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin = new FlutterLocalNotificationsPlugin(); const String appName = 'HA Client'; const String appVersion = String.fromEnvironment('versionName', defaultValue: '0.0.0'); -const whatsNewUrl = 'http://ha-client.app/service/whats_new_1.1.0.md'; +const whatsNewUrl = 'http://ha-client.app/service/whats_new_1.1.0-b2.md'; Future _reportError(dynamic error, dynamic stackTrace) async { // Print the exception to the console. diff --git a/pubspec.yaml b/pubspec.yaml index 1417da1..b504487 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: hass_client description: Home Assistant Android Client -version: 0.0.0+1147 +version: 0.0.0+1148 environment: