SES-4614 : Read More Indicator Appears Erroneously (#1525)

Author: jbsession

app/src/main/java/org/session/libsession/utilities/ViewUtils.kt

@@ -34,14 +34,7 @@ fun TextView.needsCollapsing(
     availableWidthPx: Int,
     maxLines: Int
 ): Boolean {
-    // Pick the width the TextView will actually respect before draw
-    val rawWidth = when {
-        measuredWidth > 0 -> measuredWidth
-        // if maxWidth is set, we check it
-        maxWidth in 1 until Int.MAX_VALUE -> minOf(availableWidthPx, maxWidth)
-        else -> availableWidthPx
-    }
-    val contentWidth = (rawWidth - paddingLeft - paddingRight).coerceAtLeast(0)
+    val contentWidth = (availableWidthPx - paddingLeft - paddingRight).coerceAtLeast(0)
     if (contentWidth <= 0 || text.isNullOrEmpty()) return false
 
     val textForLayout = transformationMethod?.getTransformation(text, this) ?: text
@@ -67,7 +60,7 @@ fun TextView.needsCollapsing(
         .setAlignment(alignment)
         .setTextDirection(direction)
         .setMaxLines(maxLines)                                   // cap at maxLines
-        .setEllipsize(ellipsize ?: TextUtils.TruncateAt.END)     // compute ellipsis
+        .setEllipsize(ellipsize)     // compute ellipsis
 
     builder.setJustificationMode(justificationMode)
 

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt

@@ -356,13 +356,9 @@ class VisibleMessageContentView : ConstraintLayout {
                 }
             }
 
-            val widthCap = binding.bodyTextView.maxWidth
-                .takeIf { it > 0 && it < Int.MAX_VALUE }
-                ?: resources.getDimensionPixelSize(R.dimen.max_bubble_width)
-
             // if the text was already manually expanded, we can skip this logic
             if(!isTextExpanded && binding.bodyTextView.needsCollapsing(
-                    availableWidthPx = widthCap,
+                    availableWidthPx = binding.bodyTextView.maxWidth,
                     maxLines = MAX_COLLAPSED_LINE_COUNT)
             ){
                 // show the "Read mode" button