2 files changed, 25 insertions, 14 deletions
diff --git a/Android/jni/app-android.cpp b/Android/jni/app-android.cpp
index d90374225..0e288a2b2 100644
--- a/Android/jni/app-android.cpp
+++ b/Android/jni/app-android.cpp
@@ -15,9 +15,18 @@
 #include "ToJava.h"
 
 #include "Root.h"
+#include "WebAdmin.h"
 
 #include <android/log.h>
 
+#ifdef _WIN32 // For IntelliSense parsing
+typedef void jobject;
+typedef int jint;
+typedef bool jboolean;
+typedef void JavaVM;
+typedef void JNIEnv;
+#endif
+
 cCriticalSection g_CriticalSection;
 
 JNIEnv* g_CurrentJNIEnv = 0;
@@ -61,7 +70,7 @@ cMainThread * pMainThread = NULL;
 
 jint JNI_OnLoad(JavaVM* vm, void* reserved)
 {
-	__android_log_print(ANDROID_LOG_ERROR,"MCServer", "%s", "JNI_OnLoad JNI_OnLoad JNI_OnLoad JNI_OnLoad");
+	//__android_log_print(ANDROID_LOG_ERROR,"MCServer", "%s", "JNI_OnLoad JNI_OnLoad JNI_OnLoad JNI_OnLoad");
 	g_JavaVM = vm;
 	return JNI_VERSION_1_4;
 }
@@ -72,20 +81,11 @@ extern "C" void Java_com_mcserver_MCServerActivity_NativeOnCreate( JNIEnv*  env,
 	g_CriticalSection.Lock();
 	g_CurrentJNIEnv = env;
 	g_JavaThread = thiz;
-	//if( !cLogger::GetSingletonPtr() ) new cLogger();
-	__android_log_print(ANDROID_LOG_ERROR,"MCServer", "%s", "Logging from C++!");
+	//__android_log_print(ANDROID_LOG_ERROR,"MCServer", "%s", "Logging from C++!");
 	g_CriticalSection.Unlock();
-
-	//CallJavaFunction_Void_Void(g_JavaActivity, "TestTest" );
-	//CallJavaFunction_Void_String(g_JavaThread, "AddToLog", "herpderpderp!!" );
 	
 	mkdir("/sdcard/mcserver", S_IRWXU | S_IRWXG | S_IRWXO);
 
-// 	__android_log_print(ANDROID_LOG_ERROR,"MCServer", "%s", "Before mainthread");
-// 	pMainThread = new cMainThread();
-// 	pMainThread->Start();
-// 	__android_log_print(ANDROID_LOG_ERROR,"MCServer", "%s", "AFter mainthread");
-
 	pRoot = new cRoot();
 	pRoot->Start();
 	delete pRoot; pRoot = NULL;
@@ -107,8 +107,6 @@ extern "C" void Java_com_mcserver_MCServerActivity_NativeCleanUp( JNIEnv*  env,
 	{
 		pRoot->ServerCommand("stop");
 	}
-// 	pMainThread->Stop();
-// 	delete pMainThread; pMainThread = NULL;
 }
 
 
@@ -117,4 +115,16 @@ extern "C" void Java_com_mcserver_MCServerActivity_NativeCleanUp( JNIEnv*  env,
 extern "C" jboolean Java_com_mcserver_MCServerActivity_NativeIsServerRunning( JNIEnv* env, jobject thiz )
 {
 	return pRoot != NULL;
+}
+
+
+
+
+extern "C" jint Java_com_mcserver_MCServerActivity_NativeGetWebAdminPort( JNIEnv* env, jobject thiz )
+{
+	if( pRoot != NULL && pRoot->GetWebAdmin() != NULL )
+	{
+		return pRoot->GetWebAdmin()->GetPort();
+	}
+	return 0;
 }
 \ No newline at end of file
diff --git a/Android/src/com/mcserver/MCServerActivity.java b/Android/src/com/mcserver/MCServerActivity.java
index 8d3507ca3..38b566250 100644
--- a/Android/src/com/mcserver/MCServerActivity.java
+++ b/Android/src/com/mcserver/MCServerActivity.java
@@ -59,7 +59,7 @@ public class MCServerActivity extends Activity {
         
         ((Button)findViewById(R.id.configure_server)).setOnClickListener( new View.OnClickListener() {
 			public void onClick(View v) {
-				Intent myIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("http://localhost:8081/webadmin/"));
+				Intent myIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("http://localhost:" + NativeGetWebAdminPort() + "/webadmin/"));
 				startActivity( myIntent );
 			}
 		});
@@ -251,6 +251,7 @@ public class MCServerActivity extends Activity {
     public native void    NativeOnCreate();
     public native void    NativeCleanUp();
     public native boolean NativeIsServerRunning();
+    public native int     NativeGetWebAdminPort();
     
 }