Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Android: Add "Import BootMii NAND Backup" #9653

Merged
merged 1 commit into from Apr 19, 2021

Conversation

JosJuice
Copy link
Member

No description provided.

@@ -84,7 +84,10 @@ bool NANDImporter::ReadNANDBin(const std::string& path_to_bin,
{
const std::string otp_dump_path = get_otp_dump_path();
if (otp_dump_path.empty())
{
PanicAlertFmtT("A NAND backup can't be decrypted without the associated keys.");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we put this in Java_org_dolphinemu_dolphinemu_utils_WiiUtils_importNANDBin instead? Having a panic alert here seems to defeat the point of having get_otp_dump_path to avoid UI interactions in the core logic.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I figured this fit with the other panic alerts in this file, but sure, I don't mind moving it.

@leoetlino leoetlino merged commit cf80ed7 into dolphin-emu:master Apr 19, 2021
10 checks passed
@JosJuice JosJuice deleted the android-import-nand branch April 19, 2021 19:58
<string name="wad_install_success">Successfully installed this title to the NAND.</string>
<string name="wad_install_failure">Failed to install this title to the NAND.</string>
<string name="wii_save_exists">Save data for this title already exists in the NAND. Consider backing up the current data before overwriting.\nOverwrite now?</string>
<string name="wii_save_import_success">Successfully imported save file.</string>
<string name="wii_save_import_error">Failed to import save file. Your NAND may be corrupt, or something is preventing access to files within it.</string>
<string name="wii_save_import_corruped_source">Failed to import save file. The given file appears to be corrupted or is not a valid Wii save.</string>
<string name="wii_save_import_title_missing">Failed to import save file. Please launch the game once, then try again.</string>
<string name="nand_import_warning">Merging a new NAND over your currently selected NAND will overwrite any channels and savegames that already exist. This process is not reversible, so it is recommended that you keep backups of both NANDs. Are you sure you want to continue?</string>

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The length of this warning is exceptionally long; hopefully it won't be cropped by the UI.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, it shows up fine as multiple lines in a somewhat taller than usual dialog box.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
3 participants