From 84ec320df4f314cde85847e9f7d1373eb34740dc Mon Sep 17 00:00:00 2001
From: kapodamy <kapo.damy@yahoo.com.ar>
Date: Tue, 26 Nov 2019 13:41:16 -0300
Subject: [PATCH] commit * rebase fixup, add null check * better ETA string *
 drop connection read timeout, for HSDPA networks * bump NPE version

---
 app/build.gradle                                              | 2 +-
 .../main/java/org/schabi/newpipe/download/DownloadDialog.java | 2 +-
 app/src/main/java/us/shandian/giga/get/DownloadMission.java   | 3 +--
 .../main/java/us/shandian/giga/ui/adapter/MissionAdapter.java | 4 ++--
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index a1afd63a2..7e4707f99 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -62,7 +62,7 @@ dependencies {
         exclude module: 'support-annotations'
     })
 
-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:5c420340ceb39'
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:b6d3252'
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.mockito:mockito-core:2.23.0'
 
diff --git a/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java b/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
index 60b6192be..29208b0e0 100644
--- a/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
@@ -780,7 +780,7 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
 
                 if (selectedStream.getFormat() == MediaFormat.M4A) {
                     psName = Postprocessing.ALGORITHM_M4A_NO_DASH;
-                } else if (selectedStream.getFormat() == MediaFormat.OPUS) {
+                } else if (selectedStream.getFormat() == MediaFormat.WEBMA_OPUS) {
                     psName = Postprocessing.ALGORITHM_OGG_FROM_WEBM_DEMUXER;
                 }
                 break;
diff --git a/app/src/main/java/us/shandian/giga/get/DownloadMission.java b/app/src/main/java/us/shandian/giga/get/DownloadMission.java
index 917a0a148..c0f85b321 100644
--- a/app/src/main/java/us/shandian/giga/get/DownloadMission.java
+++ b/app/src/main/java/us/shandian/giga/get/DownloadMission.java
@@ -228,7 +228,6 @@ public class DownloadMission extends Mission {
 
         // BUG workaround: switching between networks can freeze the download forever
         conn.setConnectTimeout(30000);
-        conn.setReadTimeout(10000);
 
         if (rangeStart >= 0) {
             String req = "bytes=" + rangeStart + "-";
@@ -316,7 +315,7 @@ public class DownloadMission extends Mission {
     public synchronized void notifyError(int code, Exception err) {
         Log.e(TAG, "notifyError() code = " + code, err);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            if (err.getCause() instanceof ErrnoException) {
+            if (err != null && err.getCause() instanceof ErrnoException) {
                 int errno = ((ErrnoException) err.getCause()).errno;
                 if (errno == OsConstants.ENOSPC) {
                     code = ERROR_INSUFFICIENT_STORAGE;
diff --git a/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java b/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
index e3a7f112a..8420e343b 100644
--- a/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
+++ b/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
@@ -308,10 +308,10 @@ public class MissionAdapter extends Adapter<ViewHolder> implements Handler.Callb
                 etaStr = "";
             } else {
                 long eta = (long) Math.ceil((length - done) / averageSpeed);
-                etaStr = "  @ ".concat(Utility.stringifySeconds(eta));
+                etaStr = Utility.formatBytes((long) done) + "/" + Utility.stringifySeconds(eta) + "  ";
             }
 
-            h.size.setText(sizeStr.concat(speedStr).concat(etaStr));
+            h.size.setText(sizeStr.concat(etaStr).concat(speedStr));
 
             h.lastTimestamp = now;
             h.lastDone = done;