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

…xperiments
guardianproject · Jul 2, 2018 · 6a930cb · 6a930cb
2 parents a77960d + f954729
commit 6a930cb
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/main/java/org/havenapp/main/ui/EventActivity.java b/src/main/java/org/havenapp/main/ui/EventActivity.java
@@ -164,7 +164,8 @@ private void shareEvent ()
         //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.getMPath() == null)
                 continue;
 
             File fileIn = new File(trigger.getMPath());