Merge branch 'develop' into feature/visual-editor

Conflicts: WordPress/src/main/java/org/wordpress/android/ui/media/services/MediaUploadEvents.java
wordpress-mobile · Dec 2, 2015 · d037515 · d037515
2 parents 4171cfd + 4c4594c
commit d037515
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/WordPressUtils/src/main/java/org/wordpress/android/util/MediaUtils.java b/WordPressUtils/src/main/java/org/wordpress/android/util/MediaUtils.java
@@ -68,7 +68,7 @@ public static boolean isVideo(String url) {
         }
         return url.endsWith(".ogv") || url.endsWith(".mp4") || url.endsWith(".m4v") || url.endsWith(".mov") ||
                 url.endsWith(".wmv") || url.endsWith(".avi") || url.endsWith(".mpg") || url.endsWith(".3gp") ||
-                url.endsWith(".3g2");
+                url.endsWith(".3g2") || url.contains("video");
     }
 
     public static boolean isAudio(String url) {

diff --git a/WordPressUtils/src/main/java/org/wordpress/android/util/SqlUtils.java b/WordPressUtils/src/main/java/org/wordpress/android/util/SqlUtils.java
@@ -118,6 +118,7 @@ public static boolean dropAllTables(SQLiteDatabase db) throws SQLiteException {
             return true;
         } finally {
             db.endTransaction();
+            closeCursor(cursor);
         }
     }