Merge pull request #1407 from DafabHoid/dev

Downloader: Fix crash on loading unfinished downloads from .giga files
This commit is contained in:
Christian Schabesberger 2018-05-19 16:19:33 +02:00 committed by GitHub
commit f4a9ec15e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 8 deletions

View File

@ -5,6 +5,7 @@ import android.os.Looper;
import android.util.Log;
import java.io.File;
import java.io.ObjectInputStream;
import java.io.Serializable;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
@ -312,6 +313,13 @@ public class DownloadMission implements Serializable {
}
}
private void readObject(ObjectInputStream inputStream)
throws java.io.IOException, ClassNotFoundException
{
inputStream.defaultReadObject();
mListeners = new ArrayList<>();
}
private void deleteThisFromFile() {
new File(getMetaFilename()).delete();
}

View File

@ -12,6 +12,7 @@ import android.widget.Toast;
import org.schabi.newpipe.R;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
@ -59,12 +60,11 @@ public class Utility {
ObjectOutputStream objectOutputStream = null;
try {
objectOutputStream = new ObjectOutputStream(new FileOutputStream(fileName));
objectOutputStream = new ObjectOutputStream(new BufferedOutputStream(new FileOutputStream(fileName)));
objectOutputStream.writeObject(serializable);
} catch (Exception e) {
//nothing to do
}
} finally {
if(objectOutputStream != null) {
try {
objectOutputStream.close();
@ -73,6 +73,7 @@ public class Utility {
}
}
}
}
@Nullable
@SuppressWarnings("unchecked")