chinwag/chinwag-android
chinwag/chinwag-android
2
0
Fork 0
Code Issues Pull requests Releases Activity

fix crash in TouchDelegateHelper when not all views are available (#3016)

Browse source 
* fix crash in TouchDelegateHelper when not all views are available

* filter views before passing to TouchDelegateHelper

* remove unused import

* fix indentation
This commit is contained in:
Konrad Pozniak 2022-12-07 19:34:54 +01:00 committed by GitHub
parent e20fda322e
commit 88125ef7da
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
View file

@ -64,7 +64,6 @@ import com.keylesspalace.tusky.viewdata.PollViewDataKt;
import com.keylesspalace.tusky.viewdata.StatusViewData; import com.keylesspalace.tusky.viewdata.StatusViewData;
import java.text.NumberFormat; import java.text.NumberFormat;
import java.util.Arrays;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@ -173,7 +172,7 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
mediaPreviewUnloaded = new ColorDrawable(ThemeUtils.getColor(itemView.getContext(), R.attr.colorBackgroundAccent)); mediaPreviewUnloaded = new ColorDrawable(ThemeUtils.getColor(itemView.getContext(), R.attr.colorBackgroundAccent));
TouchDelegateHelper.expandTouchSizeToFillRow((ViewGroup) itemView, Arrays.asList(replyButton, reblogButton, favouriteButton, bookmarkButton, moreButton)); TouchDelegateHelper.expandTouchSizeToFillRow((ViewGroup) itemView, CollectionsKt.listOfNotNull(replyButton, reblogButton, favouriteButton, bookmarkButton, moreButton));
} }
protected void setDisplayName(String name, List<Emoji> customEmojis, StatusDisplayOptions statusDisplayOptions) { protected void setDisplayName(String name, List<Emoji> customEmojis, StatusDisplayOptions statusDisplayOptions) {

21
app/src/main/java/com/keylesspalace/tusky/util/TouchDelegateHelper.kt
View file

@ -1,3 +1,18 @@
/* Copyright 2022 Tusky contributors
* This file is a part of Tusky.
*
* This program is free software; you can redistribute it and/or modify it under the terms of the
* GNU General Public License as published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
* Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
* Public License for more details.
*
* You should have received a copy of the GNU General Public License along with Tusky; if not,
* see <http://www.gnu.org/licenses>. */
@file:JvmName("TouchDelegateHelper") @file:JvmName("TouchDelegateHelper")
package com.keylesspalace.tusky.util package com.keylesspalace.tusky.util
@ -39,13 +54,11 @@ private class CompositeTouchDelegate(view: View, private val delegates: List<Tou
TouchDelegate(Rect(), view) { TouchDelegate(Rect(), view) {
override fun onTouchEvent(event: MotionEvent): Boolean { override fun onTouchEvent(event: MotionEvent): Boolean {
var res = false
val x = event.x val x = event.x
val y = event.y val y = event.y
for (delegate in delegates) { return delegates.fold(false) { res, delegate ->
event.setLocation(x, y) event.setLocation(x, y)
res = delegate.onTouchEvent(event) || res delegate.onTouchEvent(event) || res
} }
return res
} }
} }