diff --git a/app/src/main/java/org/pixeldroid/app/posts/feeds/cachedFeeds/notifications/NotificationsFragment.kt b/app/src/main/java/org/pixeldroid/app/posts/feeds/cachedFeeds/notifications/NotificationsFragment.kt index b378b676..d3f031ce 100644 --- a/app/src/main/java/org/pixeldroid/app/posts/feeds/cachedFeeds/notifications/NotificationsFragment.kt +++ b/app/src/main/java/org/pixeldroid/app/posts/feeds/cachedFeeds/notifications/NotificationsFragment.kt @@ -9,6 +9,7 @@ import android.view.View import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView +import androidx.core.app.NotificationManagerCompat import androidx.core.content.ContextCompat import androidx.lifecycle.LifecycleCoroutineScope import androidx.lifecycle.ViewModelProvider @@ -31,6 +32,7 @@ import org.pixeldroid.app.utils.api.objects.Account import org.pixeldroid.app.utils.api.objects.Notification import org.pixeldroid.app.utils.api.objects.Status import org.pixeldroid.app.utils.di.PixelfedAPIHolder +import org.pixeldroid.app.utils.notificationsWorker.makeChannelGroupId /** @@ -64,6 +66,16 @@ class NotificationsFragment : CachedFeedFragment() { } + override fun onResume() { + super.onResume() + with(NotificationManagerCompat.from(requireContext())) { + // Cancel account notification group + db.userDao().getActiveUser()?.let { + cancel( makeChannelGroupId(it).hashCode()) + } + } + } + /** * View Holder for a [Notification] RecyclerView list item. */ diff --git a/app/src/main/java/org/pixeldroid/app/utils/notificationsWorker/NotificationsWorker.kt b/app/src/main/java/org/pixeldroid/app/utils/notificationsWorker/NotificationsWorker.kt index 23e360fe..1133e298 100644 --- a/app/src/main/java/org/pixeldroid/app/utils/notificationsWorker/NotificationsWorker.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/notificationsWorker/NotificationsWorker.kt @@ -12,7 +12,6 @@ import androidx.core.app.NotificationCompat import androidx.core.app.NotificationManagerCompat import androidx.work.CoroutineWorker import androidx.work.WorkerParameters -import okhttp3.internal.format import org.pixeldroid.app.MainActivity import org.pixeldroid.app.R import org.pixeldroid.app.posts.PostActivity