Add AndroidClient backend to lua/main.cpp

MikuAuahDark · MikuAuahDark · commit 3817bac7db96 · 2021-02-13T21:51:04.000+08:00
diff --git a/src/android/AndroidClient.cpp b/src/android/AndroidClient.cpp
@@ -29,12 +29,6 @@ std::string replace(const std::string &str, const std::string &from, const std::
 	return ss.str();
 }
 
-std::string fromJavaMUTF(const std::string &str)
-{
-	static std::string null("", 1);
-	return replace(str, "\xC0\x80", null);
-}
-
 jstring newStringUTF(JNIEnv *env, const std::string &str)
 {
 	static std::string null("", 1);
diff --git a/src/android/AndroidClient.h b/src/android/AndroidClient.h
@@ -12,7 +12,7 @@ class AndroidClient: public HTTPSClient
 {
 public:
 	AndroidClient();
-	
+
 	bool valid() const override;
 	HTTPSClient::Reply request(const HTTPSClient::Request &req) override;
 
diff --git a/src/lua/main.cpp b/src/lua/main.cpp
@@ -16,6 +16,9 @@
 #ifdef USE_NSURL_BACKEND
 #	include "macos/NSURLClient.h"
 #endif
+#ifdef USE_ANDROID_BACKEND
+#	include "android/AndroidClient.h"
+#endif
 
 #ifdef USE_CURL_BACKEND
 	static CurlClient curlclient;
@@ -29,6 +32,9 @@
 #ifdef USE_NSURL_BACKEND
 	static NSURLClient nsurlclient;
 #endif
+#ifdef USE_ANDROID_BACKEND
+	static AndroidClient androidclient;
+#endif
 
 static HTTPSClient *clients[] = {
 #ifdef USE_CURL_BACKEND
@@ -42,6 +48,9 @@ static HTTPSClient *clients[] = {
 #endif
 #ifdef USE_NSURL_BACKEND
 	&nsurlclient,
+#endif
+#ifdef USE_ANDROID_BACKEND
+	&androidclient,
 #endif
 	nullptr,
 };

Original file line number	Diff line number	Diff line change
`@@ -29,12 +29,6 @@ std::string replace(const std::string &str, const std::string &from, const std::`
`29`	`29`	`return ss.str();`
`30`	`30`	`}`
`31`	`31`
`32`		`-std::string fromJavaMUTF(const std::string &str)`
`33`		`-{`
`34`		`- static std::string null("", 1);`
`35`		`- return replace(str, "\xC0\x80", null);`
`36`		`-}`
`37`		`-`
`38`	`32`	`jstring newStringUTF(JNIEnv *env, const std::string &str)`
`39`	`33`	`{`
`40`	`34`	`static std::string null("", 1);`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ class AndroidClient: public HTTPSClient`
`12`	`12`	`{`
`13`	`13`	`public:`
`14`	`14`	`AndroidClient();`
`15`		`-`
	`15`	`+`
`16`	`16`	`bool valid() const override;`
`17`	`17`	`HTTPSClient::Reply request(const HTTPSClient::Request &req) override;`
`18`	`18`