Merge pull request #52 from udaysrinath/master

Fix NPE in onRestoreInstanceState() for lastSelectedDay
BlackBoxVision · Nov 17, 2017 · 61025ae · 61025ae
2 parents 2a74737 + 1681aa3
commit 61025ae
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/...calendarview/src/main/java/io/blackbox_vision/materialcalendarview/view/CalendarView.java b/...calendarview/src/main/java/io/blackbox_vision/materialcalendarview/view/CalendarView.java
@@ -262,15 +262,14 @@ protected void onRestoreInstanceState(Parcelable state) {
                 currentMonthIndex = savedInstanceState.getInt(KEY_MONTH_INDEX);
                 if (savedInstanceState.getSerializable(KEY_SELECTED_DATE) != null) {
                     lastSelectedDay = (Date) savedInstanceState.getSerializable(KEY_SELECTED_DATE);
+                } else {
+                    lastSelectedDay = new Date();
                 }
             }
-            Calendar calendar = (lastSelectedDay != null) ? getCalDate(lastSelectedDay) : Calendar.getInstance(Locale.getDefault());
+            Calendar calendar = getCalDate(lastSelectedDay);
             update(calendar);
-
-            if (lastSelectedDay != null) {
-                markDateAsSelected(lastSelectedDay);
-                onDateClickListener.onDateClick(lastSelectedDay);
-            }
+            markDateAsSelected(lastSelectedDay);
+            onDateClickListener.onDateClick(lastSelectedDay);
         }
 
         super.onRestoreInstanceState(state);