fix crash on Android 12

sal0max · Jan 5, 2022 · 95f87df · 95f87df
1 parent 397095b
commit 95f87df
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## v2.4.2
+* Fix crash on Android 12
+
 ## v2.4.1
 * Updated library dependencies
 

diff --git a/fastlane/metadata/android/en-US/changelogs/20402.txt b/fastlane/metadata/android/en-US/changelogs/20402.txt
@@ -0,0 +1 @@
+• Fix crash on Android 12
diff --git a/muzei-nationalgeographic/build.gradle b/muzei-nationalgeographic/build.gradle
@@ -28,7 +28,7 @@ dependencies {
    implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
    implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3'
    // misc
-   implementation 'android.arch.work:work-runtime-ktx:1.0.1'
+   implementation 'androidx.work:work-runtime-ktx:2.7.1'
    implementation 'androidx.preference:preference-ktx:1.1.1'
    implementation 'com.github.sisyphsu:dateparser:1.0.9'
    // test
@@ -50,8 +50,8 @@ android {
       minSdkVersion 21
       targetSdkVersion 31
       // SemVer
-      versionName = "2.4.1"
-      versionCode = 20401
+      versionName = "2.4.2"
+      versionCode = 20402
       archivesBaseName = "$applicationId-v$versionCode"
       //
       vectorDrawables.useSupportLibrary = true

diff --git a/...graphic/src/main/kotlin/de/msal/muzei/nationalgeographic/NationalGeographicArtProvider.kt b/...graphic/src/main/kotlin/de/msal/muzei/nationalgeographic/NationalGeographicArtProvider.kt
@@ -55,7 +55,7 @@ class NationalGeographicArtProvider : MuzeiArtProvider() {
    override fun getArtworkInfo(artwork: Artwork): PendingIntent? {
       val context = context ?: return null
       val intent = createPhotoDescriptionIntent(context, artwork)
-      return PendingIntent.getActivity(context, Random.nextInt(), intent, 0)
+      return PendingIntent.getActivity(context, Random.nextInt(), intent, PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT)
    }
 
    private fun createPhotoDescriptionIntent(