From ee4f3fabcf14636209bc240ed3872f8dc2d01b35 Mon Sep 17 00:00:00 2001 From: Arjan Schrijver Date: Sat, 5 Aug 2023 21:48:34 +0200 Subject: [PATCH] Fix widget device choice dialog behaviour --- .../SleepAlarmWidgetConfigurationActivity.java | 18 ++---------------- .../WidgetConfigurationActivity.java | 17 ++--------------- 2 files changed, 4 insertions(+), 31 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SleepAlarmWidgetConfigurationActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SleepAlarmWidgetConfigurationActivity.java index 27983b245..417bdfb3e 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SleepAlarmWidgetConfigurationActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SleepAlarmWidgetConfigurationActivity.java @@ -83,12 +83,6 @@ public class SleepAlarmWidgetConfigurationActivity extends Activity implements G String[] allDevicesString = list.toArray(new String[0]); builder.setSingleChoiceItems(allDevicesString, 0, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - } - }); - - builder.setPositiveButton("OK", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { ListView lw = ((AlertDialog) dialog).getListView(); @@ -106,16 +100,8 @@ public class SleepAlarmWidgetConfigurationActivity extends Activity implements G finish(); } }); - builder.setNegativeButton("Cancel", new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - Intent resultValue; - resultValue = new Intent(); - resultValue.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, mAppWidgetId); - setResult(RESULT_CANCELED, resultValue); - finish(); - } - }); + builder.setCancelable(false); + AlertDialog dialog = builder.create(); dialog.show(); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/WidgetConfigurationActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/WidgetConfigurationActivity.java index 1789fc382..3921c6e0c 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/WidgetConfigurationActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/WidgetConfigurationActivity.java @@ -77,12 +77,6 @@ public class WidgetConfigurationActivity extends Activity implements GBActivity String[] allDevicesString = list.toArray(new String[0]); builder.setSingleChoiceItems(allDevicesString, 0, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - } - }); - - builder.setPositiveButton("OK", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { ListView lw = ((AlertDialog) dialog).getListView(); @@ -100,15 +94,8 @@ public class WidgetConfigurationActivity extends Activity implements GBActivity finish(); } }); - builder.setNegativeButton("Cancel", new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - Intent resultValue; resultValue = new Intent(); - resultValue.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, mAppWidgetId); - setResult(RESULT_CANCELED, resultValue); - finish(); - } - }); + builder.setCancelable(false); + AlertDialog dialog = builder.create(); dialog.show(); }