Fix - Add missing hasChanges method to HTML editor #682
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| package org.wordpress.aztec | ||
|
|
||
| import android.os.Parcel | ||
| import android.os.Parcelable | ||
| import java.security.MessageDigest | ||
| import java.security.NoSuchAlgorithmException | ||
| import java.util.Arrays | ||
|
|
||
| class AztecInitialContentHolder() : Parcelable { | ||
|
|
||
| enum class EditorHasChanges { | ||
| CHANGES, NO_CHANGES, UNKNOWN | ||
| } | ||
|
|
||
| interface EditorHasChangesInterface { | ||
| fun hasChanges(): AztecInitialContentHolder.EditorHasChanges | ||
| } | ||
|
|
||
| constructor(parcel : Parcel) : this() { | ||
| initialEditorContentParsedSHA256 = ByteArray(parcel.readInt()) | ||
| parcel.readByteArray(initialEditorContentParsedSHA256) | ||
| } | ||
|
|
||
| override fun writeToParcel(dest: Parcel?, flags: Int) { | ||
| dest?.writeInt(initialEditorContentParsedSHA256.size) | ||
| dest?.writeByteArray(initialEditorContentParsedSHA256) | ||
| } | ||
|
|
||
| override fun describeContents(): Int { | ||
| return 0 | ||
| } | ||
|
|
||
| companion object { | ||
| @JvmField | ||
| val CREATOR: Parcelable.Creator<AztecInitialContentHolder> = object : Parcelable.Creator<AztecInitialContentHolder> { | ||
|
Contributor
There was a problem hiding this comment. AS says this property
Contributor
Author
There was a problem hiding this comment. Tried to suppress with annotation, but no luck. There are other instances of it in Aztec without any annotation, so I left it without adding it. |
||
| override fun createFromParcel(`in`: Parcel): AztecInitialContentHolder { | ||
| return AztecInitialContentHolder(`in`) | ||
| } | ||
|
|
||
| override fun newArray(size: Int): Array<AztecInitialContentHolder?> { | ||
| return arrayOfNulls(size) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private var initialEditorContentParsedSHA256: ByteArray = ByteArray(0) | ||
|
|
||
| fun needToSetInitialValue(): Boolean { | ||
| return (initialEditorContentParsedSHA256.isEmpty() || Arrays.equals(initialEditorContentParsedSHA256, calculateSHA256(""))) | ||
| } | ||
|
|
||
| fun setInitialContent(source: String) { | ||
| try { | ||
| // Do not recalculate the hash if it's not the first call to `fromHTML`. | ||
| if (needToSetInitialValue()) { | ||
| initialEditorContentParsedSHA256 = calculateSHA256(source) | ||
| } | ||
| } catch (e: Throwable) { | ||
| // Do nothing here. calculateSHA256 -> NoSuchAlgorithmException | ||
| } | ||
| } | ||
|
|
||
| @Throws(NoSuchAlgorithmException::class) | ||
| private fun calculateSHA256(s: String): ByteArray { | ||
| val digest = MessageDigest.getInstance("SHA-256") | ||
| digest.update(s.toByteArray()) | ||
| return digest.digest() | ||
| } | ||
|
|
||
| fun hasChanges(source: String): EditorHasChanges { | ||
| if (!initialEditorContentParsedSHA256.isEmpty()) { | ||
| try { | ||
| if (Arrays.equals(initialEditorContentParsedSHA256, calculateSHA256(source))) { | ||
| return EditorHasChanges.NO_CHANGES | ||
| } | ||
| return EditorHasChanges.CHANGES | ||
| } catch (e: Throwable) { | ||
| // Do nothing here. calculateSHA256 -> NoSuchAlgorithmException | ||
| } | ||
| } | ||
| return EditorHasChanges.UNKNOWN | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good call moving the
EditorHasChangesenum to theAztecInitialContentHolderclass 👍