diff --git a/src/android/app/src/main/java/org/citra/citra_emu/NativeLibrary.kt b/src/android/app/src/main/java/org/citra/citra_emu/NativeLibrary.kt
index c8b3d8fee..583e59863 100644
--- a/src/android/app/src/main/java/org/citra/citra_emu/NativeLibrary.kt
+++ b/src/android/app/src/main/java/org/citra/citra_emu/NativeLibrary.kt
@@ -182,6 +182,10 @@ object NativeLibrary {
external fun uninstallSystemFiles(old3DS: Boolean)
+ external fun isFullConsoleLinked(): Boolean
+
+ external fun unlinkConsole()
+
private var coreErrorAlertResult = false
private val coreErrorAlertLock = Object()
diff --git a/src/android/app/src/main/java/org/citra/citra_emu/fragments/SystemFilesFragment.kt b/src/android/app/src/main/java/org/citra/citra_emu/fragments/SystemFilesFragment.kt
index 1f8328a74..7b76149d3 100644
--- a/src/android/app/src/main/java/org/citra/citra_emu/fragments/SystemFilesFragment.kt
+++ b/src/android/app/src/main/java/org/citra/citra_emu/fragments/SystemFilesFragment.kt
@@ -4,6 +4,7 @@
package org.citra.citra_emu.fragments
+import android.content.DialogInterface
import android.os.Bundle
import android.text.method.LinkMovementMethod
import android.view.Gravity
@@ -157,6 +158,22 @@ class SystemFilesFragment : Fragment() {
movementMethod = LinkMovementMethod.getInstance()
}
+ binding.buttonUnlinkConsoleData.isEnabled = NativeLibrary.isFullConsoleLinked()
+ binding.buttonUnlinkConsoleData.setOnClickListener {
+ MaterialAlertDialogBuilder(requireContext())
+ .setTitle(R.string.delete_system_files)
+ .setMessage(HtmlCompat.fromHtml(
+ requireContext().getString(R.string.delete_system_files_description),
+ HtmlCompat.FROM_HTML_MODE_COMPACT
+ ))
+ .setPositiveButton(android.R.string.ok) { _: DialogInterface, _: Int ->
+ NativeLibrary.unlinkConsole()
+ binding.buttonUnlinkConsoleData.isEnabled = NativeLibrary.isFullConsoleLinked()
+ }
+ .setNegativeButton(android.R.string.cancel, null)
+ .show()
+ }
+
binding.buttonSetUpSystemFiles.setOnClickListener {
val inflater = LayoutInflater.from(context)
val inputBinding = DialogSoftwareKeyboardBinding.inflate(inflater)
diff --git a/src/android/app/src/main/jni/native.cpp b/src/android/app/src/main/jni/native.cpp
index a88a4036c..02cc329af 100644
--- a/src/android/app/src/main/jni/native.cpp
+++ b/src/android/app/src/main/jni/native.cpp
@@ -36,6 +36,7 @@
#include "core/frontend/camera/factory.h"
#include "core/hle/service/am/am.h"
#include "core/hle/service/nfc/nfc.h"
+#include "core/hw/unique_data.h"
#include "core/loader/loader.h"
#include "core/savestate.h"
#include "core/system_titles.h"
@@ -772,4 +773,12 @@ void Java_org_citra_citra_1emu_NativeLibrary_logDeviceInfo([[maybe_unused]] JNIE
LOG_INFO(Frontend, "Host OS: Android API level {}", android_get_device_api_level());
}
+jboolean Java_org_citra_citra_1emu_NativeLibrary_isFullConsoleLinked(JNIEnv* env, jobject obj) {
+ return HW::UniqueData::IsFullConsoleLinked();
+}
+
+void Java_org_citra_citra_1emu_NativeLibrary_unlinkConsole(JNIEnv* env, jobject obj) {
+ HW::UniqueData::UnlinkConsole();
+}
+
} // extern "C"
diff --git a/src/android/app/src/main/res/layout/fragment_system_files.xml b/src/android/app/src/main/res/layout/fragment_system_files.xml
index 32e8b5358..bae1cda1c 100644
--- a/src/android/app/src/main/res/layout/fragment_system_files.xml
+++ b/src/android/app/src/main/res/layout/fragment_system_files.xml
@@ -61,6 +61,13 @@
android:layout_height="wrap_content"
android:text="@string/setup_tool_connect" />
+ System Files
Perform system file operations such as installing system files or booting the Home Menu
Connect to Artic Setup Tool
- Azahar Artic Setup Tool.This operation will install console unique files to Azahar, do not share your user or nand folders Old 3DS setup is needed for the New 3DS setup to work. Both setup modes will work regardless of the model of the console running the setup tool.
+ Azahar Artic Setup Tool.This operation will install console unique data to Azahar, do not share your user or nand folders after performing the setup process! While doing the setup process, Azahar will link to the console running the setup tool. You can unlink the console later from the System Files tab in the emulator options menu. Do not go online with both Azahar and your 3DS console at the same time after setting up system files, as this could cause issues. Old 3DS setup is needed for the New 3DS setup to work (setting up both is recommended). Both setup modes will work regardless of the model of the console running the setup tool.
Fetching current system files status, please wait...
+ Unlink Console Unique Data
+ Your OTP, SecureInfo and LocalFriendCodeSeed will be removed from Azahar. Your friend list will reset and you will be logged out of your NNID/PNID account. System files and eshop titles obtained through Azahar will become inaccessible until the same console is linked again using the setup tool (save data will not be lost). Old 3DS Setup
New 3DS Setup
Setup is possible.
diff --git a/src/citra_qt/citra_qt.cpp b/src/citra_qt/citra_qt.cpp
index 8dfb2dae7..94318da55 100644
--- a/src/citra_qt/citra_qt.cpp
+++ b/src/citra_qt/citra_qt.cpp
@@ -2112,15 +2112,18 @@ void GMainWindow::OnMenuSetUpSystemFiles() {
QVBoxLayout layout(&dialog);
QLabel label_description(
- tr("Azahar needs files from a real console to be able to use some of its features.Azahar needs console unique data and firmware files from a real console to be "
+ "able to use some of its features. Azahar "
- "Artic Setup Tool
This operation will install console unique "
- "files "
- "to Azahar, do not share your user or nand folders Old 3DS setup is needed for the New 3DS setup to "
- "work. Both setup modes will work regardless of the model of the console "
- "running the setup tool. This operation will install console unique "
+ "data to Azahar, do not share your user or nand folders While doing the setup process, Azahar will link to the console "
+ "running the setup tool. You can unlink the Do not go online with both Azahar and your 3DS "
+ "console at the same time after setting up system files, Old 3DS setup is needed for the New 3DS setup to work (doing both "
+ "setup modes is recommended). Both setup modes will work regardless of the "
+ "model of the console running the setup tool. Your OTP, SecureInfo and LocalFriendCodeSeed will be removed "
+ "from Azahar. Your friend list will reset and you will be logged out of your "
+ "NNID/PNID account. System files and eshop titles obtained through Azahar will "
+ "become inaccessible until the same console is linked again (save data will not be "
+ "lost). Real Console Unique Data
+ -
+
+
+ -
+
+
+ -
+
+
+ Your real console is linked to Azahar.
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Qt::RightToLeft
+
+
+ Unlink
+
+
+
+
+
+
+ -
+
+
+ OTP
+
+
+
+ -
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Qt::RightToLeft
+
+
+ Choose
+
+
+
+
+
+
+ -
+
+
+ SecureInfo_A/B
+
+
+
+ -
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Qt::RightToLeft
+
+
+ Choose
+
+
+
+
+
+
+ -
+
+
+ LocalFriendCodeSeed_A/B
+
+
+
+ -
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Qt::RightToLeft
+
+
+ Choose
+
+
+
+
+
+
+
+
+
-
-
-
- SecureInfo_A/B
-
-
-
- -
-
-
- -
-
-
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Qt::RightToLeft
-
-
- Choose
-
-
-
-
-
-
- -
-
-
- LocalFriendCodeSeed_A/B
-
-
-
- -
-
-
- -
-
-
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Qt::RightToLeft
-
-
- Choose
-
-
-
-
-
-
- -
-
-
- OTP
-
-
-
- -
-
-
- -
-
-
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Qt::RightToLeft
-
-
- Choose
-
-
-
-
-
-
- -
movable.sed
- -
+
-
-
diff --git a/src/core/hw/unique_data.cpp b/src/core/hw/unique_data.cpp
index 3f11da2a7..988c42e19 100644
--- a/src/core/hw/unique_data.cpp
+++ b/src/core/hw/unique_data.cpp
@@ -5,6 +5,7 @@
#include
#include "common/common_paths.h"
#include "common/logging/log.h"
+#include "core/file_sys/archive_systemsavedata.h"
#include "core/file_sys/certificate.h"
#include "core/file_sys/otp.h"
#include "core/hw/aes/key.h"
@@ -262,4 +263,30 @@ std::unique_ptr OpenUniqueCryptoFile(const std::string& filena
return std::make_unique(filename, openmode, key, ctr, flags);
}
+bool IsFullConsoleLinked() {
+ return GetOTP().Valid() && GetSecureInfoA().IsValid() && GetLocalFriendCodeSeedB().IsValid();
+}
+
+void UnlinkConsole() {
+ // Remove all console unique data, as well as the act, nim and frd savefiles
+ const std::string system_save_data_path =
+ FileSys::GetSystemSaveDataContainerPath(FileUtil::GetUserPath(FileUtil::UserPath::NANDDir));
+ constexpr std::array, 3> save_data_ids{{
+ {0x00, 0x00, 0x00, 0x00, 0x2C, 0x00, 0x01, 0x00},
+ {0x00, 0x00, 0x00, 0x00, 0x32, 0x00, 0x01, 0x00},
+ {0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x01, 0x00},
+ }};
+
+ for (auto& id : save_data_ids) {
+ const std::string final_path = FileSys::GetSystemSaveDataPath(system_save_data_path, id);
+ FileUtil::DeleteDirRecursively(final_path, 2);
+ }
+
+ FileUtil::Delete(GetOTPPath());
+ FileUtil::Delete(GetSecureInfoAPath());
+ FileUtil::Delete(GetLocalFriendCodeSeedBPath());
+
+ InvalidateSecureData();
+}
+
} // namespace HW::UniqueData
diff --git a/src/core/hw/unique_data.h b/src/core/hw/unique_data.h
index 294484ffa..463d8e8e0 100644
--- a/src/core/hw/unique_data.h
+++ b/src/core/hw/unique_data.h
@@ -154,4 +154,7 @@ void InvalidateSecureData();
std::unique_ptr OpenUniqueCryptoFile(const std::string& filename,
const char openmode[], UniqueCryptoFileID id,
int flags = 0);
+
+bool IsFullConsoleLinked();
+void UnlinkConsole();
} // namespace HW::UniqueData
\ No newline at end of file
diff --git a/src/core/loader/artic.cpp b/src/core/loader/artic.cpp
index 5f4bb28f9..ab2888f7a 100644
--- a/src/core/loader/artic.cpp
+++ b/src/core/loader/artic.cpp
@@ -342,7 +342,8 @@ void Apploader_Artic::EnsureClientConnected() {
if (is_initial_setup) {
// Ensure we are running the initial setup app in the correct version
- auto req = client->NewRequest("System_IsAzaharInitialSetup");
+ auto req = client->NewRequest("System_ArticSetupVersion");
+ req.AddParameterU32(SETUP_TOOL_VERSION);
auto resp = client->Send(req);
if (!resp.has_value()) {
client_connected = false;
@@ -355,7 +356,15 @@ void Apploader_Artic::EnsureClientConnected() {
return;
}
- client_connected = *reinterpret_cast(ret_buf->first) == INITIAL_SETUP_APP_VERSION;
+ if (*reinterpret_cast(ret_buf->first) != SETUP_TOOL_VERSION) {
+ system.SetStatus(Core::System::ResultStatus::ErrorArticDisconnected,
+ "\nIncompatible Artic Setup Tool version.\nCheck for Artic Setup Tool "
+ "or Azahar updates.");
+ client_connected = false;
+ client->Stop();
+ } else {
+ client_connected = true;
+ }
}
}
@@ -385,6 +394,20 @@ ResultStatus Apploader_Artic::Load(std::shared_ptr& process) {
if (is_initial_setup) {
+ // If there is already a console linked, check it's the same device.
+ // Otherwise it could cause weird issues with account save data.
+ if (HW::UniqueData::IsFullConsoleLinked()) {
+ auto req = client->NewRequest("System_ReportDeviceID");
+ req.AddParameterU32(HW::UniqueData::GetOTP().GetDeviceID());
+
+ auto resp = client->Send(req);
+ if (!resp.has_value() || !resp->Succeeded())
+ return ResultStatus::ErrorArtic;
+
+ if (resp->GetMethodResult() != 0)
+ return ResultStatus::ErrorArtic;
+ }
+
// Request console unique data
for (int i = 0; i < 6; i++) {
std::string path;
diff --git a/src/core/loader/artic.h b/src/core/loader/artic.h
index d102babcc..f5b148364 100644
--- a/src/core/loader/artic.h
+++ b/src/core/loader/artic.h
@@ -93,7 +93,7 @@ public:
}
private:
- static constexpr u32 INITIAL_SETUP_APP_VERSION = 0;
+ static constexpr u32 SETUP_TOOL_VERSION = 1;
/**
* Loads .code section into memory for booting
* @param process The newly created process