Relintai/sdl2_frt
1
0
Fork 0
mirror of https://github.com/Relintai/sdl2_frt.git synced 2024-12-20 22:16:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Try to work around Android's handling of static variables in terminated apps

Browse Source 
Android, we want to love you, but you don't make it easy for us...
This commit is contained in:
Gabriel Jacobo 2014-02-12 18:12:14 -03:00
parent 076a14b263
commit cf119f786a
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
android-project/src/org/libsdl/app/SDLActivity.java
View File

@ -28,7 +28,7 @@ public class SDLActivity extends Activity {
private static final String TAG = "SDL"; private static final String TAG = "SDL";
// Keep track of the paused state // Keep track of the paused state
public static boolean mIsPaused = false, mIsSurfaceReady = false, mHasFocus = true; public static boolean mIsPaused, mIsSurfaceReady, mHasFocus;
public static boolean mExitCalledFromJava; public static boolean mExitCalledFromJava;
// Main components // Main components
@ -53,22 +53,37 @@ public class SDLActivity extends Activity {
//System.loadLibrary("SDL2_ttf"); //System.loadLibrary("SDL2_ttf");
System.loadLibrary("main"); System.loadLibrary("main");
} }
public static void initialize() {
// The static nature of the singleton and Android quirkyness force us to initialize everything here
// Otherwise, when exiting the app and returning to it, these variables *keep* their pre exit values
mSingleton = null;
mSurface = null;
mTextEdit = null;
mLayout = null;
mJoystickHandler = null;
mSDLThread = null;
mAudioTrack = null;
mExitCalledFromJava = false;
mIsPaused = false;
mIsSurfaceReady = false;
mHasFocus = true;
}
// Setup // Setup
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
//Log.v("SDL", "onCreate()"); Log.v("SDL", "onCreate():" + mSingleton);
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
SDLActivity.initialize();
// So we can call stuff from static callbacks // So we can call stuff from static callbacks
mSingleton = this; mSingleton = this;
// Set up the surface // Set up the surface
mSurface = new SDLSurface(getApplication()); mSurface = new SDLSurface(getApplication());
// Make sure this variable is initialized here!
mExitCalledFromJava = false;
if(Build.VERSION.SDK_INT >= 12) { if(Build.VERSION.SDK_INT >= 12) {
mJoystickHandler = new SDLJoystickHandler_API12(); mJoystickHandler = new SDLJoystickHandler_API12();
} }
@ -118,7 +133,6 @@ public class SDLActivity extends Activity {
@Override @Override
protected void onDestroy() { protected void onDestroy() {
super.onDestroy();
Log.v("SDL", "onDestroy()"); Log.v("SDL", "onDestroy()");
// Send a quit message to the application // Send a quit message to the application
SDLActivity.mExitCalledFromJava = true; SDLActivity.mExitCalledFromJava = true;
@ -135,6 +149,10 @@ public class SDLActivity extends Activity {
//Log.v("SDL", "Finished waiting for SDL thread"); //Log.v("SDL", "Finished waiting for SDL thread");
} }
super.onDestroy();
// Reset everything in case the user re opens the app
SDLActivity.initialize();
} }
@Override @Override