PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent search crashes from uninstalled apps

Browse Source 
All search results are now refreshed when resuming the
search fragment, to prevent crashes from results that
no longer exist.

Change-Id: I905465d14f415598ec7a2ebe7b29ed620cde0962
Fixes: 34817357
Test: make RunSettingsRoboTests
Merged-In: I96a0cbfee711ab9dee49d56bfdc4e885202d9ecd
This commit is contained in:
Matthew Fritze
2017-03-22 13:51:36 -07:00
parent eb62407114
commit 75f55d6e05
6 changed files with 178 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/search2/DatabaseIndexingManager.java
View File

@@ -515,7 +515,7 @@ public class DatabaseIndexingManager {
if (count > 0) {
while (cursor.moveToNext()) {
final int providerRank = cursor.getInt(COLUMN_INDEX_XML_RES_RANK);
// TODO remove provider rank
final int xmlResId = cursor.getInt(COLUMN_INDEX_XML_RES_RESID);
final String className = cursor.getString(COLUMN_INDEX_XML_RES_CLASS_NAME);
@@ -560,7 +560,7 @@ public class DatabaseIndexingManager {
if (count > 0) {
while (cursor.moveToNext()) {
final int providerRank = cursor.getInt(COLUMN_INDEX_RAW_RANK);
// TODO Remove rank
final String title = cursor.getString(COLUMN_INDEX_RAW_TITLE);
final String summaryOn = cursor.getString(COLUMN_INDEX_RAW_SUMMARY_ON);
final String summaryOff = cursor.getString(COLUMN_INDEX_RAW_SUMMARY_OFF);

20
src/com/android/settings/search2/SearchFragment.java
View File

@@ -167,6 +167,17 @@ public class SearchFragment extends InstrumentedFragment implements SearchView.O
return view;
}
@Override
public void onResume() {
super.onResume();
if (TextUtils.isEmpty(mQuery)) {
return;
}
final String query = mQuery;
mQuery = "";
onQueryTextChange(query);
}
@Override
public void onStop() {
super.onStop();
@@ -206,7 +217,6 @@ public class SearchFragment extends InstrumentedFragment implements SearchView.O
mResultClickCount = 0;
mNeverEnteredQuery = false;
mQuery = query;
mSearchAdapter.clearResults();
if (isEmptyQuery) {
final LoaderManager loaderManager = getLoaderManager();
@@ -252,7 +262,13 @@ public class SearchFragment extends InstrumentedFragment implements SearchView.O
return;
}
final int resultCount = mSearchAdapter.displaySearchResults();
mNoResultsView.setVisibility(resultCount == 0 ? View.VISIBLE : View.GONE);
if (resultCount == 0) {
mNoResultsView.setVisibility(View.VISIBLE);
} else {
mNoResultsView.setVisibility(View.GONE);
mResultsRecyclerView.scrollToPosition(0);
}
mSearchFeatureProvider.showFeedbackButton(this, getView());
}

24
src/com/android/settings/search2/SearchResult.java
View File

@@ -93,7 +93,7 @@ public class SearchResult implements Comparable<SearchResult> {
icon = builder.mIcon;
payload = builder.mResultPayload;
viewType = payload.getType();
stableId = Objects.hash(title, summary, breadcrumbs, rank, icon, payload, viewType);
stableId = Objects.hash(title, summary, breadcrumbs, rank, viewType);
}
@Override
@@ -104,6 +104,22 @@ public class SearchResult implements Comparable<SearchResult> {
return this.rank - searchResult.rank;
}
@Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
}
if (!(obj instanceof SearchResult)) {
return false;
}
return this.stableId == ((SearchResult) obj).stableId;
}
@Override
public int hashCode() {
return (int) stableId;
}
public static class Builder {
protected CharSequence mTitle;
protected CharSequence mSummary;
@@ -127,19 +143,19 @@ public class SearchResult implements Comparable<SearchResult> {
return this;
}
public Builder addRank(int rank) {
public Builder addRank(int rank) {
if (rank >= 0 && rank <= 9) {
mRank = rank;
}
return this;
}
public Builder addIcon(Drawable icon) {
public Builder addIcon(Drawable icon) {
mIcon = icon;
return this;
}
public Builder addPayload(ResultPayload payload) {
public Builder addPayload(ResultPayload payload) {
mResultPayload = payload;
return this;
}

56
src/com/android/settings/search2/SearchResultDiffCallback.java Normal file
View File

@@ -0,0 +1,56 @@
/*
* Copyright (C) 2017 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.android.settings.search2;
import android.support.v7.util.DiffUtil;
import java.util.List;
/**
* Callback for DiffUtil to elegantly update search data when the query changes.
*/
public class SearchResultDiffCallback extends DiffUtil.Callback {
private List<SearchResult> mOldList;
private List<SearchResult> mNewList;
public SearchResultDiffCallback(List<SearchResult> oldList, List<SearchResult> newList) {
mOldList = oldList;
mNewList = newList;
}
@Override
public int getOldListSize() {
return mOldList.size();
}
@Override
public int getNewListSize() {
return mNewList.size();
}
@Override
public boolean areItemsTheSame(int oldItemPosition, int newItemPosition) {
return mOldList.get(oldItemPosition).equals(mNewList.get(newItemPosition));
}
@Override
public boolean areContentsTheSame(int oldItemPosition, int newItemPosition) {
return mOldList.get(oldItemPosition).equals(mNewList.get(newItemPosition));
}
}

20
src/com/android/settings/search2/SearchResultsAdapter.java
View File

@@ -19,6 +19,7 @@ package com.android.settings.search2;
import android.content.Context;
import android.support.annotation.MainThread;
import android.support.annotation.VisibleForTesting;
import android.support.v7.util.DiffUtil;
import android.support.v7.widget.RecyclerView;
import android.util.ArrayMap;
import android.view.LayoutInflater;
@@ -37,8 +38,9 @@ import static com.android.settings.search2.SearchResult.TOP_RANK;
public class SearchResultsAdapter extends RecyclerView.Adapter<SearchViewHolder> {
private final List<SearchResult> mSearchResults;
private final SearchFragment mFragment;
private List<SearchResult> mSearchResults;
private Map<String, List<? extends SearchResult>> mResultsMap;
public SearchResultsAdapter(SearchFragment fragment) {
@@ -128,7 +130,7 @@ public class SearchResultsAdapter extends RecyclerView.Adapter<SearchViewHolder>
.get(InstalledAppResultLoader.class.getName());
final int dbSize = (databaseResults != null) ? databaseResults.size() : 0;
final int appSize = (installedAppResults != null) ? installedAppResults.size() : 0;
final List<SearchResult> results = new ArrayList<>(dbSize + appSize);
final List<SearchResult> newResults = new ArrayList<>(dbSize + appSize);
int dbIndex = 0;
int appIndex = 0;
@@ -136,23 +138,25 @@ public class SearchResultsAdapter extends RecyclerView.Adapter<SearchViewHolder>
while (rank <= BOTTOM_RANK) {
while ((dbIndex < dbSize) && (databaseResults.get(dbIndex).rank == rank)) {
results.add(databaseResults.get(dbIndex++));
newResults.add(databaseResults.get(dbIndex++));
}
while ((appIndex < appSize) && (installedAppResults.get(appIndex).rank == rank)) {
results.add(installedAppResults.get(appIndex++));
newResults.add(installedAppResults.get(appIndex++));
}
rank++;
}
while (dbIndex < dbSize) {
results.add(databaseResults.get(dbIndex++));
newResults.add(databaseResults.get(dbIndex++));
}
while (appIndex < appSize) {
results.add(installedAppResults.get(appIndex++));
newResults.add(installedAppResults.get(appIndex++));
}
mSearchResults.addAll(results);
notifyDataSetChanged();
final DiffUtil.DiffResult diffResult = DiffUtil.calculateDiff(
new SearchResultDiffCallback(mSearchResults, newResults), false /* detectMoves */);
mSearchResults = newResults;
diffResult.dispatchUpdatesTo(this);
return mSearchResults.size();
}

91
tests/robotests/src/com/android/settings/search/SearchResultsAdapterTest.java
View File

@@ -63,6 +63,8 @@ public class SearchResultsAdapterTest {
private Context mContext;
private String mLoaderClassName;
private String[] TITLES = {"alpha", "bravo", "charlie", "appAlpha", "appBravo", "appCharlie"};
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
@@ -72,13 +74,13 @@ public class SearchResultsAdapterTest {
}
@Test
public void testNoResultsAdded_EmptyListReturned() {
public void testNoResultsAdded_emptyListReturned() {
List<SearchResult> updatedResults = mAdapter.getSearchResults();
assertThat(updatedResults).isEmpty();
}
@Test
public void testSingleSourceMerge_ExactCopyReturned() {
public void testSingleSourceMerge_exactCopyReturned() {
ArrayList<SearchResult> intentResults = getIntentSampleResults();
mAdapter.addSearchResults(intentResults, mLoaderClassName);
mAdapter.displaySearchResults();
@@ -88,7 +90,7 @@ public class SearchResultsAdapterTest {
}
@Test
public void testCreateViewHolder_ReturnsIntentResult() {
public void testCreateViewHolder_returnsIntentResult() {
ViewGroup group = new FrameLayout(mContext);
SearchViewHolder view = mAdapter.onCreateViewHolder(group,
ResultPayload.PayloadType.INTENT);
@@ -96,7 +98,7 @@ public class SearchResultsAdapterTest {
}
@Test
public void testCreateViewHolder_ReturnsInlineSwitchResult() {
public void testCreateViewHolder_returnsInlineSwitchResult() {
ViewGroup group = new FrameLayout(mContext);
SearchViewHolder view = mAdapter.onCreateViewHolder(group,
ResultPayload.PayloadType.INLINE_SWITCH);
@@ -104,21 +106,54 @@ public class SearchResultsAdapterTest {
}
@Test
public void testEndToEndSearch_ProperResultsMerged() {
mAdapter.addSearchResults(getDummyAppResults(),
public void testEndToEndSearch_properResultsMerged_correctOrder() {
mAdapter.addSearchResults(getDummyAppResults(), InstalledAppResultLoader.class.getName());
mAdapter.addSearchResults(getDummyDbResults(), DatabaseResultLoader.class.getName());
mAdapter.displaySearchResults();
List<SearchResult> results = mAdapter.getSearchResults();
List<SearchResult> sortedDummyResults = getSortedDummyResults();
assertThat(results).containsExactlyElementsIn(sortedDummyResults).inOrder();
}
@Test
public void testEndToEndSearch_addResults_resultsAddedInOrder() {
List<AppSearchResult> appResults = getDummyAppResults();
List<SearchResult> dbResults = getDummyDbResults();
// Add two individual items
mAdapter.addSearchResults(appResults.subList(0,1),
InstalledAppResultLoader.class.getName());
mAdapter.addSearchResults(getDummyDbResults(),
DatabaseResultLoader.class.getName());
mAdapter.addSearchResults(dbResults.subList(0,1), DatabaseResultLoader.class.getName());
mAdapter.displaySearchResults();
// Add super-set of items
mAdapter.addSearchResults(appResults, InstalledAppResultLoader.class.getName());
mAdapter.addSearchResults(dbResults, DatabaseResultLoader.class.getName());
mAdapter.displaySearchResults();
List<SearchResult> results = mAdapter.getSearchResults();
List<SearchResult> sortedDummyResults = getSortedDummyResults();
assertThat(results).containsExactlyElementsIn(sortedDummyResults).inOrder();
}
@Test
public void testEndToEndSearch_removeResults_resultsAdded() {
List<AppSearchResult> appResults = getDummyAppResults();
List<SearchResult> dbResults = getDummyDbResults();
// Add list of items
mAdapter.addSearchResults(appResults, InstalledAppResultLoader.class.getName());
mAdapter.addSearchResults(dbResults, DatabaseResultLoader.class.getName());
mAdapter.displaySearchResults();
// Add subset of items
mAdapter.addSearchResults(appResults.subList(0,1),
InstalledAppResultLoader.class.getName());
mAdapter.addSearchResults(dbResults.subList(0,1), DatabaseResultLoader.class.getName());
int count = mAdapter.displaySearchResults();
List<SearchResult> results = mAdapter.getSearchResults();
assertThat(results.get(0).title).isEqualTo("alpha");
assertThat(results.get(1).title).isEqualTo("appAlpha");
assertThat(results.get(2).title).isEqualTo("appBravo");
assertThat(results.get(3).title).isEqualTo("bravo");
assertThat(results.get(4).title).isEqualTo("appCharlie");
assertThat(results.get(5).title).isEqualTo("Charlie");
assertThat(count).isEqualTo(6);
assertThat(results.get(0).title).isEqualTo(TITLES[0]);
assertThat(results.get(1).title).isEqualTo(TITLES[3]);
assertThat(count).isEqualTo(2);
}
private List<SearchResult> getDummyDbResults() {
@@ -127,15 +162,15 @@ public class SearchResultsAdapterTest {
SearchResult.Builder builder = new SearchResult.Builder();
builder.addPayload(payload);
builder.addTitle("alpha")
builder.addTitle(TITLES[0])
.addRank(1);
results.add(builder.build());
builder.addTitle("bravo")
builder.addTitle(TITLES[1])
.addRank(3);
results.add(builder.build());
builder.addTitle("Charlie")
builder.addTitle(TITLES[2])
.addRank(6);
results.add(builder.build());
@@ -148,21 +183,35 @@ public class SearchResultsAdapterTest {
AppSearchResult.Builder builder = new AppSearchResult.Builder();
builder.addPayload(payload);
builder.addTitle("appAlpha")
builder.addTitle(TITLES[3])
.addRank(1);
results.add(builder.build());
builder.addTitle("appBravo")
builder.addTitle(TITLES[4])
.addRank(2);
results.add(builder.build());
builder.addTitle("appCharlie")
builder.addTitle(TITLES[5])
.addRank(4);
results.add(builder.build());
return results;
}
private List<SearchResult> getSortedDummyResults() {
List<AppSearchResult> appResults = getDummyAppResults();
List<SearchResult> dbResults = getDummyDbResults();
List<SearchResult> sortedResults = new ArrayList<>(appResults.size() + dbResults.size());
sortedResults.add(dbResults.get(0)); // alpha
sortedResults.add(appResults.get(0)); // appAlpha
sortedResults.add(appResults.get(1)); // appBravo
sortedResults.add(dbResults.get(1)); // bravo
sortedResults.add(appResults.get(2)); // appCharlie
sortedResults.add(dbResults.get(2)); // Charlie
return sortedResults;
}
private ArrayList<SearchResult> getIntentSampleResults() {
ArrayList<SearchResult> sampleResults = new ArrayList<>();
ArrayList<String> breadcrumbs = new ArrayList<>();