pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changed signatures of methods in Java file to return boolean, adapted C++ file.

Browse source 
This way more checking for errors is possible which is currently not done here.
This commit is contained in:
Philipp Wiesemann 2013-05-05 15:54:56 +02:00
parent 89805a7cae
commit 4266102f1d
2 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

16
android-project/src/org/libsdl/app/SDLActivity.java
View file

@ -170,11 +170,11 @@ public class SDLActivity extends Activity {
Handler commandHandler = new SDLCommandHandler(); Handler commandHandler = new SDLCommandHandler();
// Send a message from the SDLMain thread // Send a message from the SDLMain thread
void sendCommand(int command, Object data) { boolean sendCommand(int command, Object data) {
Message msg = commandHandler.obtainMessage(); Message msg = commandHandler.obtainMessage();
msg.arg1 = command; msg.arg1 = command;
msg.obj = data; msg.obj = data;
commandHandler.sendMessage(msg); return commandHandler.sendMessage(msg);
} }
// C functions we call // C functions we call
@ -202,13 +202,13 @@ public class SDLActivity extends Activity {
flipEGL(); flipEGL();
} }
public static void setActivityTitle(String title) { public static boolean setActivityTitle(String title) {
// Called from SDLMain() thread and can't directly affect the view // Called from SDLMain() thread and can't directly affect the view
mSingleton.sendCommand(COMMAND_CHANGE_TITLE, title); return mSingleton.sendCommand(COMMAND_CHANGE_TITLE, title);
} }
public static void sendMessage(int command, int param) { public static boolean sendMessage(int command, int param) {
mSingleton.sendCommand(command, Integer.valueOf(param)); return mSingleton.sendCommand(command, Integer.valueOf(param));
} }
public static Context getContext() { public static Context getContext() {
@ -271,9 +271,9 @@ public class SDLActivity extends Activity {
} }
} }
public static void showTextInput(int x, int y, int w, int h) { public static boolean showTextInput(int x, int y, int w, int h) {
// Transfer the task to the main thread as a Runnable // Transfer the task to the main thread as a Runnable
mSingleton.commandHandler.post(new ShowTextInputTask(x, y, w, h)); return mSingleton.commandHandler.post(new ShowTextInputTask(x, y, w, h));
} }

14
src/core/android/SDL_android.cpp
View file

@ -339,10 +339,10 @@ extern "C" void Android_JNI_SetActivityTitle(const char *title)
{ {
jmethodID mid; jmethodID mid;
JNIEnv *mEnv = Android_JNI_GetEnv(); JNIEnv *mEnv = Android_JNI_GetEnv();
mid = mEnv->GetStaticMethodID(mActivityClass,"setActivityTitle","(Ljava/lang/String;)V"); mid = mEnv->GetStaticMethodID(mActivityClass,"setActivityTitle","(Ljava/lang/String;)Z");
if (mid) { if (mid) {
jstring jtitle = reinterpret_cast<jstring>(mEnv->NewStringUTF(title)); jstring jtitle = reinterpret_cast<jstring>(mEnv->NewStringUTF(title));
mEnv->CallStaticVoidMethod(mActivityClass, mid, jtitle); mEnv->CallStaticBooleanMethod(mActivityClass, mid, jtitle);
mEnv->DeleteLocalRef(jtitle); mEnv->DeleteLocalRef(jtitle);
} }
} }
@ -1085,12 +1085,12 @@ extern "C" int Android_JNI_SendMessage(int command, int param)
if (!env) { if (!env) {
return -1; return -1;
} }
jmethodID mid = env->GetStaticMethodID(mActivityClass, "sendMessage", "(II)V"); jmethodID mid = env->GetStaticMethodID(mActivityClass, "sendMessage", "(II)Z");
if (!mid) { if (!mid) {
return -1; return -1;
} }
env->CallStaticVoidMethod(mActivityClass, mid, command, param); jboolean success = env->CallStaticBooleanMethod(mActivityClass, mid, command, param);
return 0; return success ? 0 : -1;
} }
extern "C" void Android_JNI_ShowTextInput(SDL_Rect *inputRect) extern "C" void Android_JNI_ShowTextInput(SDL_Rect *inputRect)
@ -1100,11 +1100,11 @@ extern "C" void Android_JNI_ShowTextInput(SDL_Rect *inputRect)
return; return;
} }
jmethodID mid = env->GetStaticMethodID(mActivityClass, "showTextInput", "(IIII)V"); jmethodID mid = env->GetStaticMethodID(mActivityClass, "showTextInput", "(IIII)Z");
if (!mid) { if (!mid) {
return; return;
} }
env->CallStaticVoidMethod( mActivityClass, mid, env->CallStaticBooleanMethod( mActivityClass, mid,
inputRect->x, inputRect->x,
inputRect->y, inputRect->y,
inputRect->w, inputRect->w,