Merge branch 'shahidtamboli/MOB-1593-hide-download-progress'

openedx-unsupported · Mar 18, 2015 · fe62403 · fe62403
2 parents 3f4568a + 591f1c6
commit fe62403
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/VideoLocker/src/main/java/org/edx/mobile/module/db/IDatabase.java b/VideoLocker/src/main/java/org/edx/mobile/module/db/IDatabase.java
@@ -171,7 +171,7 @@ public Integer updateVideoLastPlayedOffset(String videoId, int offset,
     public IVideoModel getVideoEntryByVideoId(String videoId, DataCallback<IVideoModel> callback);
 
     /**
-     * Returns {@link IVideoModel} for given videoUrl.
+     * Returns {@link IVideoModel} which is downloaded or download is in progress for given videoUrl.
      * @param videoUrl
      * @param callback
      * @return

diff --git a/VideoLocker/src/main/java/org/edx/mobile/module/db/impl/IDatabaseImpl.java b/VideoLocker/src/main/java/org/edx/mobile/module/db/impl/IDatabaseImpl.java
@@ -277,8 +277,9 @@ public IVideoModel getVideoEntryByVideoId(String videoId, final DataCallback<IVi
     public IVideoModel getVideoByVideoUrl(String videoUrl,
             DataCallback<IVideoModel> callback) {
         DbOperationGetVideo op = new DbOperationGetVideo(false,DbStructure.Table.DOWNLOADS, null, 
-                DbStructure.Column.URL + "=? AND "+ DbStructure.Column.USERNAME + "=?" , 
-                new String[] { videoUrl, username}, null);
+                DbStructure.Column.URL + "=? AND "+DbStructure.Column.DOWNLOADED + "!=? AND "
+                + DbStructure.Column.USERNAME + "=?" ,
+                new String[] { videoUrl, String.valueOf(DownloadedState.ONLINE.ordinal()), username}, null);
         op.setCallback(callback);
         return enqueue(op);
     }