geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Android: fix deprecated onCreateDialog() methods

Sylvain Becker 2020-10-24 20:31:04 +02:00
parent 5dc6c3c951
commit 0360987f45
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1233,9 +1233,6 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
/** Result of current messagebox. Also used for blocking the calling thread. */ /** Result of current messagebox. Also used for blocking the calling thread. */
protected final int[] messageboxSelection = new int[1]; protected final int[] messageboxSelection = new int[1];
/** Id of current dialog. */
protected int dialogs = 0;
/** /**
* This method is called by SDL using JNI. * This method is called by SDL using JNI.
* Shows the messagebox from UI thread and block calling thread. * Shows the messagebox from UI thread and block calling thread.
@ -1279,7 +1276,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
runOnUiThread(new Runnable() { runOnUiThread(new Runnable() {
@Override @Override
public void run() { public void run() {
showDialog(dialogs++, args); messageboxCreateAndShow(args);
} }
}); });
@ -1299,8 +1296,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
return messageboxSelection[0]; return messageboxSelection[0];
} }
@Override protected void messageboxCreateAndShow(Bundle args) {
protected Dialog onCreateDialog(int ignore, Bundle args) {
// TODO set values from "flags" to messagebox dialog // TODO set values from "flags" to messagebox dialog
@ -1329,7 +1325,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
// create dialog with title and a listener to wake up calling thread // create dialog with title and a listener to wake up calling thread
final Dialog dialog = new Dialog(this); final AlertDialog dialog = new AlertDialog.Builder(this).create();
dialog.setTitle(args.getString("title")); dialog.setTitle(args.getString("title"));
dialog.setCancelable(false); dialog.setCancelable(false);
dialog.setOnDismissListener(new DialogInterface.OnDismissListener() { dialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
@ -1415,7 +1411,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
// add content to dialog and return // add content to dialog and return
dialog.setContentView(content); dialog.setView(content);
dialog.setOnKeyListener(new Dialog.OnKeyListener() { dialog.setOnKeyListener(new Dialog.OnKeyListener() {
@Override @Override
public boolean onKey(DialogInterface d, int keyCode, KeyEvent event) { public boolean onKey(DialogInterface d, int keyCode, KeyEvent event) {
@ -1430,7 +1426,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
} }
}); });
return dialog; dialog.show();
} }
private final Runnable rehideSystemUi = new Runnable() { private final Runnable rehideSystemUi = new Runnable() {