Update subscription and review nagging

app/src/googleplay/java/org/tasks/analytics/Firebase.kt

@@ -63,14 +63,15 @@ class Firebase @Inject constructor(
         })
     }
 
-    val installCooldown: Boolean
+    private val installCooldown: Boolean
         get() = preferences.installDate + days("install_cooldown", 14L) > now()
 
     val reviewCooldown: Boolean
-        get() = preferences.lastReviewRequest + days("review_cooldown", 30L) > now()
+        get() = installCooldown || preferences.lastReviewRequest + days("review_cooldown", 30L) > now()
 
     val subscribeCooldown: Boolean
-        get() = preferences.lastSubscribeRequest + days("subscribe_cooldown", 30L) > now()
+        get() = installCooldown
+                || preferences.lastSubscribeRequest + days("subscribe_cooldown", 30L) > now()
 
     private fun days(key: String, default: Long): Long =
             TimeUnit.DAYS.toMillis(remoteConfig?.getLong(key) ?: default)

app/src/googleplay/java/org/tasks/play/PlayServices.kt

@@ -9,9 +9,9 @@ import com.google.android.play.core.ktx.requestReview
 import com.google.android.play.core.review.ReviewManagerFactory
 import com.todoroo.andlib.utility.DateUtilities.now
 import dagger.hilt.android.qualifiers.ApplicationContext
+import org.tasks.R
 import org.tasks.analytics.Firebase
 import org.tasks.preferences.Preferences
-import timber.log.Timber
 import javax.inject.Inject
 
 class PlayServices @Inject constructor(
@@ -24,11 +24,6 @@ class PlayServices @Inject constructor(
 
     suspend fun requestReview(activity: Activity) {
         if (firebase.reviewCooldown) {
-            Timber.d("review cooldown")
-            return
-        }
-        if (firebase.installCooldown) {
-            Timber.d("install cooldown")
             return
         }
         try {
@@ -36,9 +31,10 @@ class PlayServices @Inject constructor(
                 val request = requestReview()
                 launchReview(activity, request)
                 preferences.lastReviewRequest = now()
+                firebase.logEvent(R.string.event_request_review)
             }
         } catch (e: Exception) {
-            Timber.e(e)
+            firebase.reportException(e)
         }
     }
 }

app/src/main/res/values/keys.xml

@@ -434,6 +434,7 @@
   <string name="event_banner_beast">banner_beast</string>
   <string name="event_banner_sub">banner_subscribe</string>
   <string name="event_add_task">add_task</string>
+  <string name="event_request_review">request_review</string>
   <string name="param_type">type</string>
   <string name="p_map_theme">map_theme</string>
   <string name="p_picker_mode_date">picker_mode_date</string>