1 files changed, 25 insertions, 18 deletions

diff --git a/platform/android/net_socket_android.cpp b/platform/android/net_socket_android.cpp
index 0341ef3ec6..225a1132fe 100644
--- a/platform/android/net_socket_android.cpp
+++ b/platform/android/net_socket_android.cpp
@@ -5,8 +5,8 @@
 /*                           GODOT ENGINE                                */
 /*                      https://godotengine.org                          */
 /*************************************************************************/
-/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2020 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       */
@@ -32,13 +32,13 @@
 
 #include "thread_jandroid.h"
 
-jobject NetSocketAndroid::net_utils = 0;
-jclass NetSocketAndroid::cls = 0;
-jmethodID NetSocketAndroid::_multicast_lock_acquire = 0;
-jmethodID NetSocketAndroid::_multicast_lock_release = 0;
+jobject NetSocketAndroid::net_utils = nullptr;
+jclass NetSocketAndroid::cls = nullptr;
+jmethodID NetSocketAndroid::_multicast_lock_acquire = nullptr;
+jmethodID NetSocketAndroid::_multicast_lock_release = nullptr;
 
 void NetSocketAndroid::setup(jobject p_net_utils) {
-	JNIEnv *env = ThreadAndroid::get_env();
+	JNIEnv *env = get_jni_env();
 
 	net_utils = env->NewGlobalRef(p_net_utils);
 
@@ -51,14 +51,14 @@ void NetSocketAndroid::setup(jobject p_net_utils) {
 
 void NetSocketAndroid::multicast_lock_acquire() {
 	if (_multicast_lock_acquire) {
-		JNIEnv *env = ThreadAndroid::get_env();
+		JNIEnv *env = get_jni_env();
 		env->CallVoidMethod(net_utils, _multicast_lock_acquire);
 	}
 }
 
 void NetSocketAndroid::multicast_lock_release() {
 	if (_multicast_lock_release) {
-		JNIEnv *env = ThreadAndroid::get_env();
+		JNIEnv *env = get_jni_env();
 		env->CallVoidMethod(net_utils, _multicast_lock_release);
 	}
 }
@@ -77,18 +77,21 @@ NetSocketAndroid::~NetSocketAndroid() {
 
 void NetSocketAndroid::close() {
 	NetSocketPosix::close();
-	if (wants_broadcast)
+	if (wants_broadcast) {
 		multicast_lock_release();
-	if (multicast_groups)
+	}
+	if (multicast_groups) {
 		multicast_lock_release();
+	}
 	wants_broadcast = false;
 	multicast_groups = 0;
 }
 
 Error NetSocketAndroid::set_broadcasting_enabled(bool p_enabled) {
 	Error err = NetSocketPosix::set_broadcasting_enabled(p_enabled);
-	if (err != OK)
+	if (err != OK) {
 		return err;
+	}
 
 	if (p_enabled != wants_broadcast) {
 		if (p_enabled) {
@@ -103,28 +106,32 @@ Error NetSocketAndroid::set_broadcasting_enabled(bool p_enabled) {
 	return OK;
 }
 
-Error NetSocketAndroid::join_multicast_group(const IP_Address &p_multi_address, String p_if_name) {
+Error NetSocketAndroid::join_multicast_group(const IPAddress &p_multi_address, String p_if_name) {
 	Error err = NetSocketPosix::join_multicast_group(p_multi_address, p_if_name);
-	if (err != OK)
+	if (err != OK) {
 		return err;
+	}
 
-	if (!multicast_groups)
+	if (!multicast_groups) {
 		multicast_lock_acquire();
+	}
 	multicast_groups++;
 
 	return OK;
 }
 
-Error NetSocketAndroid::leave_multicast_group(const IP_Address &p_multi_address, String p_if_name) {
+Error NetSocketAndroid::leave_multicast_group(const IPAddress &p_multi_address, String p_if_name) {
 	Error err = NetSocketPosix::leave_multicast_group(p_multi_address, p_if_name);
-	if (err != OK)
+	if (err != OK) {
 		return err;
+	}
 
 	ERR_FAIL_COND_V(multicast_groups == 0, ERR_BUG);
 
 	multicast_groups--;
-	if (!multicast_groups)
+	if (!multicast_groups) {
 		multicast_lock_release();
+	}
 
 	return OK;
 }