Merge tag '2.8.2' into develop

2.8.2
This commit is contained in:
J-Jamet
2020-08-21 16:04:09 +02:00
2 changed files with 4 additions and 1 deletions

View File

@@ -96,7 +96,7 @@ class AttachmentFileNotificationService: LockNotificationService() {
if (downloadFileUri != null if (downloadFileUri != null
&& intent.hasExtra(ATTACHMENT_KEY)) { && intent.hasExtra(ATTACHMENT_KEY)) {
val nextNotificationId = (downloadFileUris.values.maxBy { it.notificationId } val nextNotificationId = (downloadFileUris.values.maxByOrNull { it.notificationId }
?.notificationId ?: notificationId) + 1 ?.notificationId ?: notificationId) + 1
try { try {

View File

@@ -9,6 +9,9 @@ class EditTextSelectable @JvmOverloads constructor(context: Context,
defStyle: Int = 0) defStyle: Int = 0)
: TextInputEditText(context, attrs) { : TextInputEditText(context, attrs) {
// TODO constructor(context: Context, attrs: AttributeSet? = null, defStyle: Int = 0)
// after material design upgrade
private val mOnSelectionChangedListeners: MutableList<OnSelectionChangedListener>? private val mOnSelectionChangedListeners: MutableList<OnSelectionChangedListener>?
init { init {