Skip to content

Fix/1311 #1345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix/1311 #1345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c5faaa3
check mTask in FileDownloadMessenger.notifyProgress
zahrayousefijamarani Jun 16, 2020
229fb64
check mTask in FileDownloadMessenger
zahrayousefijamarani Jun 17, 2020
0bd1e1a
check mTask in FileDownloadMessenger
zahrayousefijamarani Jun 17, 2020
6a2ccc7
delete log from mainActivity
zahrayousefijamarani Jun 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,21 @@
buildscript {
repositories {
maven {
url "https://plugins.gradle.org/m2/"
}
jcenter()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.3.1'
classpath 'com.android.tools.build:gradle:3.4.1'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
}
}

allprojects {
repositories {
jcenter()
google()
jcenter()
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
21 changes: 21 additions & 0 deletions library/src/main/java/com/liulishuo/filedownloader/FileDownloadMessenger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,13 @@ public void notifyConnected(MessageSnapshot snapshot) {

@Override
public void notifyProgress(MessageSnapshot snapshot) {
if (mTask == null) {
if (FileDownloadLog.NEED_LOG) {
FileDownloadLog.d(this, "can't notify progress snapshot(id[%d], status[%d])",
snapshot.getId(), snapshot.getStatus());
}
return;
}
final BaseDownloadTask originTask = mTask.getOrigin();
if (FileDownloadLog.NEED_LOG) {
FileDownloadLog.d(this, "notify progress %s %d %d",
Expand Down Expand Up @@ -139,6 +146,13 @@ public void notifyBlockComplete(MessageSnapshot snapshot) {

@Override
public void notifyRetry(MessageSnapshot snapshot) {
if (mTask == null) {
if (FileDownloadLog.NEED_LOG) {
FileDownloadLog.d(this, "can't notify retry snapshot(id[%d], status[%d])",
snapshot.getId(), snapshot.getStatus());
}
return;
}
if (FileDownloadLog.NEED_LOG) {
final BaseDownloadTask originTask = mTask.getOrigin();
FileDownloadLog.d(this, "notify retry %s %d %d %s", mTask,
Expand All @@ -165,6 +179,13 @@ public void notifyWarn(MessageSnapshot snapshot) {

@Override
public void notifyError(MessageSnapshot snapshot) {
if (mTask == null) {
if (FileDownloadLog.NEED_LOG) {
FileDownloadLog.d(this, "can't notify error snapshot(id[%d], status[%d])",
snapshot.getId(), snapshot.getStatus());
}
return;
}
if (FileDownloadLog.NEED_LOG) {
FileDownloadLog.d(this, "notify error %s %s", mTask, mTask.getOrigin().getErrorCause());
}
Expand Down