From 75fe7d0ec92a9874a98c22b61eeb8e6a8906a9ea Mon Sep 17 00:00:00 2001 From: M66B Date: Sun, 13 Sep 2020 20:48:05 +0200 Subject: [PATCH] Check for Android 6.0 for word iterator work around --- .../java/eu/faircode/email/FixedEditText.java | 15 --------------- .../java/eu/faircode/email/FixedTextView.java | 6 +++--- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FixedEditText.java b/app/src/main/java/eu/faircode/email/FixedEditText.java index a6ff6597fa..6ca850c68e 100644 --- a/app/src/main/java/eu/faircode/email/FixedEditText.java +++ b/app/src/main/java/eu/faircode/email/FixedEditText.java @@ -21,7 +21,6 @@ package eu.faircode.email; import android.content.Context; import android.graphics.Canvas; -import android.os.Build; import android.util.AttributeSet; import android.view.MotionEvent; @@ -98,20 +97,6 @@ public class FixedEditText extends AppCompatEditText { } } - @Override - public boolean dispatchTouchEvent(MotionEvent event) { - // https://issuetracker.google.com/issues/37068143 - if ((BuildConfig.DEBUG || Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) && - hasSelection() && - event.getActionMasked() == MotionEvent.ACTION_DOWN) { - CharSequence text = getText(); - setText(null); - setText(text); - } - - return super.dispatchTouchEvent(event); - } - @Override public boolean performLongClick() { try { diff --git a/app/src/main/java/eu/faircode/email/FixedTextView.java b/app/src/main/java/eu/faircode/email/FixedTextView.java index 126cc8bfe7..a96df457fe 100644 --- a/app/src/main/java/eu/faircode/email/FixedTextView.java +++ b/app/src/main/java/eu/faircode/email/FixedTextView.java @@ -111,9 +111,9 @@ public class FixedTextView extends AppCompatTextView { @Override public boolean dispatchTouchEvent(MotionEvent event) { // https://issuetracker.google.com/issues/37068143 - if ((BuildConfig.DEBUG || Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) && - hasSelection() && - event.getActionMasked() == MotionEvent.ACTION_DOWN) { + if (event.getActionMasked() == MotionEvent.ACTION_DOWN && + Build.VERSION.RELEASE.equals("6.0") && hasSelection()) { + // Remove selection CharSequence text = getText(); setText(null); setText(text);