wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1177723 - Remove remaining database system search integration. r=mfinkle

Browse Source
This commit is contained in:
Richard Newman 2015-07-01 10:49:28 -07:00
parent 9919e08b62
commit 1841c02bc9
2 changed files with 2 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mobile/android/base/AndroidManifest.xml.in
View File

@ -402,12 +402,7 @@
<provider android:name="org.mozilla.gecko.db.BrowserProvider"
android:authorities="@ANDROID_PACKAGE_NAME@.db.browser"
android:permission="@ANDROID_PACKAGE_NAME@.permissions.BROWSER_PROVIDER">
<path-permission android:pathPrefix="/search_suggest_query"
android:readPermission="android.permission.GLOBAL_SEARCH" />
</provider>
android:permission="@ANDROID_PACKAGE_NAME@.permissions.BROWSER_PROVIDER"/>
#ifdef MOZ_ANDROID_SHARE_OVERLAY
<!-- Share overlay activity

41
mobile/android/base/db/BrowserProvider.java
View File

@ -19,7 +19,6 @@ import org.mozilla.gecko.db.BrowserContract.Schema;
import org.mozilla.gecko.db.BrowserContract.Thumbnails;
import org.mozilla.gecko.sync.Utils;
import android.app.SearchManager;
import android.content.ContentProviderOperation;
import android.content.ContentProviderResult;
import android.content.ContentUris;
@ -89,7 +88,7 @@ public class BrowserProvider extends SharedBrowserDatabaseProvider {
// Control matches
static final int CONTROL = 600;
// Search Suggest matches
// Search Suggest matches. Obsolete.
static final int SEARCH_SUGGEST = 700;
// Thumbnail matches
@ -108,7 +107,6 @@ public class BrowserProvider extends SharedBrowserDatabaseProvider {
static final Map<String, String> HISTORY_PROJECTION_MAP;
static final Map<String, String> COMBINED_PROJECTION_MAP;
static final Map<String, String> SCHEMA_PROJECTION_MAP;
static final Map<String, String> SEARCH_SUGGEST_PROJECTION_MAP;
static final Map<String, String> FAVICONS_PROJECTION_MAP;
static final Map<String, String> THUMBNAILS_PROJECTION_MAP;
static final Table[] sTables;
@ -216,18 +214,6 @@ public class BrowserProvider extends SharedBrowserDatabaseProvider {
// Control
URI_MATCHER.addURI(BrowserContract.AUTHORITY, "control", CONTROL);
// Search Suggest
URI_MATCHER.addURI(BrowserContract.AUTHORITY, SearchManager.SUGGEST_URI_PATH_QUERY + "/*", SEARCH_SUGGEST);
map = new HashMap<String, String>();
map.put(SearchManager.SUGGEST_COLUMN_TEXT_1,
Combined.TITLE + " AS " + SearchManager.SUGGEST_COLUMN_TEXT_1);
map.put(SearchManager.SUGGEST_COLUMN_TEXT_2_URL,
Combined.URL + " AS " + SearchManager.SUGGEST_COLUMN_TEXT_2_URL);
map.put(SearchManager.SUGGEST_COLUMN_INTENT_DATA,
Combined.URL + " AS " + SearchManager.SUGGEST_COLUMN_INTENT_DATA);
SEARCH_SUGGEST_PROJECTION_MAP = Collections.unmodifiableMap(map);
for (Table table : sTables) {
for (Table.ContentProviderInfo type : table.getContentProviderInfo()) {
URI_MATCHER.addURI(BrowserContract.AUTHORITY, type.name, type.id);
@ -356,9 +342,6 @@ public class BrowserProvider extends SharedBrowserDatabaseProvider {
case HISTORY_ID:
trace("URI is HISTORY_ID: " + uri);
return History.CONTENT_ITEM_TYPE;
case SEARCH_SUGGEST:
trace("URI is SEARCH_SUGGEST: " + uri);
return SearchManager.SUGGEST_MIME_TYPE;
default:
String type = getContentItemType(match);
if (type != null) {
@ -775,28 +758,6 @@ public class BrowserProvider extends SharedBrowserDatabaseProvider {
break;
}
case SEARCH_SUGGEST: {
debug("Query is on search suggest: " + uri);
selection = DBUtils.concatenateWhere(selection, "(" + Combined.URL + " LIKE ? OR " +
Combined.TITLE + " LIKE ?)");
String keyword = uri.getLastPathSegment();
if (keyword == null)
keyword = "";
selectionArgs = DBUtils.appendSelectionArgs(selectionArgs,
new String[] { "%" + keyword + "%",
"%" + keyword + "%" });
if (TextUtils.isEmpty(sortOrder))
sortOrder = DEFAULT_HISTORY_SORT_ORDER;
qb.setProjectionMap(SEARCH_SUGGEST_PROJECTION_MAP);
qb.setTables(VIEW_COMBINED_WITH_FAVICONS);
break;
}
default: {
Table table = findTableFor(match);
if (table == null) {