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 880118 - Provide a way to disable content providers for a GeckoView library. r=blassey

Browse Source
This commit is contained in:
Shane Tully 2013-08-20 14:54:16 -07:00
parent 3b70e54ad6
commit 6be1a8808a
3 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mobile/android/base/GeckoView.java
View File

@ -39,6 +39,12 @@ public class GeckoView extends LayerView
if (!doInit)
return;
// If running outside of a GeckoActivity (eg, from a library project),
// load the native code and disable content providers
if (!(context instanceof GeckoActivity)) {
BrowserDB.setEnableContentProviders(false);
}
if (url != null) {
GeckoThread.setUri(url);
GeckoThread.setAction(Intent.ACTION_VIEW);

4
mobile/android/base/GlobalHistory.java
View File

@ -54,6 +54,10 @@ class GlobalHistory {
Cursor c = null;
try {
c = BrowserDB.getAllVisitedHistory(GeckoAppShell.getContext().getContentResolver());
if (c == null) {
return;
}
if (c.moveToFirst()) {
do {
visitedSet.add(c.getString(0));

27
mobile/android/base/db/BrowserDB.java
View File

@ -20,6 +20,7 @@ import java.util.List;
public class BrowserDB {
public static String ABOUT_PAGES_URL_FILTER = "about:%";
private static boolean sAreContentProvidersEnabled = true;
public static interface URLColumns {
public static String URL = "url";
@ -146,20 +147,26 @@ public class BrowserDB {
}
public static void updateVisitedHistory(ContentResolver cr, String uri) {
sDb.updateVisitedHistory(cr, uri);
if (sAreContentProvidersEnabled) {
sDb.updateVisitedHistory(cr, uri);
}
}
public static void updateHistoryTitle(ContentResolver cr, String uri, String title) {
sDb.updateHistoryTitle(cr, uri, title);
if (sAreContentProvidersEnabled) {
sDb.updateHistoryTitle(cr, uri, title);
}
}
public static void updateHistoryEntry(ContentResolver cr, String uri, String title,
long date, int visits) {
sDb.updateHistoryEntry(cr, uri, title, date, visits);
if (sAreContentProvidersEnabled) {
sDb.updateHistoryEntry(cr, uri, title, date, visits);
}
}
public static Cursor getAllVisitedHistory(ContentResolver cr) {
return sDb.getAllVisitedHistory(cr);
return (sAreContentProvidersEnabled ? sDb.getAllVisitedHistory(cr) : null);
}
public static Cursor getRecentHistory(ContentResolver cr, int limit) {
@ -204,11 +211,11 @@ public class BrowserDB {
}
public static boolean isBookmark(ContentResolver cr, String uri) {
return sDb.isBookmark(cr, uri);
return (sAreContentProvidersEnabled && sDb.isBookmark(cr, uri));
}
public static boolean isReadingListItem(ContentResolver cr, String uri) {
return sDb.isReadingListItem(cr, uri);
return (sAreContentProvidersEnabled && sDb.isReadingListItem(cr, uri));
}
public static void addBookmark(ContentResolver cr, String title, String uri) {
@ -307,6 +314,14 @@ public class BrowserDB {
return sDb.getBookmarkForUrl(cr, url);
}
public static boolean areContentProvidersDisabled() {
return sAreContentProvidersEnabled;
}
public static void setEnableContentProviders(boolean enableContentProviders) {
sAreContentProvidersEnabled = enableContentProviders;
}
public static class PinnedSite {
public String title = "";
public String url = "";