#143 #44 #42 #22: Fixed some download problems with invalid directories or filenames. Added user Feedback. Different settings for audio and video download dir.

app/src/main/java/org/schabi/newpipe/Downloader.java

@@ -13,6 +13,7 @@ import android.util.Log;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
+import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -45,10 +46,32 @@ import info.guardianproject.netcipher.NetCipher;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public class Downloader {
+public class Downloader extends AsyncTask<Void, Integer, Void> {
     public static final String TAG = "Downloader";
     private static final String USER_AGENT = "Mozilla/5.0";
 
+    private NotificationManager nm;
+    private NotificationCompat.Builder builder;
+    private int notifyId = 0x1234;
+    private int fileSize = 0xffffffff;
+
+    private final Context context;
+    private final String fileURL;
+    private final File saveFilePath;
+    private final String title;
+
+    private final String debugContext;
+
+    public Downloader(Context context, String fileURL, File saveFilePath, String title) {
+        this.context = context;
+        this.fileURL = fileURL;
+        this.saveFilePath = saveFilePath;
+        this.title = title;
+
+        this.debugContext = "'" + fileURL +
+                "' => '" + saveFilePath + "'";
+    }
+
     /**Download the text file at the supplied URL as in download(String),
      * but set the HTTP header field "Accept-Language" to the supplied string.
      * @param siteUrl the URL of the text file to return the contents of
@@ -118,86 +141,96 @@ public class Downloader {
      *
      * @param fileURL      HTTP URL of the file to be downloaded
      * @param saveFilePath path of the directory to save the file
+     * @param title
      * @throws IOException
      */
-    public static void downloadFile(final Context context, final String fileURL, final String saveFilePath) {
-        new AsyncTask<Void, Integer, Void>() {
+    public static void downloadFile(final Context context, final String fileURL, final File saveFilePath, String title) {
+        new Downloader(context, fileURL, saveFilePath, title).execute();
+    }
 
-            private NotificationManager nm;
-            private NotificationCompat.Builder builder;
-            private int notifyId = 0x1234;
-            private int fileSize = 0xffffffff;
+    /** AsyncTask impl: executed in gui thread */
+    @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.getName())
+                .setContentText(saveFilePath.getAbsolutePath())
+                .setProgress(fileSize, 0, false);
+        nm.notify(notifyId, builder.build());
+    }
 
-            @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());
-            }
+    /** AsyncTask impl: executed in background thread does the download */
+    @Override
+    protected Void doInBackground(Void... voids) {
+        HttpsURLConnection con = null;
+        InputStream inputStream = null;
+        FileOutputStream outputStream = null;
+        try {
+            con = NetCipher.getHttpsURLConnection(fileURL);
+            int responseCode = con.getResponseCode();
 
-            @Override
-            protected Void doInBackground(Void... voids) {
-                HttpsURLConnection con = null;
-                try {
-                    con = NetCipher.getHttpsURLConnection(fileURL);
-                    int responseCode = con.getResponseCode();
+            // always check HTTP response code first
+            if (responseCode == HttpURLConnection.HTTP_OK) {
+                fileSize = con.getContentLength();
+                inputStream = new BufferedInputStream(con.getInputStream());
+                outputStream = new FileOutputStream(saveFilePath);
 
-                    // always check HTTP response code first
-                    if (responseCode == HttpURLConnection.HTTP_OK) {
-                        fileSize = con.getContentLength();
-                        InputStream inputStream = new BufferedInputStream(con.getInputStream());
-                        FileOutputStream outputStream = new FileOutputStream(saveFilePath);
+                int bufferSize = 8192;
+                int downloaded = 0;
 
-                        int bufferSize = 8192;
-                        int downloaded = 0;
-
-                        int bytesRead = -1;
-                        byte[] buffer = new byte[bufferSize];
-                        while ((bytesRead = inputStream.read(buffer)) != -1) {
-                            outputStream.write(buffer, 0, bytesRead);
-                            downloaded += bytesRead;
-                            if (downloaded % 50000 < bufferSize) {
-                                publishProgress(downloaded);
-                            }
-                        }
-
-                        outputStream.close();
-                        inputStream.close();
-                        publishProgress(bufferSize);
-
-                    } else {
-                        Log.i(TAG, "No file to download. Server replied HTTP code: " + responseCode);
-                    }
-                } catch (IOException e) {
-                    e.printStackTrace();
-                } finally {
-                    if (con != null) {
-                        con.disconnect();
-                        con = null;
+                int bytesRead = -1;
+                byte[] buffer = new byte[bufferSize];
+                while ((bytesRead = inputStream.read(buffer)) != -1) {
+                    outputStream.write(buffer, 0, bytesRead);
+                    downloaded += bytesRead;
+                    if (downloaded % 50000 < bufferSize) {
+                        publishProgress(downloaded);
                     }
                 }
-                return null;
-            }
 
-            @Override
-            protected void onProgressUpdate(Integer... progress) {
-                builder.setProgress(fileSize, progress[0], false);
-                nm.notify(notifyId, builder.build());
-            }
+                publishProgress(bufferSize);
 
-            @Override
-            protected void onPostExecute(Void aVoid) {
-                super.onPostExecute(aVoid);
-                nm.cancel(notifyId);
+            } else {
+                Log.i(TAG, "No file to download. Server replied HTTP code: " + responseCode);
             }
-        }.execute();
+        } catch (IOException e) {
+            Log.e(TAG, "No file to download. Server replied HTTP code: ", e);
+            e.printStackTrace();
+        } finally {
+            try {
+                if (outputStream != null) {
+                    outputStream.close();
+                    outputStream = null;
+                }
+                if (inputStream != null) {
+                    inputStream.close();
+                    inputStream = null;
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            if (con != null) {
+                con.disconnect();
+                con = 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);
     }
 
 }