Skip to content

Revert "fix: cannot start a foreground service if there is no any wai… #1256

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

Merged
Jacksgong merged 2 commits into from
Aug 27, 2019
Merged

Revert "fix: cannot start a foreground service if there is no any wai… #1256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
475074f
Revert "fix: cannot start a foreground service if there is no any wai…
Aug 27, 2019
80c9413
refactor: remove unused layout file
Aug 27, 2019
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
12 changes: 0 additions & 12 deletions demo/src/main/res/layout/activity_notification_entrance.xml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion library/src/main/java/com/liulishuo/filedownloader/FileDownloader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,7 +746,7 @@ IQueuesHandler getQueuesHandler() {
private static final Object INIT_LOST_CONNECTED_HANDLER_LOCK = new Object();
private ILostServiceConnectedHandler mLostConnectedHandler;

public ILostServiceConnectedHandler getLostConnectedHandler() {
ILostServiceConnectedHandler getLostConnectedHandler() {
if (mLostConnectedHandler == null) {
synchronized (INIT_LOST_CONNECTED_HANDLER_LOCK) {
if (mLostConnectedHandler == null) {
Expand Down
5 changes: 0 additions & 5 deletions library/src/main/java/com/liulishuo/filedownloader/ILostServiceConnectedHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,4 @@ public interface ILostServiceConnectedHandler {
* @return {@code true} if the start action was dispatched.
*/
boolean dispatchTaskStart(BaseDownloadTask.IRunningTask task);

/**
* @return {@code true} if there is task in waiting list.
*/
boolean haveWaitingTask();
}
11 changes: 2 additions & 9 deletions library/src/main/java/com/liulishuo/filedownloader/LostServiceConnectedHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,13 +125,6 @@ public void taskWorkFine(BaseDownloadTask.IRunningTask task) {
}
}

@Override
public boolean haveWaitingTask() {
synchronized (mWaitingList) {
return !mWaitingList.isEmpty();
}
}

@Override
public boolean dispatchTaskStart(BaseDownloadTask.IRunningTask task) {
if (!FileDownloader.getImpl().isServiceConnected()) {
Expand All @@ -141,12 +134,12 @@ public boolean dispatchTaskStart(BaseDownloadTask.IRunningTask task) {
FileDownloadLog.d(this, "Waiting for connecting with the downloader "
+ "service... %d", task.getOrigin().getId());
}
FileDownloadServiceProxy.getImpl().
bindStartByContext(FileDownloadHelper.getAppContext());
if (!mWaitingList.contains(task)) {
task.free();
mWaitingList.add(task);
}
FileDownloadServiceProxy.getImpl().
bindStartByContext(FileDownloadHelper.getAppContext());
return true;
}
}
Expand Down
6 changes: 1 addition & 5 deletions library/src/main/java/com/liulishuo/filedownloader/services/BaseFileServiceUIGuard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import android.os.RemoteException;

import com.liulishuo.filedownloader.FileDownloadEventPool;
import com.liulishuo.filedownloader.FileDownloader;
import com.liulishuo.filedownloader.IFileDownloadServiceProxy;
import com.liulishuo.filedownloader.event.DownloadServiceConnectChangedEvent;
import com.liulishuo.filedownloader.util.ExtraKeys;
Expand Down Expand Up @@ -158,10 +157,7 @@ public void bindStartByContext(final Context context, final Runnable connectedRu
bindContexts.add(context);
}

boolean needMakeServiceForeground = FileDownloadUtils.needMakeServiceForeground(context);
boolean haveWaitingTask =
FileDownloader.getImpl().getLostConnectedHandler().haveWaitingTask();
runServiceForeground = needMakeServiceForeground && haveWaitingTask;
runServiceForeground = FileDownloadUtils.needMakeServiceForeground(context);
i.putExtra(ExtraKeys.IS_FOREGROUND, runServiceForeground);
context.bindService(i, this, Context.BIND_AUTO_CREATE);
if (runServiceForeground) {
Expand Down