mirrors/NewPipe
1
0
Fork 0
mirror of https://github.com/TeamNewPipe/NewPipe synced 2024-07-02 01:53:19 +00:00
Code Issues Releases Wiki Activity

make progress notification for Tor downloader (closes #39)

Browse Source
This commit is contained in:
Hans-Christoph Steiner 2016-01-03 00:04:55 +01:00
parent 0bb0226bc2
commit 9127f7f0c2
2 changed files with 51 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/schabi/newpipe/DownloadDialog.java
View File

@ -90,7 +90,7 @@ public class DownloadDialog extends DialogFragment {
String saveFilePath = dir + "/" + title + suffix; String saveFilePath = dir + "/" + title + suffix;
if (App.isUsingTor()) { if (App.isUsingTor()) {
// if using Tor, do not use DownloadManager because the proxy cannot be set // if using Tor, do not use DownloadManager because the proxy cannot be set
Downloader.downloadFile(url, saveFilePath); Downloader.downloadFile(getContext(), url, saveFilePath);
} else { } else {
DownloadManager dm = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE); DownloadManager dm = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
DownloadManager.Request request = new DownloadManager.Request( DownloadManager.Request request = new DownloadManager.Request(

53
app/src/main/java/org/schabi/newpipe/Downloader.java
View File

@ -1,6 +1,12 @@
package org.schabi.newpipe; package org.schabi.newpipe;
import android.app.Notification;
import android.app.NotificationManager;
import android.content.Context;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.support.v4.app.NotificationCompat;
import android.util.Log; import android.util.Log;
import java.io.BufferedInputStream; import java.io.BufferedInputStream;
@ -114,8 +120,28 @@ public class Downloader {
* @param saveFilePath path of the directory to save the file * @param saveFilePath path of the directory to save the file
* @throws IOException * @throws IOException
*/ */
public static void downloadFile(final String fileURL, final String saveFilePath) { public static void downloadFile(final Context context, final String fileURL, final String saveFilePath) {
new AsyncTask<Void, Void, Void>() { new AsyncTask<Void, Integer, Void>() {
private NotificationManager nm;
private NotificationCompat.Builder builder;
private int notifyId = 0x1234;
private int fileSize = 0xffffffff;
@Override
protected void onPreExecute() {
super.onPreExecute();
nm = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
Drawable icon = context.getResources().getDrawable(R.mipmap.ic_launcher);
builder = new NotificationCompat.Builder(context)
.setSmallIcon(android.R.drawable.stat_sys_download)
.setLargeIcon(((BitmapDrawable) icon).getBitmap())
.setContentTitle(saveFilePath.substring(saveFilePath.lastIndexOf('/') + 1))
.setContentText(saveFilePath)
.setProgress(fileSize, 0, false);
nm.notify(notifyId, builder.build());
}
@Override @Override
protected Void doInBackground(Void... voids) { protected Void doInBackground(Void... voids) {
HttpsURLConnection con = null; HttpsURLConnection con = null;
@ -125,17 +151,26 @@ public class Downloader {
// always check HTTP response code first // always check HTTP response code first
if (responseCode == HttpURLConnection.HTTP_OK) { if (responseCode == HttpURLConnection.HTTP_OK) {
fileSize = con.getContentLength();
InputStream inputStream = new BufferedInputStream(con.getInputStream()); InputStream inputStream = new BufferedInputStream(con.getInputStream());
FileOutputStream outputStream = new FileOutputStream(saveFilePath); FileOutputStream outputStream = new FileOutputStream(saveFilePath);
int bufferSize = 8192;
int downloaded = 0;
int bytesRead = -1; int bytesRead = -1;
byte[] buffer = new byte[8192]; byte[] buffer = new byte[bufferSize];
while ((bytesRead = inputStream.read(buffer)) != -1) { while ((bytesRead = inputStream.read(buffer)) != -1) {
outputStream.write(buffer, 0, bytesRead); outputStream.write(buffer, 0, bytesRead);
downloaded += bytesRead;
if (downloaded % 50000 < bufferSize) {
publishProgress(downloaded);
}
} }
outputStream.close(); outputStream.close();
inputStream.close(); inputStream.close();
publishProgress(bufferSize);
} else { } else {
Log.i(TAG, "No file to download. Server replied HTTP code: " + responseCode); Log.i(TAG, "No file to download. Server replied HTTP code: " + responseCode);
@ -150,6 +185,18 @@ public class Downloader {
} }
return null; return null;
} }
@Override
protected void onProgressUpdate(Integer... progress) {
builder.setProgress(fileSize, progress[0], false);
nm.notify(notifyId, builder.build());
}
@Override
protected void onPostExecute(Void aVoid) {
super.onPostExecute(aVoid);
nm.cancel(notifyId);
}
}.execute(); }.execute();
} }