Closes #750

Adamantcheese · Feb 28, 2020 · fe18ce8 · fe18ce8
1 parent 8a67f8e
commit fe18ce8
Showing 1 changed file with 6 additions and 13 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,7 +236,6 @@ 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);
@@ -318,7 +317,7 @@ public long open(DataSpec dataSpec)
         }
 
         transferStarted(dataSpec);
-        opened = true;
+
         return bytesRemaining;
     }
 
@@ -349,7 +348,7 @@ public int read(byte[] buffer, int offset, int readLength)
             return C.RESULT_END_OF_INPUT;
         }
 
-        int readBytes = 0;
+        int readBytes;
         int maxReadableBytes = (int) Math.min(bytesRemaining(), readLength);
 
         Range<Long> cachedRange = activeRegionStats.findCachedRange(pos);
@@ -416,16 +415,10 @@ public void close()
             throws IOException {
         Logger.i(TAG, "close");
         clearListeners();
-        try {
-            if (dataSource != null) {
-                dataSource.close();
-                dataSource = null;
-            }
-        } finally {
-            if (opened) {
-                opened = false;
-                transferEnded();
-            }
+        if (dataSource != null) {
+            dataSource.close();
+            transferEnded();
+            dataSource = null;
         }
     }