Revert "Fix #3432: [A11y] Content description for rich text based ima…

…ges (#3433)" (#3768) This reverts commit 7505dd5.
oppia · Sep 10, 2021 · e242828 · e242828
1 parent f56345c
commit e242828
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 60 deletions.
diff --git a/utility/src/main/java/org/oppia/android/util/parser/html/CustomHtmlContentHandler.kt b/utility/src/main/java/org/oppia/android/util/parser/html/CustomHtmlContentHandler.kt
@@ -113,8 +113,6 @@ class CustomHtmlContentHandler private constructor(
         customTagHandlers.getValue(tag).handleClosingTag(output)
         customTagHandlers.getValue(tag)
           .handleTag(attributes, openTagIndex, output.length, output, imageRetriever)
-        customTagHandlers.getValue(tag)
-          .handleContentDescription(attributes, openTagIndex, output.length, output)
       }
     }
   }
@@ -165,21 +163,6 @@ class CustomHtmlContentHandler private constructor(
      * @param output the destination [Editable] to which spans can be added
      */
     fun handleClosingTag(output: Editable) {}
-
-    /**
-     * Called when a custom tag is encountered. This is always called after the closing tag.
-     *
-     * @param attributes the tag's attributes
-     * @param openIndex the index in the output [Editable] at which this tag begins
-     * @param closeIndex the index in the output [Editable] at which this tag ends
-     * @param output the destination [Editable] to which spans can be added
-     */
-    fun handleContentDescription(
-      attributes: Attributes,
-      openIndex: Int,
-      closeIndex: Int,
-      output: Editable
-    ) {}
   }
 
   /**

diff --git a/utility/src/main/java/org/oppia/android/util/parser/html/ImageTagHandler.kt b/utility/src/main/java/org/oppia/android/util/parser/html/ImageTagHandler.kt
@@ -2,15 +2,13 @@ package org.oppia.android.util.parser.html
 
 import android.text.Editable
 import android.text.Spannable
-import android.text.SpannableStringBuilder
 import android.text.style.ImageSpan
 import org.oppia.android.util.logging.ConsoleLogger
 import org.xml.sax.Attributes
 
 /** The custom tag corresponding to [ImageTagHandler]. */
 const val CUSTOM_IMG_TAG = "oppia-noninteractive-image"
 private const val CUSTOM_IMG_FILE_PATH_ATTRIBUTE = "filepath-with-value"
-private const val CUSTOM_IMG_ALT_TEXT_ATTRIBUTE = "alt-with-value"
 
 /**
  * A custom tag handler for supporting custom Oppia images parsed with [CustomHtmlContentHandler].
@@ -45,25 +43,6 @@ class ImageTagHandler(
         endIndex,
         Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
       )
-    } else consoleLogger.e("ImageTagHandler", "Failed to parse $CUSTOM_IMG_FILE_PATH_ATTRIBUTE")
-  }
-
-  override fun handleContentDescription(
-    attributes: Attributes,
-    openIndex: Int,
-    closeIndex: Int,
-    output: Editable
-  ) {
-    val contentDescription = attributes.getJsonStringValue(CUSTOM_IMG_ALT_TEXT_ATTRIBUTE)
-    if (contentDescription != null) {
-      val spannableBuilder = SpannableStringBuilder(contentDescription)
-      spannableBuilder.setSpan(
-        contentDescription,
-        /* start= */ 0,
-        /* end= */ contentDescription.length,
-        Spannable.SPAN_INCLUSIVE_EXCLUSIVE
-      )
-      output.replace(openIndex, closeIndex, spannableBuilder)
-    } else consoleLogger.e("ImageTagHandler", "Failed to parse $CUSTOM_IMG_ALT_TEXT_ATTRIBUTE")
+    } else consoleLogger.e("ImageTagHandler", "Failed to parse image tag")
   }
 }
diff --git a/utility/src/test/java/org/oppia/android/util/parser/html/ImageTagHandlerTest.kt b/utility/src/test/java/org/oppia/android/util/parser/html/ImageTagHandlerTest.kt
@@ -50,10 +50,6 @@ private const val IMAGE_TAG_WITHOUT_FILEPATH_MARKUP =
   "<oppia-noninteractive-image alt-with-value=\"&amp;quot;alt text 2&amp;quot;\" " +
     "caption-with-value=\"&amp;quot;&amp;quot;\"></oppia-noninteractive-image>"
 
-private const val IMAGE_TAG_WITHOUT_ALT_VALUE_MARKUP =
-  "<oppia-noninteractive-image caption-with-value=\"&amp;quot;&amp;quot;\" " +
-    "filepath-with-value=\"&amp;quot;test_image1.png&amp;quot;\"></oppia-noninteractive-image>"
-
 /** Tests for [ImageTagHandler]. */
 @RunWith(AndroidJUnit4::class)
 @LooperMode(LooperMode.Mode.PAUSED)
@@ -113,7 +109,7 @@ class ImageTagHandlerTest {
   fun testParseHtml_withImageCardMarkup_hasNoReadableText() {
     val parsedHtml =
       CustomHtmlContentHandler.fromHtml(
-        html = IMAGE_TAG_WITHOUT_ALT_VALUE_MARKUP,
+        html = IMAGE_TAG_MARKUP_1,
         imageRetriever = mockImageRetriever,
         customTagHandlers = tagHandlersWithImageTagSupport
       )
@@ -124,22 +120,6 @@ class ImageTagHandlerTest {
     assertThat(parsedHtmlStr.first().isObjectReplacementCharacter()).isTrue()
   }
 
-  @Test
-  fun testParseHtml_withImageCardMarkup_missingAltValue_hasReadableText() {
-    val parsedHtml =
-      CustomHtmlContentHandler.fromHtml(
-        html = IMAGE_TAG_MARKUP_1,
-        imageRetriever = mockImageRetriever,
-        customTagHandlers = tagHandlersWithImageTagSupport
-      )
-
-    // The image only adds a control character, so there aren't any human-readable characters.
-    val parsedHtmlStr = parsedHtml.toString()
-    val parsedContentDescription = "alt text 1"
-    assertThat(parsedHtmlStr).hasLength(parsedContentDescription.length)
-    assertThat(parsedHtmlStr.first().isObjectReplacementCharacter()).isFalse()
-  }
-
   @Test
   fun testParseHtml_withImageCardMarkup_missingFilename_doesNotIncludeImageSpan() {
     val parsedHtml =