Browse Source

Android: Rename "openURL" Java method to "openURLFromLOVE"

SDL 2.0.14 adds openURL method which conflicts with LOVE one.
Miku AuahDark 4 years ago
parent
commit
57a2a88a09
1 changed files with 8 additions and 1 deletions
  1. 8 1
      src/common/android.cpp

+ 8 - 1
src/common/android.cpp

@@ -148,7 +148,14 @@ bool openURL(const std::string &url)
 	JNIEnv *env = (JNIEnv*) SDL_AndroidGetJNIEnv();
 	jclass activity = env->FindClass("org/love2d/android/GameActivity");
 
-	jmethodID openURL = env->GetStaticMethodID(activity, "openURL", "(Ljava/lang/String;)Z");
+	jmethodID openURL = env->GetStaticMethodID(activity, "openURLFromLOVE", "(Ljava/lang/String;)Z");
+
+	if (openURL == nullptr)
+	{
+		env->ExceptionClear();
+		openURL = env->GetStaticMethodID(activity, "openURL", "(Ljava/lang/String;)Z");
+	}
+
 	jstring url_jstring = (jstring) env->NewStringUTF(url.c_str());
 
 	jboolean result = env->CallStaticBooleanMethod(activity, openURL, url_jstring);