From 1bb01256fcd9757399d9c65ee82fec1480976501 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Sat, 24 Aug 2019 13:14:45 +0200
Subject: [PATCH] Fix crash when interacting with notifications. Fixes #1218

---
 .../java/com/habitrpg/android/habitica/api/ApiService.kt    | 6 +++---
 .../habitica/ui/viewmodels/NotificationsViewModel.kt        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.kt
index fb4117920..02c9dc6c7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.kt
@@ -326,13 +326,13 @@ interface ApiService {
 
     // Notifications
     @POST("notifications/{notificationId}/read")
-    fun readNotification(@Path("notificationId") notificationId: String): Flowable<HabitResponse<List<*>>>
+    fun readNotification(@Path("notificationId") notificationId: String): Flowable<HabitResponse<List<Any>>>
 
     @POST("notifications/read")
-    fun readNotifications(@Body notificationIds: Map<String, List<String>>): Flowable<HabitResponse<List<*>>>
+    fun readNotifications(@Body notificationIds: Map<String, List<String>>): Flowable<HabitResponse<List<Any>>>
 
     @POST("notifications/see")
-    fun seeNotifications(@Body notificationIds: Map<String, List<String>>): Flowable<HabitResponse<List<*>>>
+    fun seeNotifications(@Body notificationIds: Map<String, List<String>>): Flowable<HabitResponse<List<Any>>>
 
     @POST("user/open-mystery-item")
     fun openMysteryItem(): Flowable<HabitResponse<Equipment>>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/NotificationsViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/NotificationsViewModel.kt
index a95f823f9..e52e83cb8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/NotificationsViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/NotificationsViewModel.kt
@@ -187,7 +187,7 @@ open class NotificationsViewModel : BaseViewModel() {
      * instead of one of the ones coming from server.
      */
     private fun isCustomNotification(notification: Notification): Boolean {
-        return notification.id.startsWith("custom-")
+        return notification.id.startsWith("custom-") || notification.id == "new-stuff-notification"
     }
 
     fun dismissNotification(notification: Notification) {