(#750) Revert webm streaming to the working state

Adamantcheese · Feb 28, 2020 · 2aa1914 · 2aa1914
1 parent 7573246
commit 2aa1914
Showing 1 changed file with 13 additions and 10 deletions.
diff --git a/...rc/main/java/com/github/adamantcheese/chan/core/cache/stream/WebmStreamingDataSource.java b/...rc/main/java/com/github/adamantcheese/chan/core/cache/stream/WebmStreamingDataSource.java
@@ -236,6 +236,7 @@ byte[] getCacheBytes() {
     private long fileLength = C.LENGTH_UNSET;
 
     private boolean prepared = false;
+    private boolean opened = false;
 
     public WebmStreamingDataSource(@Nullable Uri uri, RawFile file, FileManager fileManager) {
         super(/* isNetwork= */ true);
@@ -311,13 +312,13 @@ public long open(DataSpec dataSpec)
         activeRegionStats = partialFileCache.getRegionStats(new Range<>(pos, end));
         httpActiveRange = null;
 
-        Logger.i(TAG, "bytes remaining: " + bytesRemaining);
         if (bytesRemaining < 0) {
             throw new EOFException();
         }
 
         transferStarted(dataSpec);
-
+        opened = true;
+
         return bytesRemaining;
     }
 
@@ -411,14 +412,16 @@ public Uri getUri() {
     }
 
     @Override
-    public void close()
-            throws IOException {
-        Logger.i(TAG, "close");
-        clearListeners();
-        if (dataSource != null) {
-            dataSource.close();
-            transferEnded();
-            dataSource = null;
+    public void close() throws IOException {
+        try {
+            if (dataSource != null) {
+                dataSource.close();
+            }
+        } finally {
+            if (opened) {
+                opened = false;
+                transferEnded();
+            }
         }
     }