Merge pull request #8187 from nextcloud/fix/8179/dismissDownloadbar

dismiss only after delay to remove stuck notification
This commit is contained in:
Andy Scherzinger 2021-03-18 21:18:46 +01:00 committed by GitHub
commit e7a79e7f9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 0 deletions

View File

@ -119,6 +119,8 @@ public class FileDownloader extends Service
private long conflictUploadId;
public boolean mStartedDownload = false;
@Inject UserAccountManager accountManager;
@Inject UploadsStorageManager uploadsStorageManager;
@Inject LocalBroadcastManager localBroadcastManager;
@ -420,6 +422,15 @@ public class FileDownloader extends Service
mService.downloadFile(next);
}
}
mService.mStartedDownload=false;
(new Handler()).postDelayed(new Runnable(){
public void run() {
if(!mService.mStartedDownload){
mService.mNotificationManager.cancel(R.string.downloader_download_in_progress_ticker);
}
}}, 2000);
Log_OC.d(TAG, "Stopping after command with id " + msg.arg1);
mService.mNotificationManager.cancel(FOREGROUND_SERVICE_ID);
mService.stopForeground(true);
@ -435,6 +446,7 @@ public class FileDownloader extends Service
*/
private void downloadFile(String downloadKey) {
mStartedDownload = true;
mCurrentDownload = mPendingDownloads.get(downloadKey);
if (mCurrentDownload != null) {