From 56f738eb06af735f9954b7865cb19ebf3cc35733 Mon Sep 17 00:00:00 2001 From: OpenSauce04 Date: Wed, 27 May 2026 17:38:08 +0100 Subject: [PATCH] jni/config.cpp: Reworded default config assert message for clarity --- src/android/app/src/main/jni/config.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/android/app/src/main/jni/config.cpp b/src/android/app/src/main/jni/config.cpp index 967166e12..7a2746224 100644 --- a/src/android/app/src/main/jni/config.cpp +++ b/src/android/app/src/main/jni/config.cpp @@ -339,14 +339,13 @@ void Config::Reload() { for (auto key = Settings::Keys::keys_array.begin(); key != Settings::Keys::keys_array.end(); ++key) { const auto key_declaration_string = std::string(*key) + " ="; - // FIXME: This code looks so ass when formatted by clang-format -OS - if (std::ranges::find(DefaultINI::android_config_omitted_keys, *key) == - std::end(DefaultINI::android_config_omitted_keys) && - std::string(DefaultINI::android_config_default_file_content) - .find(key_declaration_string) == std::string::npos) { + if ((std::ranges::find(DefaultINI::android_config_omitted_keys, *key) == + std::end(DefaultINI::android_config_omitted_keys)) && + (std::string(DefaultINI::android_config_default_file_content) + .find(key_declaration_string) == std::string::npos)) { ASSERT_MSG(false, - "Validation of default content config failed: Missing or malformed key " - "declaration {}", + "Validation of default config content (jni/default_ini.h) failed: Missing " + "declaration for key '{}'", *key); } }