summaryrefslogtreecommitdiffstats
path: root/src/android/java/src/org/qtproject
diff options
context:
space:
mode:
authorAssam Boudjelthia <assam.boudjelthia@qt.io>2022-09-30 14:33:40 +0300
committerAssam Boudjelthia <assam.boudjelthia@qt.io>2022-12-27 09:27:57 +0000
commit415df9c299b5c8c01b96ff0e47aa0bbf850bdea7 (patch)
tree171b306e9a1ac519aed9ab62b81aafa8ac15b3a3 /src/android/java/src/org/qtproject
parent8d84f47d0cbf5e0290744464abf6b7711aba5c46 (diff)
Android: Fix deprecations AlertDialog.setButton()
https://developer.android.com/reference/android/app/ AlertDialog#setButton(java.lang.CharSequence, %20android.content.DialogInterface.OnClickListener) Change-Id: I470acba581b7226b2d4a56754cf6372baa167eb4 Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io> (cherry picked from commit 40b42ac517c45beff3caf5e991c84739ac014912)
Diffstat (limited to 'src/android/java/src/org/qtproject')
-rw-r--r--src/android/java/src/org/qtproject/qt5/android/bindings/QtLoader.java13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/android/java/src/org/qtproject/qt5/android/bindings/QtLoader.java b/src/android/java/src/org/qtproject/qt5/android/bindings/QtLoader.java
index 1e72aa3841..9b4feb9f91 100644
--- a/src/android/java/src/org/qtproject/qt5/android/bindings/QtLoader.java
+++ b/src/android/java/src/org/qtproject/qt5/android/bindings/QtLoader.java
@@ -37,6 +37,7 @@
package org.qtproject.qt5.android.bindings;
import android.app.AlertDialog;
+import android.app.Dialog;
import android.content.ComponentName;
import android.content.Context;
import android.content.ContextWrapper;
@@ -226,7 +227,9 @@ public abstract class QtLoader {
// fatal error, show the error and quit
AlertDialog errorDialog = new AlertDialog.Builder(m_context).create();
errorDialog.setMessage(loaderParams.getString(ERROR_MESSAGE_KEY));
- errorDialog.setButton(m_context.getResources().getString(android.R.string.ok), new DialogInterface.OnClickListener() {
+ errorDialog.setButton(Dialog.BUTTON_POSITIVE,
+ m_context.getResources().getString(android.R.string.ok),
+ new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
finish();
@@ -281,7 +284,9 @@ public abstract class QtLoader {
else
errorDialog.setMessage("Fatal error, your application can't be started.");
- errorDialog.setButton(m_context.getResources().getString(android.R.string.ok), new DialogInterface.OnClickListener() {
+ errorDialog.setButton(Dialog.BUTTON_POSITIVE,
+ m_context.getResources().getString(android.R.string.ok),
+ new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
finish();
@@ -347,7 +352,9 @@ public abstract class QtLoader {
else
errorDialog.setMessage("Can't find Ministro service.\nThe application can't start.");
- errorDialog.setButton(m_context.getResources().getString(android.R.string.ok), new DialogInterface.OnClickListener() {
+ errorDialog.setButton(Dialog.BUTTON_POSITIVE,
+ m_context.getResources().getString(android.R.string.ok),
+ new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
finish();