github/xmrwallet
1
Fork 0
mirror of https://github.com/m2049r/xmrwallet synced 2025-04-29 16:39:14 +02:00
Code Releases Activity

rename fresh wallet (no cachefile) ()

Browse Source
This commit is contained in:
m2049r 2017-11-02 11:46:03 +01:00 committed by GitHub
parent 7eb86ea618
commit 4ac6a03d63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions

12
app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java

@ -250,7 +250,7 @@ public class LoginActivity extends AppCompatActivity
// copy + delete seems safer than rename because we call rollback easily // copy + delete seems safer than rename because we call rollback easily
boolean renameWallet(File walletFile, String newName) { boolean renameWallet(File walletFile, String newName) {
if (copyWallet(walletFile, new File(walletFile.getParentFile(), newName), false)) { if (copyWallet(walletFile, new File(walletFile.getParentFile(), newName), false, true)) {
deleteWallet(walletFile); deleteWallet(walletFile);
return true; return true;
} else { } else {
@ -355,7 +355,7 @@ public class LoginActivity extends AppCompatActivity
// TODO probably better to copy to a new file and then rename // TODO probably better to copy to a new file and then rename
// then if something fails we have the old backup at least // then if something fails we have the old backup at least
// or just create a new backup every time and keep n old backups // or just create a new backup every time and keep n old backups
boolean success = copyWallet(walletFile, backupFile, true); boolean success = copyWallet(walletFile, backupFile, true, true);
Log.d(TAG, "copyWallet is " + success); Log.d(TAG, "copyWallet is " + success);
return success; return success;
} }
@ -970,8 +970,8 @@ public class LoginActivity extends AppCompatActivity
} }
} }
boolean copyWallet(File srcWallet, File dstWallet, boolean backupMode) { boolean copyWallet(File srcWallet, File dstWallet, boolean overwrite, boolean ignoreCacheError) {
if (walletExists(dstWallet, true) && !backupMode) return false; if (walletExists(dstWallet, true) && !overwrite) return false;
boolean success = false; boolean success = false;
File srcDir = srcWallet.getParentFile(); File srcDir = srcWallet.getParentFile();
String srcName = srcWallet.getName(); String srcName = srcWallet.getName();
@ -981,8 +981,8 @@ public class LoginActivity extends AppCompatActivity
try { try {
copyFile(new File(srcDir, srcName), new File(dstDir, dstName)); copyFile(new File(srcDir, srcName), new File(dstDir, dstName));
} catch (IOException ex) { } catch (IOException ex) {
Log.d(TAG, "CACHE " + backupMode); Log.d(TAG, "CACHE " + ignoreCacheError);
if (!backupMode) { // ignore cache backup error if backing up (can be resynced) if (!ignoreCacheError) { // ignore cache backup error if backing up (can be resynced)
throw ex; throw ex;
} }
} }