Haven is for people who need a way to protect their personal spaces and possessions without compromising their own privacy, through an Android app and on-device sensors
Lint: recommended performance changes
fattired2d4f541ece3
diff --git a/src/main/java/org/havenapp/main/model/Event.java b/src/main/java/org/havenapp/main/model/Event.javaindex 581bc4d..ceb0bbb 100644--- a/src/main/java/org/havenapp/main/model/Event.java+++ b/src/main/java/org/havenapp/main/model/Event.java@@ -42,8 +42,7 @@ public class Event extends SugarRecord {if (mEventTriggers.size() == 0) {List<EventTrigger> eventTriggers = EventTrigger.find(EventTrigger.class, "M_EVENT_ID = ?", getId() + "");- for (EventTrigger et : eventTriggers)- mEventTriggers.add(et);+ mEventTriggers.addAll(eventTriggers);}diff --git a/src/main/java/org/havenapp/main/service/WebServer.java b/src/main/java/org/havenapp/main/service/WebServer.javaindex 8eeb8e6..b4da2b6 100644--- a/src/main/java/org/havenapp/main/service/WebServer.java+++ b/src/main/java/org/havenapp/main/service/WebServer.java@@ -5,6 +5,9 @@ import android.net.Uri;import android.text.TextUtils;import android.util.Log;+import org.havenapp.main.model.Event;+import org.havenapp.main.model.EventTrigger;+import java.io.File;import java.io.FileInputStream;import java.io.IOException;@@ -14,8 +17,6 @@ import java.util.List;import java.util.UUID;import fi.iki.elonen.NanoHTTPD;-import org.havenapp.main.model.Event;-import org.havenapp.main.model.EventTrigger;/*** Created by n8fr8 on 6/25/17.@@ -95,7 +96,7 @@ public class WebServer extends NanoHTTPD {}else {- page.append("<html><head><title>" + appTitle + "</title>");+ page.append("<html><head><title>").append(appTitle).append("</title>");page.append("<meta http-equiv=\"Content-Type\" content=\"application/xhtml+xml; charset=utf-8\" />");page.append("<meta name = \"viewport\" content = \"user-scalable=no, initial-scale=1.0, maximum-scale=1.0, width=device-width\">");page.append("</head><body>");@@ -165,13 +166,13 @@ public class WebServer extends NanoHTTPD {if (eventTrigger.getType() == EventTrigger.CAMERA){page.append("<img src=\"").append(mediaPath).append("\" width=\"100%\"/>");- page.append("<a href=\"" + mediaPath + "\">Download Media").append("</a>");+ page.append("<a href=\"").append(mediaPath).append("\">Download Media").append("</a>");}else if (eventTrigger.getType() == EventTrigger.MICROPHONE){page.append("<audio src=\"").append(mediaPath).append("\"></audio>");- page.append("<a href=\"" + mediaPath + "\">Download Media").append("</a>");+ page.append("<a href=\"").append(mediaPath).append("\">Download Media").append("</a>");}diff --git a/src/main/java/org/havenapp/main/ui/EventActivity.java b/src/main/java/org/havenapp/main/ui/EventActivity.javaindex 27e3fe7..861016b 100644--- a/src/main/java/org/havenapp/main/ui/EventActivity.java+++ b/src/main/java/org/havenapp/main/ui/EventActivity.java@@ -159,11 +159,11 @@ public class EventActivity extends AppCompatActivity {for (EventTrigger eventTrigger : mEvent.getEventTriggers()) {- mEventLog.append("Event Triggered @ " + eventTrigger.getTriggerTime().toLocaleString()).append("\n");+ mEventLog.append("Event Triggered @ ").append(eventTrigger.getTriggerTime().toString()).append("\n");String sType = eventTrigger.getStringType(this);- mEventLog.append("Event Type: " + sType);+ mEventLog.append("Event Type: ").append(sType);mEventLog.append("\n==========================\n");}