@@ -314,7 +314,9 @@ public void onAccuracyChanged(Sensor sensor, int accuracy) {
314314 private void reloadList () {
315315 reminders .clear ();
316316 reminders .addAll (Reminder .getAllReminders ());
317- mAdapter .notifyDataSetChanged ();
317+ if (mAdapter != null ) {
318+ mAdapter .notifyDataSetChanged ();
319+ }
318320 }
319321
320322
@@ -544,29 +546,33 @@ private boolean rescheduleOrCancelReminder(final Reminder remind) {
544546 }
545547
546548 private void askWhenToReschedule (final Reminder remind ) {
547- val now = tsl ();
548- val oldt = remind .getPotentialNextSchedule ();
549- val newt = now + remind .period ;
550- val choice = String .format ("%s: %s @ %s\n \n or\n \n %s: %s @ %s" ,
551- getString (R .string .old ), niceTimeScalarNatural (-msSince (oldt )),hourMinuteString (oldt ),
552- getString (R .string .neww ), niceTimeScalarNatural (-msSince (newt )),hourMinuteString (newt ));
549+ try {
550+ val now = tsl ();
551+ val oldt = remind .getPotentialNextSchedule ();
552+ val newt = now + remind .period ;
553+ val choice = String .format ("%s: %s @ %s\n \n or\n \n %s: %s @ %s" ,
554+ xdrip .gs (R .string .old ), niceTimeScalarNatural (-msSince (oldt )), hourMinuteString (oldt ),
555+ xdrip .gs (R .string .neww ), niceTimeScalarNatural (-msSince (newt )), hourMinuteString (newt ));
553556
554- val builder = new AlertDialog .Builder (this )
555- .setTitle (R .string .reschedule_with_new_timing )
556- .setMessage (choice );
557+ val builder = new AlertDialog .Builder (this )
558+ .setTitle (R .string .reschedule_with_new_timing )
559+ .setMessage (choice );
557560
558- builder .setPositiveButton (getString (R .string .old ), (dialog , which ) -> rescheduleNextOld (remind ));
559- builder .setNegativeButton (getString (R .string .neww ), (dialog , which ) -> rescheduleNextNew (remind , newt ));
561+ builder .setPositiveButton (xdrip . gs (R .string .old ), (dialog , which ) -> rescheduleNextOld (remind ));
562+ builder .setNegativeButton (xdrip . gs (R .string .neww ), (dialog , which ) -> rescheduleNextNew (remind , newt ));
560563
561- val dialog = builder .create ();
562- try {
563- if (dialog .isShowing ()) {
564- dialog .dismiss ();
564+ val dialog = builder .create ();
565+ try {
566+ if (dialog .isShowing ()) {
567+ dialog .dismiss ();
568+ }
569+ } catch (Exception e ) {
570+ //
565571 }
572+ dialog .show ();
566573 } catch (Exception e ) {
567- //
574+ UserError . Log . e ( TAG , "Got exception in askWhenToReschedule: " + e );
568575 }
569- dialog .show ();
570576 }
571577
572578
0 commit comments