mirror of
https://github.com/BlueWallet/BlueWallet.git
synced 2025-03-03 20:07:11 +01:00
FIX: If file existed, it wouldnt proceed.
This commit is contained in:
parent
c988c192b4
commit
53468547f1
1 changed files with 13 additions and 2 deletions
15
BlueApp.ts
15
BlueApp.ts
|
@ -324,7 +324,12 @@ export class AppStorage {
|
||||||
* @returns {Promise.<boolean>}
|
* @returns {Promise.<boolean>}
|
||||||
*/
|
*/
|
||||||
async loadFromDisk(password?: string): Promise<boolean> {
|
async loadFromDisk(password?: string): Promise<boolean> {
|
||||||
await this.moveRealmFilesToCacheDirectory();
|
// Wrap inside a try so if anything goes wrong it wont block loadFromDisk from continuing
|
||||||
|
try {
|
||||||
|
await this.moveRealmFilesToCacheDirectory();
|
||||||
|
} catch (error: any) {
|
||||||
|
console.warn('moveRealmFilesToCacheDirectory error:', error.message);
|
||||||
|
}
|
||||||
let data = await this.getItemWithFallbackToRealm('data');
|
let data = await this.getItemWithFallbackToRealm('data');
|
||||||
if (password) {
|
if (password) {
|
||||||
data = this.decryptData(data, password);
|
data = this.decryptData(data, password);
|
||||||
|
@ -914,8 +919,14 @@ export class AppStorage {
|
||||||
const filePath = `${documentPath}/${file.name}`;
|
const filePath = `${documentPath}/${file.name}`;
|
||||||
const newFilePath = `${cachePath}/${file.name}`;
|
const newFilePath = `${cachePath}/${file.name}`;
|
||||||
const fileExists = await RNFS.exists(filePath); // Check if the file exists
|
const fileExists = await RNFS.exists(filePath); // Check if the file exists
|
||||||
|
const cacheFileExists = await RNFS.exists(newFilePath); // Check if the file already exists in the cache directory
|
||||||
|
|
||||||
if (fileExists) {
|
if (fileExists) {
|
||||||
await RNFS.moveFile(filePath, newFilePath); // Move the file if it exists
|
if (cacheFileExists) {
|
||||||
|
await RNFS.unlink(newFilePath); // Delete the file in the cache directory if it exists
|
||||||
|
console.log(`Existing file removed from cache: ${newFilePath}`);
|
||||||
|
}
|
||||||
|
await RNFS.moveFile(filePath, newFilePath); // Move the file
|
||||||
console.log(`Moved Realm file: ${filePath} to ${newFilePath}`);
|
console.log(`Moved Realm file: ${filePath} to ${newFilePath}`);
|
||||||
} else {
|
} else {
|
||||||
console.log(`File does not exist: ${filePath}`);
|
console.log(`File does not exist: ${filePath}`);
|
||||||
|
|
Loading…
Add table
Reference in a new issue