Merge pull request #797 from wordpress-mobile/merge-release/1.3.22-master

Merge release/1.3.22 into master

Author: jtreanor

.travis.yml

@@ -1,4 +1,8 @@
 # Changelog
+## [v1.3.22](https://github.com/wordpress-mobile/AztecEditor-Android/releases/tag/v1.3.22)
+### Fixed
+- Fix for crash on Samsung Clipboard ListView on Android 8.X #795
+
 ## [v1.3.21](https://github.com/wordpress-mobile/AztecEditor-Android/releases/tag/v1.3.21)
 ### Changed
 - Some performance improvements, mostly visible via the WPAndroid app https://github.com/wordpress-mobile/gutenberg-mobile/issues/672

CHANGELOG.md

@@ -1,6 +1,6 @@
 <h1><img align="center" width=50px height=50px src="https://github.com/wordpress-mobile/AztecEditor-iOS/raw/develop/RepoAssets/aztec.png" alt="Aztec Logo"/>&nbsp;Aztec: Native HTML Editor for Android</h1>
 
-[![Build Status](https://travis-ci.org/wordpress-mobile/AztecEditor-Android.svg?branch=develop)](https://travis-ci.org/wordpress-mobile/AztecEditor-Android)
+[![CircleCI](https://circleci.com/gh/wordpress-mobile/AztecEditor-Android.svg?style=svg)](https://circleci.com/gh/wordpress-mobile/AztecEditor-Android)
 
 Aztec (which extends EditText) is a rich-text editor component for writing HTML
 documents in Android.
@@ -105,7 +105,7 @@ repositories {
 ```
 ```gradle
 dependencies {
-    api ('com.github.wordpress-mobile.WordPress-Aztec-Android:aztec:v1.3.21')
+    api ('com.github.wordpress-mobile.WordPress-Aztec-Android:aztec:v1.3.22')
 }
 ```
 

README.md

@@ -55,6 +55,7 @@ import android.view.WindowManager
 import android.view.inputmethod.BaseInputConnection
 import android.widget.CheckBox
 import android.widget.EditText
+import android.widget.Toast
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
@@ -1384,6 +1385,8 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
             max = Math.max(0, Math.max(selectionStart, selectionEnd))
         }
 
+        var clipboardIdentifier = resources.getIdentifier("android:id/clipboard", "id", context.packageName)
+
         when (id) {
             android.R.id.paste -> paste(text, min, max)
             android.R.id.pasteAsPlainText -> paste(text, min, max, true)
@@ -1400,7 +1403,17 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
                     deleteInlineStyleFromTheBeginning()
                 }
             }
-            else -> return super.onTextContextMenuItem(id)
+            // Fix for crash when pasting text on Samsung Devices running 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
+                        && Build.MANUFACTURER.toLowerCase().equals("samsung")) {
+                    // Nope return true
+                    Toast.makeText(context, R.string.samsung_disabled_custom_clipboard, Toast.LENGTH_LONG).show()
+                } else {
+                    return super.onTextContextMenuItem(id)
+                }
+            } else -> return super.onTextContextMenuItem(id)
         }
 
         return true

aztec/src/main/kotlin/org/wordpress/aztec/AztecText.kt

@@ -2,6 +2,7 @@
 
     <!-- GENERAL -->
     <string name="cursor_moved">Cursor moved</string>
+    <string name="samsung_disabled_custom_clipboard">Sorry, this feature is disabled on Android 8. Please use the Paste action instead.</string>
 
     <!-- LINK DIALOG -->
     <string name="link_dialog_title">Insert link</string>