Fix styling lost in draft state bug.

cody-signal · cody-signal · commit c1b7b7c95e00 · 2023-06-22T11:16:27.000-04:00
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ComposeText.java b/app/src/main/java/org/thoughtcrime/securesms/components/ComposeText.java
@@ -73,6 +73,7 @@ public class ComposeText extends EmojiEditText {
   @Nullable private InputPanel.MediaListener      mediaListener;
   @Nullable private CursorPositionChangedListener cursorPositionChangedListener;
   @Nullable private InlineQueryChangedListener    inlineQueryChangedListener;
+  @Nullable private StylingChangedListener        stylingChangedListener;
 
   public ComposeText(Context context) {
     super(context);
@@ -223,6 +224,10 @@ public void setMentionValidator(@Nullable MentionValidatorWatcher.MentionValidat
     mentionValidatorWatcher.setMentionValidator(mentionValidator);
   }
 
+  public void setStylingChangedListener(@Nullable StylingChangedListener listener) {
+    stylingChangedListener = listener;
+  }
+
   private boolean isLandscape() {
     return getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE;
   }
@@ -579,6 +584,10 @@ public boolean handleFormatText(@IdRes int id) {
 
     Selection.setSelection(getText(), end);
 
+    if (stylingChangedListener != null) {
+      stylingChangedListener.onStylingChanged();
+    }
+
     return true;
   }
 
@@ -628,4 +637,7 @@ public interface CursorPositionChangedListener {
     void onCursorPositionChanged(int start, int end);
   }
 
+  public interface StylingChangedListener {
+    void onStylingChanged();
+  }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
@@ -862,6 +862,7 @@ public void onSuccess(Boolean loadedDraft) {
         }
 
         composeText.addTextChangedListener(typingTextWatcher);
+        composeText.setStylingChangedListener(typingTextWatcher);
         composeText.setSelection(composeText.length(), composeText.length());
       }
     });
@@ -3865,7 +3866,7 @@ public void onFocusChange(View v, boolean hasFocus) {
     }
   }
 
-  private class ComposeTextWatcher extends SimpleTextWatcher {
+  private class ComposeTextWatcher extends SimpleTextWatcher implements ComposeText.StylingChangedListener {
 
     private boolean typingStatusEnabled = true;
 
@@ -3906,6 +3907,11 @@ private void handleTypingIndicatorOnTextChange(@NonNull String text) {
     public void setTypingStatusEnabled(boolean enabled) {
       this.typingStatusEnabled = enabled;
     }
+
+    @Override
+    public void onStylingChanged() {
+      handleSaveDraftOnTextChange(composeText.getTextTrimmed());
+    }
   }
 
   @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
@@ -563,6 +563,7 @@ class ConversationFragment :
       setCursorPositionChangedListener(composeTextEventsListener)
       setOnKeyListener(composeTextEventsListener)
       addTextChangedListener(composeTextEventsListener)
+      setStylingChangedListener(composeTextEventsListener)
       setOnClickListener(composeTextEventsListener)
       onFocusChangeListener = composeTextEventsListener
     }
@@ -2667,7 +2668,8 @@ class ConversationFragment :
     View.OnClickListener,
     TextWatcher,
     OnFocusChangeListener,
-    ComposeText.CursorPositionChangedListener {
+    ComposeText.CursorPositionChangedListener,
+    ComposeText.StylingChangedListener {
 
     private var beforeLength = 0
     private var previousText = ""
@@ -2746,6 +2748,10 @@ class ConversationFragment :
 
       previousText = text
     }
+
+    override fun onStylingChanged() {
+      handleSaveDraftOnTextChange(composeText.textTrimmed)
+    }
   }
 
   //endregion Compose + Send Callbacks

Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,7 @@ public class ComposeText extends EmojiEditText {`
`73`	`73`	`@Nullable private InputPanel.MediaListener mediaListener;`
`74`	`74`	`@Nullable private CursorPositionChangedListener cursorPositionChangedListener;`
`75`	`75`	`@Nullable private InlineQueryChangedListener inlineQueryChangedListener;`
	`76`	`+ @Nullable private StylingChangedListener stylingChangedListener;`
`76`	`77`
`77`	`78`	`public ComposeText(Context context) {`
`78`	`79`	`super(context);`
`@@ -223,6 +224,10 @@ public void setMentionValidator(@Nullable MentionValidatorWatcher.MentionValidat`
`223`	`224`	`mentionValidatorWatcher.setMentionValidator(mentionValidator);`
`224`	`225`	`}`
`225`	`226`
	`227`	`+ public void setStylingChangedListener(@Nullable StylingChangedListener listener) {`
	`228`	`+ stylingChangedListener = listener;`
	`229`	`+ }`
	`230`	`+`
`226`	`231`	`private boolean isLandscape() {`
`227`	`232`	`return getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE;`
`228`	`233`	`}`
`@@ -579,6 +584,10 @@ public boolean handleFormatText(@IdRes int id) {`
`579`	`584`
`580`	`585`	`Selection.setSelection(getText(), end);`
`581`	`586`
	`587`	`+ if (stylingChangedListener != null) {`
	`588`	`+ stylingChangedListener.onStylingChanged();`
	`589`	`+ }`
	`590`	`+`
`582`	`591`	`return true;`
`583`	`592`	`}`
`584`	`593`
`@@ -628,4 +637,7 @@ public interface CursorPositionChangedListener {`
`628`	`637`	`void onCursorPositionChanged(int start, int end);`
`629`	`638`	`}`
`630`	`639`
	`640`	`+ public interface StylingChangedListener {`
	`641`	`+ void onStylingChanged();`
	`642`	`+ }`
`631`	`643`	`}`
Original file line number	Diff line number	Diff line change
`@@ -862,6 +862,7 @@ public void onSuccess(Boolean loadedDraft) {`
`862`	`862`	`}`
`863`	`863`
`864`	`864`	`composeText.addTextChangedListener(typingTextWatcher);`
	`865`	`+ composeText.setStylingChangedListener(typingTextWatcher);`
`865`	`866`	`composeText.setSelection(composeText.length(), composeText.length());`
`866`	`867`	`}`
`867`	`868`	`});`
`@@ -3865,7 +3866,7 @@ public void onFocusChange(View v, boolean hasFocus) {`
`3865`	`3866`	`}`
`3866`	`3867`	`}`
`3867`	`3868`
`3868`		`- private class ComposeTextWatcher extends SimpleTextWatcher {`
	`3869`	`+ private class ComposeTextWatcher extends SimpleTextWatcher implements ComposeText.StylingChangedListener {`
`3869`	`3870`
`3870`	`3871`	`private boolean typingStatusEnabled = true;`
`3871`	`3872`
`@@ -3906,6 +3907,11 @@ private void handleTypingIndicatorOnTextChange(@NonNull String text) {`
`3906`	`3907`	`public void setTypingStatusEnabled(boolean enabled) {`
`3907`	`3908`	`this.typingStatusEnabled = enabled;`
`3908`	`3909`	`}`
	`3910`	`+`
	`3911`	`+ @Override`
	`3912`	`+ public void onStylingChanged() {`
	`3913`	`+ handleSaveDraftOnTextChange(composeText.getTextTrimmed());`
	`3914`	`+ }`
`3909`	`3915`	`}`
`3910`	`3916`
`3911`	`3917`	`@Override`