From 1bd1696cebd6157261f32c3e8bdecf5914312c22 Mon Sep 17 00:00:00 2001 From: STRWarrior Date: Mon, 23 Dec 2013 16:56:21 +0100 Subject: Just a quick update for the files you need to compile for Android. --- Android/jni/app-android.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'Android/jni/app-android.cpp') diff --git a/Android/jni/app-android.cpp b/Android/jni/app-android.cpp index 197df29c4..40009c77c 100644 --- a/Android/jni/app-android.cpp +++ b/Android/jni/app-android.cpp @@ -11,8 +11,9 @@ #include #include "OSSupport/CriticalSection.h" -#include "OSSupport/MakeDir.h" +#include "OSSupport/File.h" #include "ToJava.h" +#include "inifile/iniFile.h" #include "Root.h" #include "WebAdmin.h" @@ -84,7 +85,7 @@ extern "C" void Java_com_mcserver_MCServerActivity_NativeOnCreate( JNIEnv* env, //__android_log_print(ANDROID_LOG_ERROR,"MCServer", "%s", "Logging from C++!"); g_CriticalSection.Unlock(); - mkdir("/sdcard/mcserver", S_IRWXU | S_IRWXG | S_IRWXO); + cFile::CreateFolder("/sdcard/mcserver"); pRoot = new cRoot(); pRoot->Start(); @@ -105,7 +106,7 @@ extern "C" void Java_com_mcserver_MCServerActivity_NativeCleanUp( JNIEnv* env, __android_log_print(ANDROID_LOG_ERROR,"MCServer", "pRoot: %p", pRoot); if( pRoot != NULL ) { - pRoot->ExecuteConsoleCommand("stop"); + pRoot->QueueExecuteConsoleCommand("stop"); } } @@ -122,9 +123,10 @@ extern "C" jboolean Java_com_mcserver_MCServerActivity_NativeIsServerRunning( JN extern "C" jint Java_com_mcserver_MCServerActivity_NativeGetWebAdminPort( JNIEnv* env, jobject thiz ) { - if( pRoot != NULL && pRoot->GetWebAdmin() != NULL ) + cIniFile IniFile; + if (IniFile.ReadFile("/sdcard/mcserver/webadmin.ini")) { - return pRoot->GetWebAdmin()->GetPort(); + return IniFile.GetValueI("WebAdmin", "Port"); } return 0; } \ No newline at end of file -- cgit v1.2.3 From b42487744871ab4587edabe2a3b87c9d26ac030f Mon Sep 17 00:00:00 2001 From: STRWarrior Date: Tue, 24 Dec 2013 14:44:24 +0100 Subject: Fixed getting configure button going to port 0. --- Android/jni/app-android.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'Android/jni/app-android.cpp') diff --git a/Android/jni/app-android.cpp b/Android/jni/app-android.cpp index 40009c77c..8f4346ac3 100644 --- a/Android/jni/app-android.cpp +++ b/Android/jni/app-android.cpp @@ -123,10 +123,9 @@ extern "C" jboolean Java_com_mcserver_MCServerActivity_NativeIsServerRunning( JN extern "C" jint Java_com_mcserver_MCServerActivity_NativeGetWebAdminPort( JNIEnv* env, jobject thiz ) { - cIniFile IniFile; - if (IniFile.ReadFile("/sdcard/mcserver/webadmin.ini")) + if( pRoot != NULL && pRoot->GetWebAdmin() != NULL ) { - return IniFile.GetValueI("WebAdmin", "Port"); + return atoi(pRoot->GetWebAdmin()->GetIPv4Ports().c_str()); } return 0; -} \ No newline at end of file +} -- cgit v1.2.3 From 6ad0da5ce0dd01a94344ea7371f517b8307e73e9 Mon Sep 17 00:00:00 2001 From: STRWarrior Date: Tue, 24 Dec 2013 14:52:19 +0100 Subject: Removed unneeded include. --- Android/jni/app-android.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'Android/jni/app-android.cpp') diff --git a/Android/jni/app-android.cpp b/Android/jni/app-android.cpp index 8f4346ac3..386f1b90e 100644 --- a/Android/jni/app-android.cpp +++ b/Android/jni/app-android.cpp @@ -13,7 +13,6 @@ #include "OSSupport/CriticalSection.h" #include "OSSupport/File.h" #include "ToJava.h" -#include "inifile/iniFile.h" #include "Root.h" #include "WebAdmin.h" -- cgit v1.2.3