Prevent crash

pull/199/head
M66B 4 years ago
parent 465d06e4aa
commit 5b74f726a5

@ -60,6 +60,7 @@ import android.provider.Settings;
import android.security.KeyChain; import android.security.KeyChain;
import android.security.KeyChainException; import android.security.KeyChainException;
import android.text.Editable; import android.text.Editable;
import android.text.Layout;
import android.text.Spannable; import android.text.Spannable;
import android.text.SpannableString; import android.text.SpannableString;
import android.text.SpannableStringBuilder; import android.text.SpannableStringBuilder;
@ -5911,20 +5912,23 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
pos, pos + query.length(), Spannable.SPAN_COMPOSING); pos, pos + query.length(), Spannable.SPAN_COMPOSING);
searchView.setText(ss); searchView.setText(ss);
int line = searchView.getLayout().getLineForOffset(pos); Layout layout = searchView.getLayout();
int y = searchView.getLayout().getLineTop(line); if (layout != null) {
int dy = searchView.getContext().getResources() int line = layout.getLineForOffset(pos);
.getDimensionPixelSize(R.dimen.search_in_text_margin); int y = layout.getLineTop(line);
int dy = searchView.getContext().getResources()
.getDimensionPixelSize(R.dimen.search_in_text_margin);
View itemView = rvMessage.findContainingItemView(searchView); View itemView = rvMessage.findContainingItemView(searchView);
if (itemView != null) { if (itemView != null) {
Rect rect = new Rect(); Rect rect = new Rect();
searchView.getDrawingRect(rect); searchView.getDrawingRect(rect);
RecyclerView.ViewHolder holder = rvMessage.getChildViewHolder(itemView); RecyclerView.ViewHolder holder = rvMessage.getChildViewHolder(itemView);
((ViewGroup) itemView).offsetDescendantRectToMyCoords(searchView, rect); ((ViewGroup) itemView).offsetDescendantRectToMyCoords(searchView, rect);
iProperties.scrollTo(holder.getAdapterPosition(), rect.top + y - dy); iProperties.scrollTo(holder.getAdapterPosition(), rect.top + y - dy);
}
} }
} }

Loading…
Cancel
Save