From d8ddb142a9b48179fc05f688298a01ff825adf8c Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Mon, 23 Jul 2018 07:54:24 -0700
Subject: [PATCH] Fixed bug in onMeasure() overflow safeguard.

Fixes #8008
---
 src/org/thoughtcrime/securesms/ConversationItem.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/thoughtcrime/securesms/ConversationItem.java b/src/org/thoughtcrime/securesms/ConversationItem.java
index c116579df5..78054f742d 100644
--- a/src/org/thoughtcrime/securesms/ConversationItem.java
+++ b/src/org/thoughtcrime/securesms/ConversationItem.java
@@ -252,8 +252,8 @@ public class ConversationItem extends LinearLayout
 
     if (needsMeasure) {
       if (measureCalls < MAX_MEASURE_CALLS) {
-        measure(widthMeasureSpec, heightMeasureSpec);
         measureCalls++;
+        measure(widthMeasureSpec, heightMeasureSpec);
       } else {
         Log.w(TAG, "Hit measure() cap of " + MAX_MEASURE_CALLS);
       }