diff --git a/aztec/src/main/kotlin/org/wordpress/aztec/AztecText.kt b/aztec/src/main/kotlin/org/wordpress/aztec/AztecText.kt
index 2d19eb409..3862a288a 100644
--- a/aztec/src/main/kotlin/org/wordpress/aztec/AztecText.kt
+++ b/aztec/src/main/kotlin/org/wordpress/aztec/AztecText.kt
@@ -1559,13 +1559,14 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
deleteInlineStyleFromTheBeginning()
}
}
- // Fix for crash when pasting text on Samsung Devices running Android 8.
- // Ref: https://github.com/wordpress-mobile/WordPress-Android/issues/8827
+ // Fix for crash when pasting text on Samsung Devices running Android 7 & 8.
+ // Android 7 Ref: https://github.com/wordpress-mobile/WordPress-Android/issues/10872
+ // Android 8 Ref: https://github.com/wordpress-mobile/WordPress-Android/issues/8827
clipboardIdentifier -> {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && Build.VERSION.SDK_INT < 28
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && Build.VERSION.SDK_INT < Build.VERSION_CODES.P
&& Build.MANUFACTURER.toLowerCase().equals("samsung")) {
// Nope return true
- Toast.makeText(context, R.string.samsung_disabled_custom_clipboard, Toast.LENGTH_LONG).show()
+ Toast.makeText(context, context.getString(R.string.samsung_disabled_custom_clipboard, Build.VERSION.RELEASE), Toast.LENGTH_LONG).show()
} else {
return super.onTextContextMenuItem(id)
}
diff --git a/aztec/src/main/res/values/strings.xml b/aztec/src/main/res/values/strings.xml
index 5429d9b33..150b74804 100644
--- a/aztec/src/main/res/values/strings.xml
+++ b/aztec/src/main/res/values/strings.xml
@@ -2,7 +2,7 @@
Cursor moved
- Sorry, this feature is disabled on Android 8. Please use the Paste action instead.
+ Sorry, this feature is disabled on Android %1$s. Please use the Paste action instead.
Insert link