Merge pull request #5926 from vector-im/bugfix/adm/konfetti-crash

Crash - Konfetti API 21/22 crash
This commit is contained in:
Adam Brown 2022-05-04 11:16:31 +01:00 committed by GitHub
commit 76a285e655
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 48 additions and 3 deletions

1
changelog.d/5925.bugfix Normal file
View file

@ -0,0 +1 @@
Fixes crash on android api 21/22 devices when opening messages due to Konfetti library

View file

@ -0,0 +1,44 @@
/*
* Copyright (c) 2022 New Vector Ltd
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package im.vector.app.core.ui.views
import android.content.Context
import android.os.Build
import android.util.AttributeSet
import android.view.View
import nl.dionsegijn.konfetti.xml.KonfettiView
/**
* Konfetti workaround to avoid crashes on API 21/22
* https://github.com/DanielMartinus/Konfetti/issues/297
*/
class CompatKonfetti @JvmOverloads constructor(
context: Context,
attrs: AttributeSet? = null
) : KonfettiView(context, attrs) {
override fun onVisibilityChanged(changedView: View, visibility: Int) {
when (Build.VERSION.SDK_INT) {
Build.VERSION_CODES.LOLLIPOP, Build.VERSION_CODES.LOLLIPOP_MR1 -> safeOnVisibilityChanged(changedView, visibility)
else -> super.onVisibilityChanged(changedView, visibility)
}
}
private fun safeOnVisibilityChanged(changedView: View, visibility: Int) {
runCatching { super.onVisibilityChanged(changedView, visibility) }
}
}

View file

@ -162,7 +162,7 @@
app:layout_constraintHeight_percent="0.05" app:layout_constraintHeight_percent="0.05"
app:layout_constraintTop_toBottomOf="@id/ctaBottomBarrier" /> app:layout_constraintTop_toBottomOf="@id/ctaBottomBarrier" />
<nl.dionsegijn.konfetti.xml.KonfettiView <im.vector.app.core.ui.views.CompatKonfetti
android:id="@+id/viewKonfetti" android:id="@+id/viewKonfetti"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"

View file

@ -106,7 +106,7 @@
app:layout_constraintHeight_percent="0.05" app:layout_constraintHeight_percent="0.05"
app:layout_constraintTop_toBottomOf="@id/personalizationCompleteCta" /> app:layout_constraintTop_toBottomOf="@id/personalizationCompleteCta" />
<nl.dionsegijn.konfetti.xml.KonfettiView <im.vector.app.core.ui.views.CompatKonfetti
android:id="@+id/viewKonfetti" android:id="@+id/viewKonfetti"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"

View file

@ -188,7 +188,7 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:tint="@android:color/black" /> app:tint="@android:color/black" />
<nl.dionsegijn.konfetti.xml.KonfettiView <im.vector.app.core.ui.views.CompatKonfetti
android:id="@+id/viewKonfetti" android:id="@+id/viewKonfetti"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"