Migrate to PendingIntentCompat

2023-04-20 18:09:24 +03:00
parent 7bd1affe5e
commit 1dc7e61dbd
6 changed files with 50 additions and 48 deletions
--- a/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadNotification.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadNotification.kt
@@ -10,6 +10,7 @@ import android.text.format.DateUtils
 import android.util.SparseArray
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
+import androidx.core.app.PendingIntentCompat
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.toBitmap
 import androidx.core.text.HtmlCompat
@@ -28,7 +29,6 @@ import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.util.ellipsize
 import org.koitharu.kotatsu.parsers.util.format
 import org.koitharu.kotatsu.search.ui.MangaListActivity
-import org.koitharu.kotatsu.utils.PendingIntentCompat
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage

 class DownloadNotification(private val context: Context) {
@@ -37,18 +37,20 @@ class DownloadNotification(private val context: Context) {
 	private val states = SparseArray<DownloadState>()
 	private val groupBuilder = NotificationCompat.Builder(context, CHANNEL_ID)

-	private val queueIntent = PendingIntent.getActivity(
+	private val queueIntent = PendingIntentCompat.getActivity(
 		context,
 		REQUEST_QUEUE,
 		DownloadsActivity.newIntent(context),
-		PendingIntentCompat.FLAG_IMMUTABLE,
+		0,
+		false,
 	)

-	private val localListIntent = PendingIntent.getActivity(
+	private val localListIntent = PendingIntentCompat.getActivity(
 		context,
 		REQUEST_LIST_LOCAL,
 		MangaListActivity.newIntent(context, MangaSource.LOCAL),
-		PendingIntentCompat.FLAG_IMMUTABLE,
+		0,
+		false,
 	)

 	init {
@@ -78,31 +80,37 @@ class DownloadNotification(private val context: Context) {
 					progress++
 					context.getString(R.string.cancelling_)
 				}
+
 				is DownloadState.Done -> {
 					progress++
 					context.getString(R.string.download_complete)
 				}
+
 				is DownloadState.Error -> {
 					isAllDone = false
 					context.getString(R.string.error)
 				}
+
 				is DownloadState.PostProcessing -> {
 					progress++
 					isInProgress = true
 					isAllDone = false
 					context.getString(R.string.processing_)
 				}
+
 				is DownloadState.Preparing -> {
 					isAllDone = false
 					isInProgress = true
 					context.getString(R.string.preparing_)
 				}
+
 				is DownloadState.Progress -> {
 					isAllDone = false
 					isInProgress = true
 					progress += state.percent
 					context.getString(R.string.percent_string_pattern, (state.percent * 100).format())
 				}
+
 				is DownloadState.Queued -> {
 					isAllDone = false
 					isInProgress = true
@@ -158,21 +166,23 @@ class DownloadNotification(private val context: Context) {
 		private val cancelAction = NotificationCompat.Action(
 			materialR.drawable.material_ic_clear_black_24dp,
 			context.getString(android.R.string.cancel),
-			PendingIntent.getBroadcast(
+			PendingIntentCompat.getBroadcast(
 				context,
 				startId * 2,
 				DownloadService.getCancelIntent(startId),
-				PendingIntent.FLAG_CANCEL_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE,
+				PendingIntent.FLAG_CANCEL_CURRENT,
+				false,
 			),
 		)
 		private val retryAction = NotificationCompat.Action(
 			R.drawable.ic_restart_black,
 			context.getString(R.string.try_again),
-			PendingIntent.getBroadcast(
+			PendingIntentCompat.getBroadcast(
 				context,
 				startId * 2 + 1,
 				DownloadService.getResumeIntent(startId),
-				PendingIntent.FLAG_CANCEL_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE,
+				PendingIntent.FLAG_CANCEL_CURRENT,
+				false,
 			),
 		)

@@ -213,6 +223,7 @@ class DownloadNotification(private val context: Context) {
 					builder.setOngoing(true)
 					builder.priority = NotificationCompat.PRIORITY_DEFAULT
 				}
+
 				is DownloadState.Done -> {
 					builder.setProgress(0, 0, false)
 					builder.setContentText(context.getString(R.string.download_complete))
@@ -226,6 +237,7 @@ class DownloadNotification(private val context: Context) {
 					builder.setWhen(System.currentTimeMillis())
 					builder.priority = NotificationCompat.PRIORITY_DEFAULT
 				}
+
 				is DownloadState.Error -> {
 					val message = state.error.getDisplayMessage(context.resources)
 					builder.setProgress(0, 0, false)
@@ -244,6 +256,7 @@ class DownloadNotification(private val context: Context) {
 					}
 					builder.priority = NotificationCompat.PRIORITY_DEFAULT
 				}
+
 				is DownloadState.PostProcessing -> {
 					builder.setProgress(1, 0, true)
 					builder.setContentText(context.getString(R.string.processing_))
@@ -251,6 +264,7 @@ class DownloadNotification(private val context: Context) {
 					builder.setOngoing(true)
 					builder.priority = NotificationCompat.PRIORITY_DEFAULT
 				}
+
 				is DownloadState.Queued -> {
 					builder.setProgress(0, 0, false)
 					builder.setContentText(context.getString(R.string.queued))
@@ -259,6 +273,7 @@ class DownloadNotification(private val context: Context) {
 					builder.addAction(cancelAction)
 					builder.priority = NotificationCompat.PRIORITY_LOW
 				}
+
 				is DownloadState.Preparing -> {
 					builder.setProgress(1, 0, true)
 					builder.setContentText(context.getString(R.string.preparing_))
@@ -267,6 +282,7 @@ class DownloadNotification(private val context: Context) {
 					builder.addAction(cancelAction)
 					builder.priority = NotificationCompat.PRIORITY_DEFAULT
 				}
+
 				is DownloadState.Progress -> {
 					builder.setProgress(state.max, state.progress, false)
 					val percent = context.getString(R.string.percent_string_pattern, (state.percent * 100).format())
@@ -302,11 +318,12 @@ class DownloadNotification(private val context: Context) {
 		manager.notify(ID_GROUP, notification)
 	}

-	private fun createMangaIntent(context: Context, manga: Manga) = PendingIntent.getActivity(
+	private fun createMangaIntent(context: Context, manga: Manga) = PendingIntentCompat.getActivity(
 		context,
 		manga.hashCode(),
 		DetailsActivity.newIntent(context, manga),
-		PendingIntent.FLAG_CANCEL_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE,
+		PendingIntent.FLAG_CANCEL_CURRENT,
+		false,
 	)

 	companion object {
--- a/app/src/main/java/org/koitharu/kotatsu/local/ui/ImportWorker.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/local/ui/ImportWorker.kt
@@ -8,6 +8,7 @@ import android.content.Context
 import android.net.Uri
 import android.os.Build
 import androidx.core.app.NotificationCompat
+import androidx.core.app.PendingIntentCompat
 import androidx.core.content.ContextCompat
 import androidx.hilt.work.HiltWorker
 import androidx.work.Constraints
@@ -27,7 +28,6 @@ import org.koitharu.kotatsu.details.ui.DetailsActivity
 import org.koitharu.kotatsu.local.data.importer.SingleMangaImporter
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
-import org.koitharu.kotatsu.utils.PendingIntentCompat
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage
 import org.koitharu.kotatsu.utils.ext.toBitmapOrNull
 import org.koitharu.kotatsu.utils.ext.toUriOrNull
@@ -99,11 +99,12 @@ class ImportWorker @AssistedInject constructor(
 			notification.setSubText(manga.title)
 			val intent = DetailsActivity.newIntent(applicationContext, manga)
 			notification.setContentIntent(
-				PendingIntent.getActivity(
+				PendingIntentCompat.getActivity(
 					applicationContext,
 					manga.id.toInt(),
 					intent,
-					PendingIntent.FLAG_UPDATE_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE,
+					PendingIntent.FLAG_UPDATE_CURRENT,
+					false,
 				),
 			).setAutoCancel(true)
 				.setVisibility(
--- a/app/src/main/java/org/koitharu/kotatsu/tracker/work/TrackWorker.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/tracker/work/TrackWorker.kt
@@ -8,6 +8,7 @@ import android.os.Build
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationCompat.VISIBILITY_PUBLIC
 import androidx.core.app.NotificationCompat.VISIBILITY_SECRET
+import androidx.core.app.PendingIntentCompat
 import androidx.core.content.ContextCompat
 import androidx.hilt.work.HiltWorker
 import androidx.lifecycle.LiveData
@@ -45,7 +46,6 @@ import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaChapter
 import org.koitharu.kotatsu.tracker.domain.Tracker
 import org.koitharu.kotatsu.tracker.domain.model.MangaUpdates
-import org.koitharu.kotatsu.utils.PendingIntentCompat
 import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
 import org.koitharu.kotatsu.utils.ext.toBitmapOrNull
 import org.koitharu.kotatsu.utils.ext.trySetForeground
@@ -170,11 +170,12 @@ class TrackWorker @AssistedInject constructor(
 			setStyle(style)
 			val intent = DetailsActivity.newIntent(applicationContext, manga)
 			setContentIntent(
-				PendingIntent.getActivity(
+				PendingIntentCompat.getActivity(
 					applicationContext,
 					id,
 					intent,
-					PendingIntent.FLAG_UPDATE_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE,
+					PendingIntent.FLAG_UPDATE_CURRENT,
+					false,
 				),
 			)
 			setAutoCancel(true)
--- a/app/src/main/java/org/koitharu/kotatsu/utils/PendingIntentCompat.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/PendingIntentCompat.kt
@@ -1,21 +0,0 @@
-package org.koitharu.kotatsu.utils
-
-import android.app.PendingIntent
-import android.os.Build
-
-object PendingIntentCompat {
-
-	@JvmField
-	val FLAG_IMMUTABLE = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-		PendingIntent.FLAG_IMMUTABLE
-	} else {
-		0
-	}
-
-	@JvmField
-	val FLAG_MUTABLE = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-		PendingIntent.FLAG_MUTABLE
-	} else {
-		0
-	}
-}
--- a/app/src/main/java/org/koitharu/kotatsu/widget/recent/RecentWidgetProvider.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/widget/recent/RecentWidgetProvider.kt
@@ -7,9 +7,9 @@ import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.widget.RemoteViews
+import androidx.core.app.PendingIntentCompat
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.reader.ui.ReaderActivity
-import org.koitharu.kotatsu.utils.PendingIntentCompat

 class RecentWidgetProvider : AppWidgetProvider() {

@@ -27,16 +27,18 @@ class RecentWidgetProvider : AppWidgetProvider() {
 			val intent = Intent(context, ReaderActivity::class.java)
 			intent.action = ReaderActivity.ACTION_MANGA_READ
 			views.setPendingIntentTemplate(
-				R.id.stackView, PendingIntent.getActivity(
+				R.id.stackView,
+				PendingIntentCompat.getActivity(
 					context,
 					0,
 					intent,
-					PendingIntent.FLAG_UPDATE_CURRENT or PendingIntentCompat.FLAG_MUTABLE
-				)
+					PendingIntent.FLAG_UPDATE_CURRENT,
+					true,
+				),
 			)
 			views.setEmptyView(R.id.stackView, R.id.textView_holder)
 			appWidgetManager.updateAppWidget(id, views)
 		}
 		appWidgetManager.notifyAppWidgetViewDataChanged(appWidgetIds, R.id.stackView)
 	}
-}
+}
--- a/app/src/main/java/org/koitharu/kotatsu/widget/shelf/ShelfWidgetProvider.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/widget/shelf/ShelfWidgetProvider.kt
@@ -7,9 +7,9 @@ import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.widget.RemoteViews
+import androidx.core.app.PendingIntentCompat
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.reader.ui.ReaderActivity
-import org.koitharu.kotatsu.utils.PendingIntentCompat

 class ShelfWidgetProvider : AppWidgetProvider() {

@@ -27,16 +27,18 @@ class ShelfWidgetProvider : AppWidgetProvider() {
 			val intent = Intent(context, ReaderActivity::class.java)
 			intent.action = ReaderActivity.ACTION_MANGA_READ
 			views.setPendingIntentTemplate(
-				R.id.gridView, PendingIntent.getActivity(
+				R.id.gridView,
+				PendingIntentCompat.getActivity(
 					context,
 					0,
 					intent,
-					PendingIntent.FLAG_UPDATE_CURRENT or PendingIntentCompat.FLAG_MUTABLE
-				)
+					PendingIntent.FLAG_UPDATE_CURRENT,
+					true,
+				),
 			)
 			views.setEmptyView(R.id.gridView, R.id.textView_holder)
 			appWidgetManager.updateAppWidget(id, views)
 		}
 		appWidgetManager.notifyAppWidgetViewDataChanged(appWidgetIds, R.id.gridView)
 	}
-}
+}