1 files changed, 24 insertions, 16 deletions

diff --git a/platform/android/os_android.cpp b/platform/android/os_android.cpp
index 0e5e10bc0a..b17b0f3139 100644
--- a/platform/android/os_android.cpp
+++ b/platform/android/os_android.cpp
@@ -5,8 +5,8 @@
 /*                           GODOT ENGINE                                */
 /*                      https://godotengine.org                          */
 /*************************************************************************/
-/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md).   */
+/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md).   */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
@@ -81,17 +81,18 @@ void OS_Android::alert(const String &p_alert, const String &p_title) {
 void OS_Android::initialize_core() {
 	OS_Unix::initialize_core();
 
-	if (use_apk_expansion)
+	if (use_apk_expansion) {
 		FileAccess::make_default<FileAccessUnix>(FileAccess::ACCESS_RESOURCES);
-	else {
+	} else {
 		FileAccess::make_default<FileAccessAndroid>(FileAccess::ACCESS_RESOURCES);
 	}
 	FileAccess::make_default<FileAccessUnix>(FileAccess::ACCESS_USERDATA);
 	FileAccess::make_default<FileAccessUnix>(FileAccess::ACCESS_FILESYSTEM);
-	if (use_apk_expansion)
+	if (use_apk_expansion) {
 		DirAccess::make_default<DirAccessUnix>(DirAccess::ACCESS_RESOURCES);
-	else
+	} else {
 		DirAccess::make_default<DirAccessJAndroid>(DirAccess::ACCESS_RESOURCES);
+	}
 	DirAccess::make_default<DirAccessUnix>(DirAccess::ACCESS_USERDATA);
 	DirAccess::make_default<DirAccessUnix>(DirAccess::ACCESS_FILESYSTEM);
 
@@ -162,20 +163,23 @@ MainLoop *OS_Android::get_main_loop() const {
 }
 
 void OS_Android::main_loop_begin() {
-	if (main_loop)
+	if (main_loop) {
 		main_loop->initialize();
+	}
 }
 
 bool OS_Android::main_loop_iterate() {
-	if (!main_loop)
+	if (!main_loop) {
 		return false;
+	}
 	DisplayServerAndroid::get_singleton()->process_events();
 	return Main::iteration();
 }
 
 void OS_Android::main_loop_end() {
-	if (main_loop)
+	if (main_loop) {
 		main_loop->finalize();
+	}
 }
 
 void OS_Android::main_loop_focusout() {
@@ -198,7 +202,7 @@ String OS_Android::get_resource_dir() const {
 
 String OS_Android::get_locale() const {
 	String locale = godot_io_java->get_locale();
-	if (locale != "") {
+	if (!locale.is_empty()) {
 		return locale;
 	}
 
@@ -207,8 +211,9 @@ String OS_Android::get_locale() const {
 
 String OS_Android::get_model_name() const {
 	String model = godot_io_java->get_model();
-	if (model != "")
+	if (!model.is_empty()) {
 		return model;
+	}
 
 	return OS_Unix::get_model_name();
 }
@@ -218,11 +223,12 @@ String OS_Android::get_data_path() const {
 }
 
 String OS_Android::get_user_data_dir() const {
-	if (data_dir_cache != String())
+	if (!data_dir_cache.is_empty()) {
 		return data_dir_cache;
+	}
 
 	String data_dir = godot_io_java->get_user_data_dir();
-	if (data_dir != "") {
+	if (!data_dir.is_empty()) {
 		data_dir_cache = _remove_symlink(data_dir);
 		return data_dir_cache;
 	}
@@ -230,11 +236,12 @@ String OS_Android::get_user_data_dir() const {
 }
 
 String OS_Android::get_cache_path() const {
-	if (cache_dir_cache != String())
+	if (!cache_dir_cache.is_empty()) {
 		return cache_dir_cache;
+	}
 
 	String cache_dir = godot_io_java->get_cache_dir();
-	if (cache_dir != "") {
+	if (!cache_dir.is_empty()) {
 		cache_dir_cache = _remove_symlink(cache_dir);
 		return cache_dir_cache;
 	}
@@ -243,8 +250,9 @@ String OS_Android::get_cache_path() const {
 
 String OS_Android::get_unique_id() const {
 	String unique_id = godot_io_java->get_unique_id();
-	if (unique_id != "")
+	if (!unique_id.is_empty()) {
 		return unique_id;
+	}
 
 	return OS::get_unique_id();
 }