From 7ca4b02e6decd8ad8e59337102de661bdbc43719 Mon Sep 17 00:00:00 2001
From: estevez-dev <vyalov.egor@gmail.com>
Date: Mon, 26 Aug 2019 18:30:04 +0300
Subject: [PATCH] Resolves#413 Handling removed mobile_app integration

---
 lib/home_assistant.class.dart | 66 ++++++++++++++++++++---------------
 1 file changed, 37 insertions(+), 29 deletions(-)

diff --git a/lib/home_assistant.class.dart b/lib/home_assistant.class.dart
index 4bcd7f7..f2cc39e 100644
--- a/lib/home_assistant.class.dart
+++ b/lib/home_assistant.class.dart
@@ -147,45 +147,37 @@ class HomeAssistant {
           includeAuthHeader: false,
           data: json.encode(updateData)
       ).then((response) {
-        Logger.d("App registration works fine");
-        if (showOkDialog) {
-          eventBus.fire(ShowPopupDialogEvent(
-            title: "All good",
-            body: "HA Client integration with your Home Assistant server works fine",
-            positiveText: "Nice!",
-            negativeText: "Ok"
-          ));
+        if (response == null || response.isEmpty) {
+          Logger.d("No registration data in response. MobileApp integration was removed");
+          _askToRegisterApp();
+        } else {
+          Logger.d("App registration works fine");
+          if (showOkDialog) {
+            eventBus.fire(ShowPopupDialogEvent(
+                title: "All good",
+                body: "HA Client integration with your Home Assistant server works fine",
+                positiveText: "Nice!",
+                negativeText: "Ok"
+            ));
+          }
         }
         completer.complete();
       }).catchError((e) {
         if (e['code'] != null && e['code'] == 410) {
           Logger.e("MobileApp integration was removed");
-          eventBus.fire(ShowPopupDialogEvent(
-            title: "App integration was removed",
-            body: "Looks like app integration was removed from your Home Assistant. HA Client needs to be registered on your Home Assistant server to make it possible to use notifications and other useful stuff.",
-            positiveText: "Register now",
-            negativeText: "Cancel",
-            onPositive: () {
-              SharedPreferences.getInstance().then((prefs) {
-                prefs.remove("app-webhook-id");
-                Connection().webhookId = null;
-                HomeAssistant().checkAppRegistration();
-              });
-            },
-          ));
+          _askToRegisterApp();
         } else {
           Logger.e("Error updating app registration: ${e.toString()}");
           eventBus.fire(ShowPopupDialogEvent(
             title: "App integration is not working properly",
-            body: "Something wrong with HA Client integration on your Home Assistant server. Try to remove current app integration from Configuration -> Integrationds using web UI, restart your Home Assistant and go back to the app. NOTE that after clicking 'Ok' current integration data will be removed from the app and new integration wll be created on Home Assistant side on next app launch.",
-            positiveText: "Ok",
-            negativeText: "I'll handle it",
+            body: "Something wrong with HA Client integration on your Home Assistant server. Please report this issue.",
+            positiveText: "Report to GitHub",
+            negativeText: "Report to Discord",
             onPositive: () {
-              SharedPreferences.getInstance().then((prefs) {
-                prefs.remove("app-webhook-id");
-                Connection().webhookId = null;
-                HAUtils.launchURL(Connection().httpWebHost+"/config/integrations/dashboard");
-              });
+              HAUtils.launchURL("https://github.com/estevez-dev/ha_client/issues/new");
+            },
+            onNegative: () {
+              HAUtils.launchURL("https://discord.gg/AUzEvwn");
             },
           ));
         }
@@ -195,6 +187,22 @@ class HomeAssistant {
     }
   }
 
+  void _askToRegisterApp() {
+    eventBus.fire(ShowPopupDialogEvent(
+      title: "App integration was removed",
+      body: "Looks like app integration was removed from your Home Assistant. HA Client needs to be registered on your Home Assistant server to make it possible to use notifications and other useful stuff.",
+      positiveText: "Register now",
+      negativeText: "Cancel",
+      onPositive: () {
+        SharedPreferences.getInstance().then((prefs) {
+          prefs.remove("app-webhook-id");
+          Connection().webhookId = null;
+          HomeAssistant().checkAppRegistration();
+        });
+      },
+    ));
+  }
+
   Future _getConfig() async {
     await Connection().sendSocketMessage(type: "get_config").then((data) {
       _instanceConfig = Map.from(data);