Skip to content

armgit / haven

Public Imported from GitHub
0

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

Merge branch 'master' of github.com:guardianproject/haven into room_experiments

Arka Prava Basu6a930cb91956
diff --cc src/main/java/org/havenapp/main/ui/EventActivity.java
index d92a7a4,b55f714..ee30ea1
--- a/src/main/java/org/havenapp/main/ui/EventActivity.java
+++ b/src/main/java/org/havenapp/main/ui/EventActivity.java
@@@ -164,10 -156,11 +164,11 @@@ public class EventActivity extends AppC
//convert from paths to Android friendly Parcelable Uri's
for (EventTrigger trigger : mEvent.getEventTriggers())
{
- if (trigger.getMPath() == null)
+ // ignore triggers for which we do not have valid file/file-paths
- if (trigger.getMimeType() == null || trigger.getPath() == null)
++ if (trigger.getMimeType() == null || trigger.getMPath() == null)
continue;
- File fileIn = new File(trigger.getPath());
+ File fileIn = new File(trigger.getMPath());
Uri u = Uri.fromFile(fileIn);
uris.add(u);
}