From 682ab3ff7a80f9c0d689087cfadaa7c894e37b25 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Thu, 18 Mar 2021 08:40:22 -0500
Subject: [PATCH] Include rrule when reporting exceptions

---
 .../java/org/tasks/repeats/RepeatRuleToString.kt  | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/org/tasks/repeats/RepeatRuleToString.kt b/app/src/main/java/org/tasks/repeats/RepeatRuleToString.kt
index f0d000c9c..d3bf406cd 100644
--- a/app/src/main/java/org/tasks/repeats/RepeatRuleToString.kt
+++ b/app/src/main/java/org/tasks/repeats/RepeatRuleToString.kt
@@ -14,7 +14,6 @@ import org.tasks.locale.Locale
 import org.tasks.repeats.RecurrenceUtils.newRecur
 import org.tasks.time.DateTime
 import java.text.DateFormatSymbols
-import java.text.ParseException
 import java.util.*
 import javax.inject.Inject
 
@@ -25,20 +24,15 @@ class RepeatRuleToString @Inject constructor(
 ) {
     private val weekdays = listOf(*Day.values())
 
-    fun toString(rrule: String?): String? = try {
-        rrule?.let { toString(newRecur(it)) }
-    } catch (e: ParseException) {
-        firebase.reportException(e)
-        null
-    }
+    fun toString(rrule: String?): String? = rrule?.let { toString(newRecur(it)) }
 
-    fun toString(rrule: Recur): String {
+    fun toString(rrule: Recur): String = try {
         val interval = rrule.interval
         val frequency = rrule.frequency
         val repeatUntil = if (rrule.until == null) null else DateTime.from(rrule.until)
         val count = rrule.count
         val countString = if (count > 0) context.resources.getQuantityString(R.plurals.repeat_times, count) else ""
-        return if (interval <= 1) {
+        if (interval <= 1) {
             val frequencyString = context.getString(getSingleFrequencyResource(frequency))
             if ((frequency == WEEKLY || frequency == MONTHLY) && !rrule.dayList.isEmpty()) {
                 val dayString = getDayString(rrule)
@@ -104,6 +98,9 @@ class RepeatRuleToString @Inject constructor(
                         DateUtilities.getLongDateString(repeatUntil, locale.locale))
             }
         }
+    } catch (e: Exception) {
+        firebase.reportException(IllegalStateException("$rrule caused $e"))
+        rrule.toString()
     }
 
     private fun getDayString(rrule: Recur): String {