Update logic for db upgrade file deletion.

Author: tmpfs

crates/core/src/paths.rs

@@ -330,7 +330,7 @@ impl Paths {
     /// account-level preferences.
     pub fn preferences_file(&self) -> PathBuf {
         let mut path = if self.is_global() {
-            self.global_preferences_file()
+            self.documents_dir().join(PREFERENCES_FILE)
         } else {
             self.user_dir().join(PREFERENCES_FILE)
         };
@@ -340,7 +340,9 @@ impl Paths {
 
     /// Path to the global preferences file.
     pub fn global_preferences_file(&self) -> PathBuf {
-        self.documents_dir().join(PREFERENCES_FILE)
+        let mut path = self.documents_dir().join(PREFERENCES_FILE);
+        path.set_extension(JSON_EXT);
+        path
     }
 
     /// Path to the file used to store account-level system messages.

crates/database_upgrader/src/upgrader/mod.rs

@@ -436,6 +436,7 @@ async fn delete_stale_files(
         options.paths.identity_dir().to_owned(),
         options.paths.audit_file().to_owned(),
         options.paths.global_preferences_file(),
+        options.paths.local_dir().join(".DS_Store"),
     ];
 
     for account in accounts {