Merge pull request #324 from defnax/fix-android

G10h4ck · web-flow · commit ab565618b2fe · 2026-07-07T14:16:53.000+02:00
Fix to start webservice on Android
diff --git a/src/rs_android/retroshareserviceandroid.cpp b/src/rs_android/retroshareserviceandroid.cpp
@@ -74,6 +74,10 @@ RetroShareServiceAndroid::start(
 		return jni::Make<ErrorConditionWrap>(env, std::errc::no_child_process);
 	}
 
+#ifdef RS_JSONAPI
+	RsInit::startupWebServices(conf, true);
+#endif
+
 	return jni::Make<ErrorConditionWrap>(env, std::error_condition());
 }
 
diff --git a/src/rsserver/p3face-config.cc b/src/rsserver/p3face-config.cc
@@ -104,7 +104,7 @@ void RsServer::rsGlobalShutDown()
 	fullstop();
 
 #ifdef RS_JSONAPI
-	rsJsonApi->fullstop();
+	if(rsJsonApi) rsJsonApi->fullstop();
 #endif
 
 	AuthPGP::exit();

Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,10 @@ RetroShareServiceAndroid::start(`
`74`	`74`	`return jni::Make<ErrorConditionWrap>(env, std::errc::no_child_process);`
`75`	`75`	`}`
`76`	`76`
	`77`	`+#ifdef RS_JSONAPI`
	`78`	`+ RsInit::startupWebServices(conf, true);`
	`79`	`+#endif`
	`80`	`+`
`77`	`81`	`return jni::Make<ErrorConditionWrap>(env, std::error_condition());`
`78`	`82`	`}`
`79`	`83`