add check ip address before casting

Author: horihiro

src/esp8266-google-home-notifier.cpp

@@ -2,17 +2,7 @@
 
 char data[1024];
 
-boolean GoogleHomeNotifier::device(const char * name)
-{
-  return this->device(name, "en");
-}
-
-boolean GoogleHomeNotifier::device(const char * name, const char * locale)
-{
-  return GoogleHomeNotifier::device(name, locale, 10000);
-}
-
-boolean GoogleHomeNotifier::device(const char * name, const char * locale, int to)
+boolean GoogleHomeNotifier::device(const char *name, const char *locale = "en", int to = 10000)
 {
   int timeout = millis() + to;
   int n;
@@ -57,25 +47,29 @@ boolean GoogleHomeNotifier::device(const char * name, const char * locale, int t
   return true;
 }
 
-boolean GoogleHomeNotifier::ip(IPAddress ip, const char *locale)
+boolean GoogleHomeNotifier::ip(IPAddress ip, const char *locale = "en", uint16_t port = 8009)
 {
   this->m_ipaddress = ip;
-  this->m_port = 8009;
+  this->m_port = port;
   sprintf(this->m_locale, "%s", locale);
   return true;
 }
 
-boolean GoogleHomeNotifier::notify(const char * phrase) {
+boolean GoogleHomeNotifier::notify(const char *phrase) {
   return this->cast(phrase, NULL);
 }
 
-boolean GoogleHomeNotifier::play(const char * mp3Url) {
+boolean GoogleHomeNotifier::play(const char *mp3Url) {
   return this->cast(NULL, mp3Url);
 }
 
-boolean GoogleHomeNotifier::cast(const char * phrase, const char * mp3Url)
+boolean GoogleHomeNotifier::cast(const char *phrase, const char *mp3Url)
 {
   char error[128];
+  if((this->m_ipaddress[0] == 0 && this->m_ipaddress[1] == 0 && this->m_ipaddress[2] == 0 && this->m_ipaddress[3] == 0) || this->m_port == 0) {
+    this->setLastError("Google Home's IP address/port is not set. Call 'device' or 'ip' method before calling 'cast' method.");
+    return false;
+  }
   String speechUrl;
   if (phrase != NULL) {
     speechUrl = tts.getSpeechUrl(phrase, m_locale);
@@ -131,7 +125,7 @@ const uint16_t GoogleHomeNotifier::getPort()
   return m_port;
 }
 
-boolean GoogleHomeNotifier::sendMessage(const char* sourceId, const char* destinationId, const char* ns, const char* data)
+boolean GoogleHomeNotifier::sendMessage(const char *sourceId, const char *destinationId, const char *ns, const char *data)
 {
   extensions_api_cast_channel_CastMessage message = extensions_api_cast_channel_CastMessage_init_default;
 
@@ -267,7 +261,7 @@ boolean GoogleHomeNotifier::connect()
   return true;
 }
 
-boolean GoogleHomeNotifier::_play(const char * mp3url)
+boolean GoogleHomeNotifier::_play(const char *mp3url)
 {
   // send 'CONNECT' again
   sprintf(data, CASTV2_DATA_CONNECT);

src/esp8266-google-home-notifier.h

@@ -52,19 +52,17 @@ typedef class GoogleHomeNotifier {
   static bool encode_string(pb_ostream_t *stream, const pb_field_t *field, void * const *arg);
   static bool decode_string(pb_istream_t *stream, const pb_field_t *field, void **arg);
   boolean connect();
-  boolean _play(const char* mp3url);
+  boolean _play(const char *mp3url);
   void disconnect();
-  void setLastError(const char* lastError);
-  boolean sendMessage(const char* sourceId, const char* destinationId, const char* ns, const char* data);
-  boolean cast(const char * phrase, const char * mp3Url);
+  void setLastError(const char *lastError);
+  boolean sendMessage(const char *sourceId, const char *destinationId, const char *ns, const char *data);
+  boolean cast(const char *phrase, const char *mp3Url);
 
 public:
-  boolean device(const char * name); // locale = 'en', timeout = 10000
-  boolean device(const char * name, const char * locale); // timeout = 10000
-  boolean device(const char * name, const char * locale, int timeout);
-  boolean ip(IPAddress ip, const char *locale);
-  boolean notify(const char * phrase);
-  boolean play(const char * mp3Url);
+  boolean device(const char *name, const char *locale /* = 'en' */, int timeout /* = 10000 */);
+  boolean ip(IPAddress ip, const char *locale /* = 'en' */, uint16_t port /* = 8009 */ );
+  boolean notify(const char *phrase);
+  boolean play(const char *mp3Url);
   const IPAddress getIPAddress();
   const uint16_t getPort();
   const char * getLastError();