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

Fixed possible leak and its Android Lint warning in Java file.

Browse source
This commit is contained in:
Philipp Wiesemann 2013-05-05 12:50:34 +02:00
parent b5c9f3354d
commit 3fd91d1319
1 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -24,6 +24,7 @@ import android.hardware.*;
SDL Activity SDL Activity
*/ */
public class SDLActivity extends Activity { public class SDLActivity extends Activity {
private static final String TAG = "SDL";
// Keep track of the paused state // Keep track of the paused state
public static boolean mIsPaused = false; public static boolean mIsPaused = false;
@ -113,25 +114,41 @@ public class SDLActivity extends Activity {
static final int COMMAND_UNUSED = 2; static final int COMMAND_UNUSED = 2;
static final int COMMAND_TEXTEDIT_HIDE = 3; static final int COMMAND_TEXTEDIT_HIDE = 3;
// Handler for the messages /**
Handler commandHandler = new Handler() { * A Handler class for Messages from native SDL applications.
* It uses current Activities as target (e.g. for the title).
* static to prevent implicit references to enclosing object.
*/
protected static class SDLCommandHandler extends Handler {
@Override @Override
public void handleMessage(Message msg) { public void handleMessage(Message msg) {
Context context = getContext();
if (context == null) {
Log.e(TAG, "error handling message, getContext() returned null");
return;
}
switch (msg.arg1) { switch (msg.arg1) {
case COMMAND_CHANGE_TITLE: case COMMAND_CHANGE_TITLE:
setTitle((String)msg.obj); if (context instanceof Activity) {
((Activity) context).setTitle((String)msg.obj);
} else {
Log.e(TAG, "error handling message, getContext() returned no Activity");
}
break; break;
case COMMAND_TEXTEDIT_HIDE: case COMMAND_TEXTEDIT_HIDE:
if (mTextEdit != null) { if (mTextEdit != null) {
mTextEdit.setVisibility(View.GONE); mTextEdit.setVisibility(View.GONE);
InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
imm.hideSoftInputFromWindow(mTextEdit.getWindowToken(), 0); imm.hideSoftInputFromWindow(mTextEdit.getWindowToken(), 0);
} }
break; break;
} }
} }
}; }
// Handler for the messages
Handler commandHandler = new SDLCommandHandler();
// Send a message from the SDLMain thread // Send a message from the SDLMain thread
void sendCommand(int command, Object data) { void sendCommand(int command, Object data) {