Merge pull request #286 from code-troopers/fix/282

fix #282 : Recurrence NPE on selected monthly recurrency + any last w…

Author: fchauveau

library/src/main/java/com/codetroopers/betterpickers/recurrencepicker/EventRecurrenceFormatter.java

@@ -103,10 +103,13 @@ public static String getRepeatString(Context context, Resources r, EventRecurren
                 String details = "";
                 if (recurrence.byday != null) {
                     int weekday = EventRecurrence.day2CalendarDay(recurrence.byday[0]) - 1;
-                    int dayNumber = recurrence.bydayNum[0];
                     // Cache this stuff so we won't have to redo work again later.
                     cacheMonthRepeatStrings(r, weekday);
 
+                    int dayNumber = recurrence.bydayNum[0];
+                    if(dayNumber == RecurrencePickerDialogFragment.LAST_NTH_DAY_OF_WEEK){
+                        dayNumber = 5;
+                    }
                     details = mMonthRepeatByDayOfWeekStrs[weekday][dayNumber - 1];
                 }
                 return r.getQuantityString(R.plurals.monthly, interval, interval, details) + endString;

library/src/main/java/com/codetroopers/betterpickers/recurrencepicker/RecurrencePickerDialogFragment.java

@@ -84,7 +84,7 @@ public class RecurrencePickerDialogFragment extends DialogFragment implements On
 
     // Special cases in monthlyByNthDayOfWeek
     private static final int FIFTH_WEEK_IN_A_MONTH = 5;
-    private static final int LAST_NTH_DAY_OF_WEEK = -1;
+    public static final int LAST_NTH_DAY_OF_WEEK = -1;
 
     private CalendarDatePickerDialogFragment mDatePickerDialog;