From 4fe8e4add4cc435270ff61588455950770498b5a Mon Sep 17 00:00:00 2001
From: hyb1996 <946994919@qq.com>
Date: Thu, 13 Sep 2018 16:30:18 +0800
Subject: [PATCH] fix(ui): cannot redo and undo

---
 .../main/java/org/autojs/autojs/ui/edit/editor/CodeEditor.java | 2 +-
 .../org/autojs/autojs/ui/edit/editor/TextViewUndoRedo.java     | 3 +++
 .../autojs/autojs/ui/edit/toolbar/DebugToolbarFragment.java    | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/autojs/autojs/ui/edit/editor/CodeEditor.java b/app/src/main/java/org/autojs/autojs/ui/edit/editor/CodeEditor.java
index 89aa5571..ee52c5d1 100644
--- a/app/src/main/java/org/autojs/autojs/ui/edit/editor/CodeEditor.java
+++ b/app/src/main/java/org/autojs/autojs/ui/edit/editor/CodeEditor.java
@@ -144,7 +144,7 @@ public class CodeEditor extends HVScrollView {
     }
 
     public boolean canUndo() {
-        return mTextViewRedoUndo.canRedo();
+        return mTextViewRedoUndo.canUndo();
     }
 
     public boolean canRedo() {
diff --git a/app/src/main/java/org/autojs/autojs/ui/edit/editor/TextViewUndoRedo.java b/app/src/main/java/org/autojs/autojs/ui/edit/editor/TextViewUndoRedo.java
index 90d43383..01b6a173 100644
--- a/app/src/main/java/org/autojs/autojs/ui/edit/editor/TextViewUndoRedo.java
+++ b/app/src/main/java/org/autojs/autojs/ui/edit/editor/TextViewUndoRedo.java
@@ -419,6 +419,9 @@ public class TextViewUndoRedo {
         }
 
         public void afterTextChanged(Editable s) {
+            if (mIsUndoOrRedo || !mEnabled) {
+                return;
+            }
             if (mEditHistory.size() < mInitialHistoryStackSize) {
                 mInitialHistoryStackSize = 0;
             }
diff --git a/app/src/main/java/org/autojs/autojs/ui/edit/toolbar/DebugToolbarFragment.java b/app/src/main/java/org/autojs/autojs/ui/edit/toolbar/DebugToolbarFragment.java
index b377af51..4aadd6e0 100644
--- a/app/src/main/java/org/autojs/autojs/ui/edit/toolbar/DebugToolbarFragment.java
+++ b/app/src/main/java/org/autojs/autojs/ui/edit/toolbar/DebugToolbarFragment.java
@@ -111,10 +111,10 @@ public class DebugToolbarFragment extends ToolbarFragment implements DebugCallba
             return;
         }
         CodeEditor editor = mEditorView.getEditor();
-        editor.setRedoUndoEnabled(true);
         if (!TextUtils.equals(mInitialEditorSourceUrl, mCurrentEditorSourceUrl)) {
             editor.setText(mInitialEditorSource);
         }
+        editor.setRedoUndoEnabled(true);
         DebugBar debugBar = mEditorView.getDebugBar();
         debugBar.setTitle(null);
         debugBar.setCodeEvaluator(null);