diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 00000000..7094682a
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,7 @@
+{
+    "workbench.colorCustomizations": {
+        "activityBar.background": "#1B322C",
+        "titleBar.activeBackground": "#26463E",
+        "titleBar.activeForeground": "#F8FBFB"
+    }
+}
\ No newline at end of file
diff --git a/android/src/main/java/vn/hunghd/flutterdownloader/DownloadWorker.java b/android/src/main/java/vn/hunghd/flutterdownloader/DownloadWorker.java
index 628ca677..acc5fdbe 100644
--- a/android/src/main/java/vn/hunghd/flutterdownloader/DownloadWorker.java
+++ b/android/src/main/java/vn/hunghd/flutterdownloader/DownloadWorker.java
@@ -403,6 +403,10 @@ private void downloadFile(Context context, String fileURL, String savedDir, Stri
                         outputStream = context.getContentResolver().openOutputStream(uri, "w");
                     } else {
                         File file = createFileInAppSpecificDir(filename, savedDir);
+                        if (file.getName() != filename) {
+                            filename = file.getName();
+                            taskDao.updateTask(getId().toString(), filename, contentType);
+                        }
                         savedFilePath = file.getPath();
                         outputStream = new FileOutputStream(file, false);
                     }