Merge pull request #1256 from rantianhua/master

Revert "fix: cannot start a foreground service if there is no any wai…
lingochamp · Aug 27, 2019 · 77c787c · 77c787c
2 parents f8daf9a + 80c9413
commit 77c787c
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 32 deletions.
diff --git a/demo/src/main/res/layout/activity_notification_entrance.xml b/demo/src/main/res/layout/activity_notification_entrance.xml
diff --git a/library/src/main/java/com/liulishuo/filedownloader/FileDownloader.java b/library/src/main/java/com/liulishuo/filedownloader/FileDownloader.java
@@ -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) {

diff --git a/library/src/main/java/com/liulishuo/filedownloader/ILostServiceConnectedHandler.java b/library/src/main/java/com/liulishuo/filedownloader/ILostServiceConnectedHandler.java
@@ -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();
 }
diff --git a/library/src/main/java/com/liulishuo/filedownloader/LostServiceConnectedHandler.java b/library/src/main/java/com/liulishuo/filedownloader/LostServiceConnectedHandler.java
@@ -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()) {
@@ -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;
                 }
             }

diff --git a/library/src/main/java/com/liulishuo/filedownloader/services/BaseFileServiceUIGuard.java b/library/src/main/java/com/liulishuo/filedownloader/services/BaseFileServiceUIGuard.java
@@ -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;
@@ -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) {