Merge pull request #248 from Hyrules/dev

Dev
Hyrules · Jul 4, 2019 · b32d277 · b32d277
2 parents 10d6e1b + b25153f
commit b32d277
Show file tree

Hide file tree

Showing 10 changed files with 85 additions and 76 deletions.
diff --git a/WinHue3/Build/README_TEMPLATE.txt b/WinHue3/Build/README_TEMPLATE.txt
@@ -7,15 +7,14 @@ You might also need Visual C++ 2010 Redistributable library.
 Both are available at Microsoft's website. 
 
 Fixed:
-- Unable to save rules or edit them.
-- No Archetype resulting in an exception while getting the light type.
-- Http send command error.
+- Time property is deprecated and will be removed eventually. This fixes crashes when deserializing schedules.
+- Fixed a crash resuming from sleep.
 
 Added:
-- Smaller icon view. 
+- 
 
 Changed:
-- Replace webclient with Httpclient. 
+- 
 
 Updated :
 - 

diff --git a/WinHue3/Philips Hue/BridgeObject/Bridge_Methods.cs b/WinHue3/Philips Hue/BridgeObject/Bridge_Methods.cs
@@ -166,7 +166,7 @@ public string SendRawCommand(string url, string data, WebRequestType type)
                     LastCommandMessages.AddMessage(Serializer.DeserializeToObject<List<IMessage>>(comres.Data));
                 return comres.Data;
             }
-            BridgeNotResponding.Invoke(this, new BridgeNotRespondingEventArgs(this, url, WebExceptionStatus.NameResolutionFailure));
+            BridgeNotResponding?.Invoke(this, new BridgeNotRespondingEventArgs(this, url, WebExceptionStatus.NameResolutionFailure));
             return null;
         }
 
@@ -187,7 +187,7 @@ public async Task<string> SendRawCommandAsyncTask(string url, string data, WebRe
                     LastCommandMessages.AddMessage(Serializer.DeserializeToObject<List<IMessage>>(comres.Data));
                 return comres.Data;
             }
-            BridgeNotResponding.Invoke(this, new BridgeNotRespondingEventArgs(this, url, WebExceptionStatus.NameResolutionFailure));
+            BridgeNotResponding?.Invoke(this, new BridgeNotRespondingEventArgs(this, url, WebExceptionStatus.NameResolutionFailure));
             return null;
         }
 

diff --git a/WinHue3/Philips Hue/BridgeObject/Bridge_ObjectFinder.cs b/WinHue3/Philips Hue/BridgeObject/Bridge_ObjectFinder.cs
@@ -22,7 +22,7 @@ public async Task<bool> StartNewObjectsSearchAsyncTask(Type objecttype)
                 LastCommandMessages.AddMessage(Serializer.DeserializeToObject<List<IMessage>>(comres.Data));
                 return true;
             }
-            BridgeNotResponding.Invoke(this, new BridgeNotRespondingEventArgs(this, BridgeUrl + $"/{typename}", WebExceptionStatus.NameResolutionFailure));
+            BridgeNotResponding?.Invoke(this, new BridgeNotRespondingEventArgs(this, BridgeUrl + $"/{typename}", WebExceptionStatus.NameResolutionFailure));
             return false;
         }
 
@@ -34,7 +34,7 @@ public async Task<bool> TouchLink()
                 LastCommandMessages.AddMessage(Serializer.DeserializeToObject<List<IMessage>>(comres.Data));
                 return true;
             }
-            BridgeNotResponding.Invoke(this, new BridgeNotRespondingEventArgs(this, BridgeUrl + "/config", WebExceptionStatus.NameResolutionFailure));
+            BridgeNotResponding?.Invoke(this, new BridgeNotRespondingEventArgs(this, BridgeUrl + "/config", WebExceptionStatus.NameResolutionFailure));
             return false;
         }
 
@@ -60,7 +60,7 @@ public async Task<bool> FindNewLightsAsync(string serialslist = null)
                 LastCommandMessages.AddMessage(Serializer.DeserializeToObject<List<IMessage>>(comres.Data));
                 return true;
             }
-            BridgeNotResponding.Invoke(this, new BridgeNotRespondingEventArgs(this, BridgeUrl + $"/lights", WebExceptionStatus.NameResolutionFailure));
+            BridgeNotResponding?.Invoke(this, new BridgeNotRespondingEventArgs(this, BridgeUrl + $"/lights", WebExceptionStatus.NameResolutionFailure));
             return false;
         }
     }

diff --git a/WinHue3/Philips Hue/BridgeObject/Bridge_ObjectGetter.cs b/WinHue3/Philips Hue/BridgeObject/Bridge_ObjectGetter.cs
@@ -45,7 +45,7 @@ public List<T> GetListObjects<T>(bool showhidden = false) where T : IHueObject
                 LastCommandMessages.AddMessage(Serializer.DeserializeToObject<List<IMessage>>(comres.Data));
                 return null;
             }
-            BridgeNotResponding.Invoke(this, new BridgeNotRespondingEventArgs(this,url,WebExceptionStatus.NameResolutionFailure));
+            BridgeNotResponding?.Invoke(this, new BridgeNotRespondingEventArgs(this,url,WebExceptionStatus.NameResolutionFailure));
             return null;
         }
 
