@@ -175,19 +175,21 @@ protected void onPause() {
175175 public boolean onCreateOptionsMenu (Menu menu ) {
176176 super .onCreateOptionsMenu (menu );
177177 menu .add (0 , R .id .menu_add_device , 0 , R .string .menu_add_device ).setIcon (R .drawable .ic_menu_add );
178- menu .add (0 , R .id .menu_delete_all_devices , 0 , R .string .menu_delete_all ).setIcon (R .drawable .ic_menu_delete );
179178 menu .add (0 , R .id .menu_requery , 0 , R .string .requery ).setIcon (R .drawable .ic_menu_refresh );
179+ menu .add (0 , R .id .menu_delete_all_devices , 0 , R .string .menu_delete_all ).setIcon (R .drawable .ic_menu_delete );
180180 menu .add (0 , R .id .menu_preferences , 0 , R .string .menu_preferences ).setIcon (R .drawable .ic_menu_preferences );
181181 menu .add (0 , R .id .menu_about , 0 , R .string .menu_about ).setIcon (R .drawable .ic_menu_info_details );
182182 menu .findItem (R .id .menu_add_device ).setShowAsAction (MenuItem .SHOW_AS_ACTION_IF_ROOM );
183183 menu .findItem (R .id .menu_requery ).setShowAsAction (MenuItem .SHOW_AS_ACTION_IF_ROOM );
184+ menu .findItem (R .id .menu_delete_all_devices ).setShowAsAction (MenuItem .SHOW_AS_ACTION_IF_ROOM );
184185 return true ;
185186 }
186187
187188 @ Override
188189 public boolean onPrepareOptionsMenu (Menu menu ) {
189190 TabHost th = (TabHost )findViewById (android .R .id .tabhost );
190191 menu .findItem (R .id .menu_add_device ).setVisible (!th .getCurrentTabTag ().equals ("outlets" ));
192+ menu .findItem (R .id .menu_delete_all_devices ).setVisible (!th .getCurrentTabTag ().equals ("outlets" ));
191193 super .onPrepareOptionsMenu (menu );
192194 return true ;
193195 }
@@ -218,15 +220,31 @@ public boolean onOptionsItemSelected(MenuItem item) {
218220 }
219221
220222 case R .id .menu_delete_all_devices : {
221- new AlertDialog .Builder (this )
222- .setTitle (R .string .delete_all_devices )
223- .setMessage (R .string .confirmation_delete_all_devices )
223+ TabHost th = (TabHost )findViewById (android .R .id .tabhost );
224+ if (th .getCurrentTabTag ().equals ("devices" )) {
225+ new AlertDialog .Builder (this )
226+ .setTitle (R .string .delete_all_devices )
227+ .setMessage (R .string .confirmation_delete_all_devices )
228+ .setIcon (android .R .drawable .ic_dialog_alert )
229+ .setPositiveButton (android .R .string .yes , new DialogInterface .OnClickListener () {
230+ public void onClick (DialogInterface dialog , int whichButton ) {
231+ // Delete all devices
232+ alDevices .clear ();
233+ SaveConfiguredDevices ();
234+ }})
235+ .setNegativeButton (android .R .string .no , null ).show ();
236+ } else if (th .getCurrentTabTag ().equals ("groups" )) {
237+ new AlertDialog .Builder (this )
238+ .setTitle (R .string .delete_all_groups )
239+ .setMessage (R .string .confirmation_delete_all_groups )
224240 .setIcon (android .R .drawable .ic_dialog_alert )
225241 .setPositiveButton (android .R .string .yes , new DialogInterface .OnClickListener () {
226242 public void onClick (DialogInterface dialog , int whichButton ) {
227- deleteAllDevices ();
243+ // Delete all groups
244+ adpGroups .deleteAll ();
228245 }})
229246 .setNegativeButton (android .R .string .no , null ).show ();
247+ }
230248 return true ;
231249 }
232250
@@ -362,11 +380,6 @@ public void deleteDevice(int position) {
362380 SaveConfiguredDevices ();
363381 }
364382
365- public void deleteAllDevices () {
366- alDevices .clear ();
367- SaveConfiguredDevices ();
368- }
369-
370383 private BroadcastReceiver onDeviceDiscovered = new BroadcastReceiver () {
371384 @ Override
372385 synchronized public void onReceive (Context context , Intent intent ) {
0 commit comments