Merge remote-tracking branch 'origin/release' into feature-issues1801

# Conflicts:
#	app/src/main/java/com/gh/common/util/NewFlatLogUtils.kt
#	libraries/LGLibrary

app/src/main/java/com/gh/download/DownloadManager.java

@@ -766,10 +766,11 @@ public class DownloadManager implements DownloadStatusListener {
         DownloadEntity entry = mDownloadDao.getSnapshot(url);
         if (entry != null) {
             AppExecutor.getIoExecutor().execute(() -> {
+                mDownloadDao.delete(url);
+
                 if (isDeleteFile) {
                     FileUtils.deleteFile(entry.getPath());
                 }
-                mDownloadDao.delete(url);
                 Utils.log(DownloadManager.class.getSimpleName(), "cancel==>record were deleted!");
 
                 if (automatic) {