@@ -85,7 +85,7 @@ public async Task<List<T>> GetListObjectsAsync<T>(bool showmyhidden = false, boo
                 LastCommandMessages.AddMessage(Serializer.DeserializeToObject<List<IMessage>>(comres.Data));
                 return null;
             }
-            BridgeNotResponding.Invoke(this,new BridgeNotRespondingEventArgs(this,url,WebExceptionStatus.NameResolutionFailure));
+            BridgeNotResponding?.Invoke(this,new BridgeNotRespondingEventArgs(this,url,WebExceptionStatus.NameResolutionFailure));
             return null;
         }
 
@@ -123,7 +123,7 @@ public async Task<List<IHueObject>> GetAllObjectsAsync(bool showmyhidden = false
                 LastCommandMessages.AddMessage(Serializer.DeserializeToObject<List<IMessage>>(comres.Data));
                 return null;
             }
-            BridgeNotResponding.Invoke(this, new BridgeNotRespondingEventArgs(this, url, WebExceptionStatus.NameResolutionFailure));
+            BridgeNotResponding?.Invoke(this, new BridgeNotRespondingEventArgs(this, url, WebExceptionStatus.NameResolutionFailure));
 
             return huelist;
         }
@@ -157,7 +157,7 @@ public List<IHueObject> GetAllObjects(bool showhidden = false, bool getgroupzero
                 LastCommandMessages.AddMessage(Serializer.DeserializeToObject<List<IMessage>>(comres.Data));
                 return null;
             }
-            BridgeNotResponding.Invoke(this, new BridgeNotRespondingEventArgs(this, url, WebExceptionStatus.NameResolutionFailure));
+            BridgeNotResponding?.Invoke(this, new BridgeNotRespondingEventArgs(this, url, WebExceptionStatus.NameResolutionFailure));
 
             return huelist;
         }
@@ -192,7 +192,7 @@ public async Task<T> GetObjectAsync<T>(string id) where T : IHueObject
                 LastCommandMessages.AddMessage(Serializer.DeserializeToObject<List<IMessage>>(comres.Data));
                 return default(T);
             }
-            BridgeNotResponding.Invoke(this, new BridgeNotRespondingEventArgs(this, url, WebExceptionStatus.NameResolutionFailure));
+            BridgeNotResponding?.Invoke(this, new BridgeNotRespondingEventArgs(this, url, WebExceptionStatus.NameResolutionFailure));
             return default(T);
         }
 
@@ -222,7 +222,7 @@ public T GetObject<T>(string id) where T : IHueObject
                 LastCommandMessages.AddMessage(Serializer.DeserializeToObject<List<IMessage>>(comres.Data));
                 return default;
             }
-            BridgeNotResponding.Invoke(this, new BridgeNotRespondingEventArgs(this, url, WebExceptionStatus.NameResolutionFailure));
+            BridgeNotResponding?.Invoke(this, new BridgeNotRespondingEventArgs(this, url, WebExceptionStatus.NameResolutionFailure));
             return default;
         }
 
@@ -252,7 +252,7 @@ public async Task<IHueObject> GetObjectAsync(string id, Type objecttype)
                 LastCommandMessages.AddMessage(Serializer.DeserializeToObject<List<IMessage>>(comres.Data));
                 return null;
             }
-            BridgeNotResponding.Invoke(this, new BridgeNotRespondingEventArgs(this, url, WebExceptionStatus.NameResolutionFailure));
+            BridgeNotResponding?.Invoke(this, new BridgeNotRespondingEventArgs(this, url, WebExceptionStatus.NameResolutionFailure));
             return null;
         }
 
@@ -283,7 +283,7 @@ public async Task<T> GetObjectAsync<T>(string id, Type objecttype) where T : IHu
                 LastCommandMessages.AddMessage(Serializer.DeserializeToObject<List<IMessage>>(comres.Data));
                 return default(T);
             }
-            BridgeNotResponding.Invoke(this, new BridgeNotRespondingEventArgs(this, url, WebExceptionStatus.NameResolutionFailure));
+            BridgeNotResponding?.Invoke(this, new BridgeNotRespondingEventArgs(this, url, WebExceptionStatus.NameResolutionFailure));
             return default(T);
         }
 
@@ -311,7 +311,7 @@ public SearchResult GetNewObjects<T>() where T : IHueObject
                 LastCommandMessages.AddMessage(Serializer.DeserializeToObject<List<IMessage>>(comres.Data));
                 return null;
             }
-            BridgeNotResponding.Invoke(this, new BridgeNotRespondingEventArgs(this, url, WebExceptionStatus.NameResolutionFailure));
+            BridgeNotResponding?.Invoke(this, new BridgeNotRespondingEventArgs(this, url, WebExceptionStatus.NameResolutionFailure));
             return null;
         }
 
@@ -334,7 +334,7 @@ public async Task<SearchResult> GetNewObjectsAsync<T>() where T : IHueObject
                 LastCommandMessages.AddMessage(Serializer.DeserializeToObject<List<IMessage>>(comres.Data));
                 return null;
             }
-            BridgeNotResponding.Invoke(this, new BridgeNotRespondingEventArgs(this, url, WebExceptionStatus.NameResolutionFailure));
+            BridgeNotResponding?.Invoke(this, new BridgeNotRespondingEventArgs(this, url, WebExceptionStatus.NameResolutionFailure));
             return null;
         }