コミット: 2f933246c5596f1e937c7f36b777394f30189e01 - android_notepad (git)

Simple Notepad Application for Android OS

コミットメタ情報

• リビジョン: 2f933246c5596f1e937c7f36b777394f30189e01 (tree)
• 日時: 2017-04-05 18:54:42
• 作者: Masahiko, SAWAI <say@user...>
• コミッター: Masahiko, SAWAI

ログメッセージ

Updated targetSdkVersion to 25(Android 7.1.1)

変更サマリ

• modified: notepad-app-level-11/src/main/AndroidManifest.xml
• modified: notepad-app-level-11/src/main/java/org/routine_work/notepad/fragment/ViewNoteFragment.java

差分

--- a/notepad-app-level-11/src/main/AndroidManifest.xml
+++ b/notepad-app-level-11/src/main/AndroidManifest.xml
@@ -6,7 +6,7 @@
 	android:versionName="1.0.13"
 	android:installLocation="auto"
 >
-	<uses-sdk android:minSdkVersion="11" android:targetSdkVersion="23" />
+	<uses-sdk android:minSdkVersion="11" android:targetSdkVersion="25" />
 
 	<uses-feature android:name="android.hardware.touchscreen" android:required="false" />
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

--- a/notepad-app-level-11/src/main/java/org/routine_work/notepad/fragment/ViewNoteFragment.java
+++ b/notepad-app-level-11/src/main/java/org/routine_work/notepad/fragment/ViewNoteFragment.java
@@ -397,12 +397,12 @@ public class ViewNoteFragment extends NoteDetailFragment implements NotepadConst
 
 	private void findPrevWord()
 	{
-		if (findWordActionMode != null)
+		if (findWordActionMode != null && findWordEditText != null)
 		{
 			String currentTargetWord = this.findWordContext.getTargetWord();
-			String newTargetWord = this.findWordEditText.getText().toString();
+			CharSequence newTargetWord = this.findWordEditText.getText();
 
-			if (TextUtils.isEmpty(currentTargetWord) || currentTargetWord.equals(newTargetWord) == false)
+			if (TextUtils.isEmpty(currentTargetWord) || TextUtils.equals(currentTargetWord, newTargetWord) == false)
 			{
 				findWord();
 			}
@@ -416,12 +416,12 @@ public class ViewNoteFragment extends NoteDetailFragment implements NotepadConst
 
 	private void findNextWord()
 	{
-		if (findWordActionMode != null)
+		if (findWordActionMode != null && findWordEditText != null)
 		{
 			String currentTargetWord = this.findWordContext.getTargetWord();
-			String newTargetWord = this.findWordEditText.getText().toString();
+			CharSequence newTargetWord = this.findWordEditText.getText();
 
-			if (TextUtils.isEmpty(currentTargetWord) || currentTargetWord.equals(newTargetWord) == false)
+			if (TextUtils.isEmpty(currentTargetWord) || TextUtils.equals(currentTargetWord, newTargetWord) == false)
 			{
 				findWord();
 			}