improve tests resiliece

Author: CampelloManuel

app/src/androidTest/java/com/nononsenseapps/notepad/espresso_tests/TestAddTaskListsScrollNavigationDrawer.java

@@ -48,7 +48,9 @@ public void testAddTaskListsScrollNavigationDrawer() {
 				.check(matches(isDisplayed()));
 
 		// onView() can click on the item, but can't scroll to it
-		onView(allOf(withText("ut "), withId(android.R.id.text1)))
+		onView(allOf(
+					withText(equalToIgnoringCase("ut ")),
+					withId(android.R.id.text1)))
 				.perform(click());
 
 		EspressoHelper.openDrawer();

app/src/androidTest/java/com/nononsenseapps/notepad/espresso_tests/TestCompletedTasksAreCleared.java

@@ -14,6 +14,8 @@
 import static org.hamcrest.Matchers.anything;
 
 import androidx.test.espresso.DataInteraction;
+import androidx.test.espresso.Espresso;
+import androidx.test.espresso.PerformException;
 import androidx.test.filters.LargeTest;
 
 import com.nononsenseapps.notepad.R;
@@ -64,7 +66,11 @@ public void testCompletedTasksAreCleared() {
 	 */
 	private void clickCheckBoxAt(int position) {
 		// the keyboard may cover the notes, which makes the next lines crash!
-		onView(isRoot()).perform(closeSoftKeyboard());
+		try {
+			Espresso.closeSoftKeyboard();
+		} catch (PerformException ignored) {
+			// keyboard was already closed
+		}
 		DataInteraction di = onData(anything())
 				.inAdapterView(allOf(withId(android.R.id.list), hasChildCount(5)))
 				.atPosition(position)

app/src/main/java/com/nononsenseapps/notepad/activities/main/ActivityMain.java

@@ -454,12 +454,16 @@ void newOnBackPressed() {
 			return;
 		}
 
-		// If search view is expanded, collapse it instead of closing the activity
-		SearchView mSearchVi = (SearchView) mSearchViewMenuItem.getActionView();
-		if (mSearchVi != null && !mSearchVi.isIconified()) {
-			mSearchViewMenuItem.collapseActionView();
-			invalidateOptionsMenu();
-			return;
+		if (mSearchViewMenuItem != null) {
+			// If search view is expanded, collapse it instead of closing the activity
+			SearchView mSearchVi = (SearchView) mSearchViewMenuItem.getActionView();
+			if (mSearchVi != null && !mSearchVi.isIconified()) {
+				mSearchViewMenuItem.collapseActionView();
+				invalidateOptionsMenu();
+				return;
+			}
+		} else {
+			// cannot fetch the searchview. Therefore, don't try to close it
 		}
 
 		// Reset intent so we get proper fragment handling when the stack pops