From 1943e3957390bae7e922040754faa50e1840dfa3 Mon Sep 17 00:00:00 2001
From: hyb1996 <946994919@qq.com>
Date: Sun, 14 Oct 2018 10:53:18 +0800
Subject: [PATCH] fix: NullPointerException at
 android.widget.Editor.updateCursorPositionMz(Editor.java:7878)

---
 .../ui/edit/FindOrReplaceDialogBuilder.java      |  8 +++-----
 .../main/res/layout/dialog_find_or_replace.xml   | 16 ++++++++--------
 .../autojs/core/ui/nativeview/ViewPrototype.java |  3 ++-
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/org/autojs/autojs/ui/edit/FindOrReplaceDialogBuilder.java b/app/src/main/java/org/autojs/autojs/ui/edit/FindOrReplaceDialogBuilder.java
index 7c2317d3..7da8054c 100644
--- a/app/src/main/java/org/autojs/autojs/ui/edit/FindOrReplaceDialogBuilder.java
+++ b/app/src/main/java/org/autojs/autojs/ui/edit/FindOrReplaceDialogBuilder.java
@@ -3,14 +3,12 @@ package org.autojs.autojs.ui.edit;
 import android.content.Context;
 import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
-import android.support.design.widget.TextInputEditText;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.CheckBox;
+import android.widget.EditText;
 
-import com.afollestad.materialdialogs.DialogAction;
 import com.afollestad.materialdialogs.MaterialDialog;
-import com.stardust.app.GlobalAppContext;
 
 import org.autojs.autojs.R;
 import org.autojs.autojs.theme.dialog.ThemeColorMaterialDialogBuilder;
@@ -39,10 +37,10 @@ public class FindOrReplaceDialogBuilder extends ThemeColorMaterialDialogBuilder
     CheckBox mReplaceAllCheckBox;
 
     @BindView(R.id.keywords)
-    TextInputEditText mKeywordsEditText;
+    EditText mKeywordsEditText;
 
     @BindView(R.id.replacement)
-    TextInputEditText mReplacementEditText;
+    EditText mReplacementEditText;
 
     private EditorView mEditorView;
 
diff --git a/app/src/main/res/layout/dialog_find_or_replace.xml b/app/src/main/res/layout/dialog_find_or_replace.xml
index a6b96714..2cc2841b 100644
--- a/app/src/main/res/layout/dialog_find_or_replace.xml
+++ b/app/src/main/res/layout/dialog_find_or_replace.xml
@@ -10,13 +10,13 @@
 
     <android.support.design.widget.TextInputLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:hint="@string/text_find">
 
-        <android.support.design.widget.TextInputEditText
+        <android.support.v7.widget.AppCompatEditText
             android:id="@+id/keywords"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="@string/text_find"/>
+            android:layout_height="wrap_content"/>
     </android.support.design.widget.TextInputLayout>
 
     <CheckBox
@@ -27,13 +27,13 @@
 
     <android.support.design.widget.TextInputLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:hint="@string/text_replace">
 
-        <android.support.design.widget.TextInputEditText
+        <android.support.v7.widget.AppCompatEditText
             android:id="@+id/replacement"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="@string/text_replace"/>
+            android:layout_height="wrap_content"/>
     </android.support.design.widget.TextInputLayout>
 
     <LinearLayout
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/nativeview/ViewPrototype.java b/autojs/src/main/java/com/stardust/autojs/core/ui/nativeview/ViewPrototype.java
index fc81c5bb..2f3b7852 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/nativeview/ViewPrototype.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/nativeview/ViewPrototype.java
@@ -12,6 +12,7 @@ import com.stardust.autojs.core.ui.widget.JsListView;
 import com.stardust.autojs.runtime.ScriptRuntime;
 
 import org.mozilla.javascript.Scriptable;
+import org.mozilla.javascript.Undefined;
 
 import java.util.HashSet;
 
@@ -39,7 +40,7 @@ public class ViewPrototype {
         if (attribute != null) {
             return attribute.get();
         }
-        return null;
+        return Undefined.SCRIPTABLE_UNDEFINED;
     }
 
     public void attr(String name, Object value) {