Merge pull request #554 from wordpress-mobile/issue/fixing-missing-href-in-url-with-parameters

Fixed URL span attributes

Author: 0nko

CHANGELOG.md

@@ -5,6 +5,7 @@
 - The text handling following immediately after images
 - Undo/redo edit history
 - The demo app sample text
+- URL span not including href attribute when other attributes are present
 
 ## [1.0-beta.11](https://github.com/wordpress-mobile/AztecEditor-Android/releases/tag/v1.0-beta.11) - 2017-11-20
 ### Fixed

aztec/src/main/kotlin/org/wordpress/aztec/spans/AztecURLSpan.kt

@@ -31,10 +31,10 @@ class AztecURLSpan : URLSpan, IAztecInlineSpan {
     override var attributes: AztecAttributes = AztecAttributes()
 
     constructor(url: String, attributes: AztecAttributes = AztecAttributes()) : super(url) {
-        if (attributes.isEmpty()) {
+        this.attributes = attributes
+
+        if (!this.attributes.hasAttribute("href")) {
             this.attributes.setValue("href", url)
-        } else {
-            this.attributes = attributes
         }
     }