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,8 +5912,10 @@ 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 line = layout.getLineForOffset(pos);
int y = layout.getLineTop(line);
int dy = searchView.getContext().getResources() int dy = searchView.getContext().getResources()
.getDimensionPixelSize(R.dimen.search_in_text_margin); .getDimensionPixelSize(R.dimen.search_in_text_margin);
@ -5927,6 +5930,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
iProperties.scrollTo(holder.getAdapterPosition(), rect.top + y - dy); iProperties.scrollTo(holder.getAdapterPosition(), rect.top + y - dy);
} }
} }
}
boolean hasNext = (pos >= 0 && boolean hasNext = (pos >= 0 &&
(text.indexOf(query) != pos || (text.indexOf(query) != pos ||

Loading…
Cancel
Save