if video is activated, don't send still photo notifications

n8fr8 · n8fr8 · commit 37a6c9d6bcec · 2018-07-15T23:50:56.000-04:00
diff --git a/src/main/java/org/havenapp/main/service/MonitorService.java b/src/main/java/org/havenapp/main/service/MonitorService.java
@@ -305,9 +305,10 @@ else if (mPrefs.getNotificationTimeMs() > 0 && mLastNotification != null)
             //check if time window is within configured notification time window
             doNotification = ((now.getTime()-mLastNotification.getTime())>mPrefs.getNotificationTimeMs());
         }
-        else
+
+        if (doNotification)
         {
-            doNotification = true;
+            doNotification = !(mPrefs.getVideoMonitoringActive() && alertType == EventTrigger.CAMERA);
         }
 
         EventTrigger eventTrigger = new EventTrigger();

Original file line number	Diff line number	Diff line change
`@@ -305,9 +305,10 @@ else if (mPrefs.getNotificationTimeMs() > 0 && mLastNotification != null)`
`305`	`305`	`//check if time window is within configured notification time window`
`306`	`306`	`doNotification = ((now.getTime()-mLastNotification.getTime())>mPrefs.getNotificationTimeMs());`
`307`	`307`	`}`
`308`		`- else`
	`308`	`+`
	`309`	`+ if (doNotification)`
`309`	`310`	`{`
`310`		`- doNotification = true;`
	`311`	`+ doNotification = !(mPrefs.getVideoMonitoringActive() && alertType == EventTrigger.CAMERA);`
`311`	`312`	`}`
`312`	`313`
`313`	`314`	`EventTrigger eventTrigger = new EventTrigger();`