From b60c44c234dda35be80725967b5530ff83eefafc Mon Sep 17 00:00:00 2001 From: Wes Kocher Date: Mon, 10 Feb 2014 15:52:52 -0800 Subject: [PATCH] Backed out changeset bb4254c72efb (bug 961238) for robocop1 bustage on a CLOSED TREE --- mobile/android/base/db/BrowserContract.java | 61 - .../base/db/BrowserDatabaseHelper.java | 1748 --------------- mobile/android/base/db/BrowserProvider.java | 1920 ++++++++++++++++- mobile/android/base/db/DBUtils.java | 15 - .../base/db/TransactionalProvider.java | 277 --- mobile/android/base/moz.build | 2 - 6 files changed, 1884 insertions(+), 2139 deletions(-) delete mode 100644 mobile/android/base/db/BrowserDatabaseHelper.java delete mode 100644 mobile/android/base/db/TransactionalProvider.java diff --git a/mobile/android/base/db/BrowserContract.java b/mobile/android/base/db/BrowserContract.java index 6cd107d6868..4718a15955b 100644 --- a/mobile/android/base/db/BrowserContract.java +++ b/mobile/android/base/db/BrowserContract.java @@ -101,8 +101,6 @@ public class BrowserContract { public static final class Favicons implements CommonColumns, DateSyncColumns { private Favicons() {} - public static final String TABLE_NAME = "favicons"; - public static final Uri CONTENT_URI = Uri.withAppendedPath(AUTHORITY_URI, "favicons"); public static final String URL = "url"; @@ -114,8 +112,6 @@ public class BrowserContract { public static final class Thumbnails implements CommonColumns { private Thumbnails() {} - public static final String TABLE_NAME = "thumbnails"; - public static final Uri CONTENT_URI = Uri.withAppendedPath(AUTHORITY_URI, "thumbnails"); public static final String URL = "url"; @@ -126,10 +122,6 @@ public class BrowserContract { public static final class Bookmarks implements CommonColumns, URLColumns, FaviconColumns, SyncColumns { private Bookmarks() {} - public static final String TABLE_NAME = "bookmarks"; - - public static final String VIEW_WITH_FAVICONS = "bookmarks_with_favicons"; - public static final int FIXED_ROOT_ID = 0; public static final int FAKE_DESKTOP_FOLDER_ID = -1; public static final int FIXED_READING_LIST_ID = -2; @@ -170,11 +162,6 @@ public class BrowserContract { @RobocopTarget public static final class History implements CommonColumns, URLColumns, HistoryColumns, FaviconColumns, SyncColumns { private History() {} - - public static final String TABLE_NAME = "history"; - - public static final String VIEW_WITH_FAVICONS = "history_with_favicons"; - public static final Uri CONTENT_URI = Uri.withAppendedPath(AUTHORITY_URI, "history"); public static final Uri CONTENT_OLD_URI = Uri.withAppendedPath(AUTHORITY_URI, "history/old"); public static final String CONTENT_TYPE = "vnd.android.cursor.dir/browser-history"; @@ -185,11 +172,6 @@ public class BrowserContract { @RobocopTarget public static final class Combined implements CommonColumns, URLColumns, HistoryColumns, FaviconColumns { private Combined() {} - - public static final String VIEW_NAME = "combined"; - - public static final String VIEW_WITH_FAVICONS = "combined_with_favicons"; - public static final Uri CONTENT_URI = Uri.withAppendedPath(AUTHORITY_URI, "combined"); public static final int DISPLAY_NORMAL = 0; @@ -323,47 +305,4 @@ public class BrowserContract { public static final String IMAGE_URL = "image_url"; public static final String CREATED = "created"; } - - /* - * Contains names and schema definitions for tables and views - * no longer being used by current ContentProviders. These values are used - * to make incremental updates to the schema during a database upgrade. Will be - * removed with bug 947018. - */ - static final class Obsolete { - public static final String TABLE_IMAGES = "images"; - public static final String VIEW_BOOKMARKS_WITH_IMAGES = "bookmarks_with_images"; - public static final String VIEW_HISTORY_WITH_IMAGES = "history_with_images"; - public static final String VIEW_COMBINED_WITH_IMAGES = "combined_with_images"; - - public static final class Images implements CommonColumns, SyncColumns { - private Images() {} - - public static final String URL = "url_key"; - public static final String FAVICON_URL = "favicon_url"; - public static final String FAVICON = "favicon"; - public static final String THUMBNAIL = "thumbnail"; - public static final String _ID = "_id"; - public static final String GUID = "guid"; - public static final String DATE_CREATED = "created"; - public static final String DATE_MODIFIED = "modified"; - public static final String IS_DELETED = "deleted"; - } - - public static final class Combined { - private Combined() {} - - public static final String THUMBNAIL = "thumbnail"; - } - - static final String TABLE_BOOKMARKS_JOIN_IMAGES = Bookmarks.TABLE_NAME + " LEFT OUTER JOIN " + - Obsolete.TABLE_IMAGES + " ON " + DBUtils.qualifyColumn(Bookmarks.TABLE_NAME, Bookmarks.URL) + " = " + - DBUtils.qualifyColumn(Obsolete.TABLE_IMAGES, Obsolete.Images.URL); - - static final String TABLE_HISTORY_JOIN_IMAGES = History.TABLE_NAME + " LEFT OUTER JOIN " + - Obsolete.TABLE_IMAGES + " ON " + DBUtils.qualifyColumn(Bookmarks.TABLE_NAME, History.URL) + " = " + - DBUtils.qualifyColumn(Obsolete.TABLE_IMAGES, Obsolete.Images.URL); - - static final String FAVICON_DB = "favicon_urls.db"; - } } diff --git a/mobile/android/base/db/BrowserDatabaseHelper.java b/mobile/android/base/db/BrowserDatabaseHelper.java deleted file mode 100644 index 47de4c1d929..00000000000 --- a/mobile/android/base/db/BrowserDatabaseHelper.java +++ /dev/null @@ -1,1748 +0,0 @@ -/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*- */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -package org.mozilla.gecko.db; - -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; -import org.mozilla.gecko.AppConstants; -import org.mozilla.gecko.Distribution; -import org.mozilla.gecko.R; -import org.mozilla.gecko.db.BrowserContract.Bookmarks; -import org.mozilla.gecko.db.BrowserContract.Combined; -import org.mozilla.gecko.db.BrowserContract.FaviconColumns; -import org.mozilla.gecko.db.BrowserContract.Favicons; -import org.mozilla.gecko.db.BrowserContract.History; -import org.mozilla.gecko.db.BrowserContract.Obsolete; -import org.mozilla.gecko.db.BrowserContract.Thumbnails; -import org.mozilla.gecko.gfx.BitmapUtils; -import org.mozilla.gecko.sync.Utils; -import org.mozilla.gecko.util.GeckoJarReader; -import org.mozilla.gecko.util.ThreadUtils; - -import android.content.ContentValues; -import android.content.Context; -import android.database.Cursor; -import android.database.DatabaseUtils; -import android.database.SQLException; -import android.database.sqlite.SQLiteDatabase; -import android.database.sqlite.SQLiteOpenHelper; -import android.graphics.Bitmap; -import android.net.Uri; -import android.os.Build; -import android.text.TextUtils; -import android.util.Log; - - -final class BrowserDatabaseHelper extends SQLiteOpenHelper { - - private static final String LOGTAG = "GeckoBrowserDBHelper"; - public static final int DATABASE_VERSION = 17; - public static final String DATABASE_NAME = "browser.db"; - - final protected Context mContext; - - static final String TABLE_BOOKMARKS = Bookmarks.TABLE_NAME; - static final String TABLE_HISTORY = History.TABLE_NAME; - static final String TABLE_FAVICONS = Favicons.TABLE_NAME; - static final String TABLE_THUMBNAILS = Thumbnails.TABLE_NAME; - - static final String VIEW_COMBINED = Combined.VIEW_NAME; - static final String VIEW_BOOKMARKS_WITH_FAVICONS = Bookmarks.VIEW_WITH_FAVICONS; - static final String VIEW_HISTORY_WITH_FAVICONS = History.VIEW_WITH_FAVICONS; - static final String VIEW_COMBINED_WITH_FAVICONS = Combined.VIEW_WITH_FAVICONS; - - static final String TABLE_BOOKMARKS_JOIN_FAVICONS = TABLE_BOOKMARKS + " LEFT OUTER JOIN " + - TABLE_FAVICONS + " ON " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.FAVICON_ID) + " = " + - qualifyColumn(TABLE_FAVICONS, Favicons._ID); - - static final String TABLE_HISTORY_JOIN_FAVICONS = TABLE_HISTORY + " LEFT OUTER JOIN " + - TABLE_FAVICONS + " ON " + qualifyColumn(TABLE_HISTORY, History.FAVICON_ID) + " = " + - qualifyColumn(TABLE_FAVICONS, Favicons._ID); - - static final String TABLE_BOOKMARKS_TMP = TABLE_BOOKMARKS + "_tmp"; - static final String TABLE_HISTORY_TMP = TABLE_HISTORY + "_tmp"; - static final String TABLE_IMAGES_TMP = Obsolete.TABLE_IMAGES + "_tmp"; - - private static final String[] mobileIdColumns = new String[] { Bookmarks._ID }; - private static final String[] mobileIdSelectionArgs = new String[] { Bookmarks.MOBILE_FOLDER_GUID }; - - public BrowserDatabaseHelper(Context context, String databasePath) { - super(context, databasePath, null, DATABASE_VERSION); - mContext = context; - } - - private void createBookmarksTable(SQLiteDatabase db) { - debug("Creating " + TABLE_BOOKMARKS + " table"); - - // Android versions older than Froyo ship with an sqlite - // that doesn't support foreign keys. - String foreignKeyOnParent = null; - if (Build.VERSION.SDK_INT >= 8) { - foreignKeyOnParent = ", FOREIGN KEY (" + Bookmarks.PARENT + - ") REFERENCES " + TABLE_BOOKMARKS + "(" + Bookmarks._ID + ")"; - } - - db.execSQL("CREATE TABLE " + TABLE_BOOKMARKS + "(" + - Bookmarks._ID + " INTEGER PRIMARY KEY AUTOINCREMENT," + - Bookmarks.TITLE + " TEXT," + - Bookmarks.URL + " TEXT," + - Bookmarks.TYPE + " INTEGER NOT NULL DEFAULT " + Bookmarks.TYPE_BOOKMARK + "," + - Bookmarks.PARENT + " INTEGER," + - Bookmarks.POSITION + " INTEGER NOT NULL," + - Bookmarks.KEYWORD + " TEXT," + - Bookmarks.DESCRIPTION + " TEXT," + - Bookmarks.TAGS + " TEXT," + - Bookmarks.DATE_CREATED + " INTEGER," + - Bookmarks.DATE_MODIFIED + " INTEGER," + - Bookmarks.GUID + " TEXT NOT NULL," + - Bookmarks.IS_DELETED + " INTEGER NOT NULL DEFAULT 0" + - (foreignKeyOnParent != null ? foreignKeyOnParent : "") + - ");"); - - db.execSQL("CREATE INDEX bookmarks_url_index ON " + TABLE_BOOKMARKS + "(" - + Bookmarks.URL + ")"); - db.execSQL("CREATE INDEX bookmarks_type_deleted_index ON " + TABLE_BOOKMARKS + "(" - + Bookmarks.TYPE + ", " + Bookmarks.IS_DELETED + ")"); - db.execSQL("CREATE UNIQUE INDEX bookmarks_guid_index ON " + TABLE_BOOKMARKS + "(" - + Bookmarks.GUID + ")"); - db.execSQL("CREATE INDEX bookmarks_modified_index ON " + TABLE_BOOKMARKS + "(" - + Bookmarks.DATE_MODIFIED + ")"); - } - - private void createBookmarksTableOn13(SQLiteDatabase db) { - debug("Creating " + TABLE_BOOKMARKS + " table"); - - // Android versions older than Froyo ship with an sqlite - // that doesn't support foreign keys. - String foreignKeyOnParent = null; - if (Build.VERSION.SDK_INT >= 8) { - foreignKeyOnParent = ", FOREIGN KEY (" + Bookmarks.PARENT + - ") REFERENCES " + TABLE_BOOKMARKS + "(" + Bookmarks._ID + ")"; - } - - db.execSQL("CREATE TABLE " + TABLE_BOOKMARKS + "(" + - Bookmarks._ID + " INTEGER PRIMARY KEY AUTOINCREMENT," + - Bookmarks.TITLE + " TEXT," + - Bookmarks.URL + " TEXT," + - Bookmarks.TYPE + " INTEGER NOT NULL DEFAULT " + Bookmarks.TYPE_BOOKMARK + "," + - Bookmarks.PARENT + " INTEGER," + - Bookmarks.POSITION + " INTEGER NOT NULL," + - Bookmarks.KEYWORD + " TEXT," + - Bookmarks.DESCRIPTION + " TEXT," + - Bookmarks.TAGS + " TEXT," + - Bookmarks.FAVICON_ID + " INTEGER," + - Bookmarks.DATE_CREATED + " INTEGER," + - Bookmarks.DATE_MODIFIED + " INTEGER," + - Bookmarks.GUID + " TEXT NOT NULL," + - Bookmarks.IS_DELETED + " INTEGER NOT NULL DEFAULT 0" + - (foreignKeyOnParent != null ? foreignKeyOnParent : "") + - ");"); - - db.execSQL("CREATE INDEX bookmarks_url_index ON " + TABLE_BOOKMARKS + "(" - + Bookmarks.URL + ")"); - db.execSQL("CREATE INDEX bookmarks_type_deleted_index ON " + TABLE_BOOKMARKS + "(" - + Bookmarks.TYPE + ", " + Bookmarks.IS_DELETED + ")"); - db.execSQL("CREATE UNIQUE INDEX bookmarks_guid_index ON " + TABLE_BOOKMARKS + "(" - + Bookmarks.GUID + ")"); - db.execSQL("CREATE INDEX bookmarks_modified_index ON " + TABLE_BOOKMARKS + "(" - + Bookmarks.DATE_MODIFIED + ")"); - } - - private void createHistoryTable(SQLiteDatabase db) { - debug("Creating " + TABLE_HISTORY + " table"); - db.execSQL("CREATE TABLE " + TABLE_HISTORY + "(" + - History._ID + " INTEGER PRIMARY KEY AUTOINCREMENT," + - History.TITLE + " TEXT," + - History.URL + " TEXT NOT NULL," + - History.VISITS + " INTEGER NOT NULL DEFAULT 0," + - History.DATE_LAST_VISITED + " INTEGER," + - History.DATE_CREATED + " INTEGER," + - History.DATE_MODIFIED + " INTEGER," + - History.GUID + " TEXT NOT NULL," + - History.IS_DELETED + " INTEGER NOT NULL DEFAULT 0" + - ");"); - - db.execSQL("CREATE INDEX history_url_index ON " + TABLE_HISTORY + "(" - + History.URL + ")"); - db.execSQL("CREATE UNIQUE INDEX history_guid_index ON " + TABLE_HISTORY + "(" - + History.GUID + ")"); - db.execSQL("CREATE INDEX history_modified_index ON " + TABLE_HISTORY + "(" - + History.DATE_MODIFIED + ")"); - db.execSQL("CREATE INDEX history_visited_index ON " + TABLE_HISTORY + "(" - + History.DATE_LAST_VISITED + ")"); - } - - private void createHistoryTableOn13(SQLiteDatabase db) { - debug("Creating " + TABLE_HISTORY + " table"); - db.execSQL("CREATE TABLE " + TABLE_HISTORY + "(" + - History._ID + " INTEGER PRIMARY KEY AUTOINCREMENT," + - History.TITLE + " TEXT," + - History.URL + " TEXT NOT NULL," + - History.VISITS + " INTEGER NOT NULL DEFAULT 0," + - History.FAVICON_ID + " INTEGER," + - History.DATE_LAST_VISITED + " INTEGER," + - History.DATE_CREATED + " INTEGER," + - History.DATE_MODIFIED + " INTEGER," + - History.GUID + " TEXT NOT NULL," + - History.IS_DELETED + " INTEGER NOT NULL DEFAULT 0" + - ");"); - - db.execSQL("CREATE INDEX history_url_index ON " + TABLE_HISTORY + "(" - + History.URL + ")"); - db.execSQL("CREATE UNIQUE INDEX history_guid_index ON " + TABLE_HISTORY + "(" - + History.GUID + ")"); - db.execSQL("CREATE INDEX history_modified_index ON " + TABLE_HISTORY + "(" - + History.DATE_MODIFIED + ")"); - db.execSQL("CREATE INDEX history_visited_index ON " + TABLE_HISTORY + "(" - + History.DATE_LAST_VISITED + ")"); - } - - private void createImagesTable(SQLiteDatabase db) { - debug("Creating " + Obsolete.TABLE_IMAGES + " table"); - db.execSQL("CREATE TABLE " + Obsolete.TABLE_IMAGES + " (" + - Obsolete.Images._ID + " INTEGER PRIMARY KEY AUTOINCREMENT," + - Obsolete.Images.URL + " TEXT UNIQUE NOT NULL," + - Obsolete.Images.FAVICON + " BLOB," + - Obsolete.Images.FAVICON_URL + " TEXT," + - Obsolete.Images.THUMBNAIL + " BLOB," + - Obsolete.Images.DATE_CREATED + " INTEGER," + - Obsolete.Images.DATE_MODIFIED + " INTEGER," + - Obsolete.Images.GUID + " TEXT NOT NULL," + - Obsolete.Images.IS_DELETED + " INTEGER NOT NULL DEFAULT 0" + - ");"); - - db.execSQL("CREATE INDEX images_url_index ON " + Obsolete.TABLE_IMAGES + "(" - + Obsolete.Images.URL + ")"); - db.execSQL("CREATE UNIQUE INDEX images_guid_index ON " + Obsolete.TABLE_IMAGES + "(" - + Obsolete.Images.GUID + ")"); - db.execSQL("CREATE INDEX images_modified_index ON " + Obsolete.TABLE_IMAGES + "(" - + Obsolete.Images.DATE_MODIFIED + ")"); - } - - private void createFaviconsTable(SQLiteDatabase db) { - debug("Creating " + TABLE_FAVICONS + " table"); - db.execSQL("CREATE TABLE " + TABLE_FAVICONS + " (" + - Favicons._ID + " INTEGER PRIMARY KEY AUTOINCREMENT," + - Favicons.URL + " TEXT UNIQUE," + - Favicons.DATA + " BLOB," + - Favicons.DATE_CREATED + " INTEGER," + - Favicons.DATE_MODIFIED + " INTEGER" + - ");"); - - db.execSQL("CREATE INDEX favicons_url_index ON " + TABLE_FAVICONS + "(" - + Favicons.URL + ")"); - db.execSQL("CREATE INDEX favicons_modified_index ON " + TABLE_FAVICONS + "(" - + Favicons.DATE_MODIFIED + ")"); - } - - private void createThumbnailsTable(SQLiteDatabase db) { - debug("Creating " + TABLE_THUMBNAILS + " table"); - db.execSQL("CREATE TABLE " + TABLE_THUMBNAILS + " (" + - Thumbnails._ID + " INTEGER PRIMARY KEY AUTOINCREMENT," + - Thumbnails.URL + " TEXT UNIQUE," + - Thumbnails.DATA + " BLOB" + - ");"); - - db.execSQL("CREATE INDEX thumbnails_url_index ON " + TABLE_THUMBNAILS + "(" - + Thumbnails.URL + ")"); - } - - private void createBookmarksWithImagesView(SQLiteDatabase db) { - debug("Creating " + Obsolete.VIEW_BOOKMARKS_WITH_IMAGES + " view"); - - db.execSQL("CREATE VIEW IF NOT EXISTS " + Obsolete.VIEW_BOOKMARKS_WITH_IMAGES + " AS " + - "SELECT " + qualifyColumn(TABLE_BOOKMARKS, "*") + - ", " + Obsolete.Images.FAVICON + ", " + Obsolete.Images.THUMBNAIL + " FROM " + - Obsolete.TABLE_BOOKMARKS_JOIN_IMAGES); - } - - private void createBookmarksWithFaviconsView(SQLiteDatabase db) { - debug("Creating " + VIEW_BOOKMARKS_WITH_FAVICONS + " view"); - - db.execSQL("CREATE VIEW IF NOT EXISTS " + VIEW_BOOKMARKS_WITH_FAVICONS + " AS " + - "SELECT " + qualifyColumn(TABLE_BOOKMARKS, "*") + - ", " + qualifyColumn(TABLE_FAVICONS, Favicons.DATA) + " AS " + Bookmarks.FAVICON + - ", " + qualifyColumn(TABLE_FAVICONS, Favicons.URL) + " AS " + Bookmarks.FAVICON_URL + - " FROM " + TABLE_BOOKMARKS_JOIN_FAVICONS); - } - - private void createHistoryWithImagesView(SQLiteDatabase db) { - debug("Creating " + Obsolete.VIEW_HISTORY_WITH_IMAGES + " view"); - - db.execSQL("CREATE VIEW IF NOT EXISTS " + Obsolete.VIEW_HISTORY_WITH_IMAGES + " AS " + - "SELECT " + qualifyColumn(TABLE_HISTORY, "*") + - ", " + Obsolete.Images.FAVICON + ", " + Obsolete.Images.THUMBNAIL + " FROM " + - Obsolete.TABLE_HISTORY_JOIN_IMAGES); - } - - private void createHistoryWithFaviconsView(SQLiteDatabase db) { - debug("Creating " + VIEW_HISTORY_WITH_FAVICONS + " view"); - - db.execSQL("CREATE VIEW IF NOT EXISTS " + VIEW_HISTORY_WITH_FAVICONS + " AS " + - "SELECT " + qualifyColumn(TABLE_HISTORY, "*") + - ", " + qualifyColumn(TABLE_FAVICONS, Favicons.DATA) + " AS " + History.FAVICON + - ", " + qualifyColumn(TABLE_FAVICONS, Favicons.URL) + " AS " + History.FAVICON_URL + - " FROM " + TABLE_HISTORY_JOIN_FAVICONS); - } - - private void createCombinedWithImagesView(SQLiteDatabase db) { - debug("Creating " + Obsolete.VIEW_COMBINED_WITH_IMAGES + " view"); - - db.execSQL("CREATE VIEW IF NOT EXISTS " + Obsolete.VIEW_COMBINED_WITH_IMAGES + " AS" + - " SELECT " + Combined.BOOKMARK_ID + ", " + - Combined.HISTORY_ID + ", " + - // We need to return an _id column because CursorAdapter requires it for its - // default implementation for the getItemId() method. However, since - // we're not using this feature in the parts of the UI using this view, - // we can just use 0 for all rows. - "0 AS " + Combined._ID + ", " + - Combined.URL + ", " + - Combined.TITLE + ", " + - Combined.VISITS + ", " + - Combined.DATE_LAST_VISITED + ", " + - qualifyColumn(Obsolete.TABLE_IMAGES, Obsolete.Images.FAVICON) + " AS " + Combined.FAVICON + ", " + - qualifyColumn(Obsolete.TABLE_IMAGES, Obsolete.Images.THUMBNAIL) + " AS " + Obsolete.Combined.THUMBNAIL + - " FROM (" + - // Bookmarks without history. - " SELECT " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks._ID) + " AS " + Combined.BOOKMARK_ID + ", " + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks.URL) + " AS " + Combined.URL + ", " + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TITLE) + " AS " + Combined.TITLE + ", " + - "-1 AS " + Combined.HISTORY_ID + ", " + - "-1 AS " + Combined.VISITS + ", " + - "-1 AS " + Combined.DATE_LAST_VISITED + - " FROM " + TABLE_BOOKMARKS + - " WHERE " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TYPE) + " = " + Bookmarks.TYPE_BOOKMARK + " AND " + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks.IS_DELETED) + " = 0 AND " + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks.URL) + - " NOT IN (SELECT " + History.URL + " FROM " + TABLE_HISTORY + ")" + - " UNION ALL" + - // History with and without bookmark. - " SELECT " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks._ID) + " AS " + Combined.BOOKMARK_ID + ", " + - qualifyColumn(TABLE_HISTORY, History.URL) + " AS " + Combined.URL + ", " + - // Prioritze bookmark titles over history titles, since the user may have - // customized the title for a bookmark. - "COALESCE(" + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TITLE) + ", " + - qualifyColumn(TABLE_HISTORY, History.TITLE) +")" + " AS " + Combined.TITLE + ", " + - qualifyColumn(TABLE_HISTORY, History._ID) + " AS " + Combined.HISTORY_ID + ", " + - qualifyColumn(TABLE_HISTORY, History.VISITS) + " AS " + Combined.VISITS + ", " + - qualifyColumn(TABLE_HISTORY, History.DATE_LAST_VISITED) + " AS " + Combined.DATE_LAST_VISITED + - " FROM " + TABLE_HISTORY + " LEFT OUTER JOIN " + TABLE_BOOKMARKS + - " ON " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.URL) + " = " + qualifyColumn(TABLE_HISTORY, History.URL) + - " WHERE " + qualifyColumn(TABLE_HISTORY, History.URL) + " IS NOT NULL AND " + - qualifyColumn(TABLE_HISTORY, History.IS_DELETED) + " = 0 AND (" + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TYPE) + " IS NULL OR " + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TYPE) + " = " + Bookmarks.TYPE_BOOKMARK + ")" + - ") LEFT OUTER JOIN " + Obsolete.TABLE_IMAGES + - " ON " + Combined.URL + " = " + qualifyColumn(Obsolete.TABLE_IMAGES, Obsolete.Images.URL)); - } - - private void createCombinedWithImagesViewOn9(SQLiteDatabase db) { - debug("Creating " + Obsolete.VIEW_COMBINED_WITH_IMAGES + " view"); - - db.execSQL("CREATE VIEW IF NOT EXISTS " + Obsolete.VIEW_COMBINED_WITH_IMAGES + " AS" + - " SELECT " + Combined.BOOKMARK_ID + ", " + - Combined.HISTORY_ID + ", " + - // We need to return an _id column because CursorAdapter requires it for its - // default implementation for the getItemId() method. However, since - // we're not using this feature in the parts of the UI using this view, - // we can just use 0 for all rows. - "0 AS " + Combined._ID + ", " + - Combined.URL + ", " + - Combined.TITLE + ", " + - Combined.VISITS + ", " + - Combined.DISPLAY + ", " + - Combined.DATE_LAST_VISITED + ", " + - qualifyColumn(Obsolete.TABLE_IMAGES, Obsolete.Images.FAVICON) + " AS " + Combined.FAVICON + ", " + - qualifyColumn(Obsolete.TABLE_IMAGES, Obsolete.Images.THUMBNAIL) + " AS " + Obsolete.Combined.THUMBNAIL + - " FROM (" + - // Bookmarks without history. - " SELECT " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks._ID) + " AS " + Combined.BOOKMARK_ID + ", " + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks.URL) + " AS " + Combined.URL + ", " + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TITLE) + " AS " + Combined.TITLE + ", " + - "CASE " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.PARENT) + " WHEN " + - Bookmarks.FIXED_READING_LIST_ID + " THEN " + Combined.DISPLAY_READER + " ELSE " + - Combined.DISPLAY_NORMAL + " END AS " + Combined.DISPLAY + ", " + - "-1 AS " + Combined.HISTORY_ID + ", " + - "-1 AS " + Combined.VISITS + ", " + - "-1 AS " + Combined.DATE_LAST_VISITED + - " FROM " + TABLE_BOOKMARKS + - " WHERE " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TYPE) + " = " + Bookmarks.TYPE_BOOKMARK + " AND " + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks.IS_DELETED) + " = 0 AND " + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks.URL) + - " NOT IN (SELECT " + History.URL + " FROM " + TABLE_HISTORY + ")" + - " UNION ALL" + - // History with and without bookmark. - " SELECT " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks._ID) + " AS " + Combined.BOOKMARK_ID + ", " + - qualifyColumn(TABLE_HISTORY, History.URL) + " AS " + Combined.URL + ", " + - // Prioritze bookmark titles over history titles, since the user may have - // customized the title for a bookmark. - "COALESCE(" + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TITLE) + ", " + - qualifyColumn(TABLE_HISTORY, History.TITLE) +")" + " AS " + Combined.TITLE + ", " + - "CASE " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.PARENT) + " WHEN " + - Bookmarks.FIXED_READING_LIST_ID + " THEN " + Combined.DISPLAY_READER + " ELSE " + - Combined.DISPLAY_NORMAL + " END AS " + Combined.DISPLAY + ", " + - qualifyColumn(TABLE_HISTORY, History._ID) + " AS " + Combined.HISTORY_ID + ", " + - qualifyColumn(TABLE_HISTORY, History.VISITS) + " AS " + Combined.VISITS + ", " + - qualifyColumn(TABLE_HISTORY, History.DATE_LAST_VISITED) + " AS " + Combined.DATE_LAST_VISITED + - " FROM " + TABLE_HISTORY + " LEFT OUTER JOIN " + TABLE_BOOKMARKS + - " ON " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.URL) + " = " + qualifyColumn(TABLE_HISTORY, History.URL) + - " WHERE " + qualifyColumn(TABLE_HISTORY, History.URL) + " IS NOT NULL AND " + - qualifyColumn(TABLE_HISTORY, History.IS_DELETED) + " = 0 AND (" + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TYPE) + " IS NULL OR " + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TYPE) + " = " + Bookmarks.TYPE_BOOKMARK + ")" + - ") LEFT OUTER JOIN " + Obsolete.TABLE_IMAGES + - " ON " + Combined.URL + " = " + qualifyColumn(Obsolete.TABLE_IMAGES, Obsolete.Images.URL)); - } - - private void createCombinedWithImagesViewOn10(SQLiteDatabase db) { - debug("Creating " + Obsolete.VIEW_COMBINED_WITH_IMAGES + " view"); - - db.execSQL("CREATE VIEW IF NOT EXISTS " + Obsolete.VIEW_COMBINED_WITH_IMAGES + " AS" + - " SELECT " + Combined.BOOKMARK_ID + ", " + - Combined.HISTORY_ID + ", " + - // We need to return an _id column because CursorAdapter requires it for its - // default implementation for the getItemId() method. However, since - // we're not using this feature in the parts of the UI using this view, - // we can just use 0 for all rows. - "0 AS " + Combined._ID + ", " + - Combined.URL + ", " + - Combined.TITLE + ", " + - Combined.VISITS + ", " + - Combined.DISPLAY + ", " + - Combined.DATE_LAST_VISITED + ", " + - qualifyColumn(Obsolete.TABLE_IMAGES, Obsolete.Images.FAVICON) + " AS " + Combined.FAVICON + ", " + - qualifyColumn(Obsolete.TABLE_IMAGES, Obsolete.Images.THUMBNAIL) + " AS " + Obsolete.Combined.THUMBNAIL + - " FROM (" + - // Bookmarks without history. - " SELECT " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks._ID) + " AS " + Combined.BOOKMARK_ID + ", " + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks.URL) + " AS " + Combined.URL + ", " + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TITLE) + " AS " + Combined.TITLE + ", " + - "CASE " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.PARENT) + " WHEN " + - Bookmarks.FIXED_READING_LIST_ID + " THEN " + Combined.DISPLAY_READER + " ELSE " + - Combined.DISPLAY_NORMAL + " END AS " + Combined.DISPLAY + ", " + - "-1 AS " + Combined.HISTORY_ID + ", " + - "-1 AS " + Combined.VISITS + ", " + - "-1 AS " + Combined.DATE_LAST_VISITED + - " FROM " + TABLE_BOOKMARKS + - " WHERE " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TYPE) + " = " + Bookmarks.TYPE_BOOKMARK + " AND " + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks.IS_DELETED) + " = 0 AND " + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks.URL) + - " NOT IN (SELECT " + History.URL + " FROM " + TABLE_HISTORY + ")" + - " UNION ALL" + - // History with and without bookmark. - " SELECT " + "CASE " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.IS_DELETED) + " WHEN 0 THEN " + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks._ID) + " ELSE NULL END AS " + Combined.BOOKMARK_ID + ", " + - qualifyColumn(TABLE_HISTORY, History.URL) + " AS " + Combined.URL + ", " + - // Prioritze bookmark titles over history titles, since the user may have - // customized the title for a bookmark. - "COALESCE(" + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TITLE) + ", " + - qualifyColumn(TABLE_HISTORY, History.TITLE) +")" + " AS " + Combined.TITLE + ", " + - "CASE " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.PARENT) + " WHEN " + - Bookmarks.FIXED_READING_LIST_ID + " THEN " + Combined.DISPLAY_READER + " ELSE " + - Combined.DISPLAY_NORMAL + " END AS " + Combined.DISPLAY + ", " + - qualifyColumn(TABLE_HISTORY, History._ID) + " AS " + Combined.HISTORY_ID + ", " + - qualifyColumn(TABLE_HISTORY, History.VISITS) + " AS " + Combined.VISITS + ", " + - qualifyColumn(TABLE_HISTORY, History.DATE_LAST_VISITED) + " AS " + Combined.DATE_LAST_VISITED + - " FROM " + TABLE_HISTORY + " LEFT OUTER JOIN " + TABLE_BOOKMARKS + - " ON " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.URL) + " = " + qualifyColumn(TABLE_HISTORY, History.URL) + - " WHERE " + qualifyColumn(TABLE_HISTORY, History.URL) + " IS NOT NULL AND " + - qualifyColumn(TABLE_HISTORY, History.IS_DELETED) + " = 0 AND (" + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TYPE) + " IS NULL OR " + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TYPE) + " = " + Bookmarks.TYPE_BOOKMARK + ")" + - ") LEFT OUTER JOIN " + Obsolete.TABLE_IMAGES + - " ON " + Combined.URL + " = " + qualifyColumn(Obsolete.TABLE_IMAGES, Obsolete.Images.URL)); - } - - private void createCombinedWithImagesViewOn11(SQLiteDatabase db) { - debug("Creating " + Obsolete.VIEW_COMBINED_WITH_IMAGES + " view"); - - db.execSQL("CREATE VIEW IF NOT EXISTS " + Obsolete.VIEW_COMBINED_WITH_IMAGES + " AS" + - " SELECT " + Combined.BOOKMARK_ID + ", " + - Combined.HISTORY_ID + ", " + - // We need to return an _id column because CursorAdapter requires it for its - // default implementation for the getItemId() method. However, since - // we're not using this feature in the parts of the UI using this view, - // we can just use 0 for all rows. - "0 AS " + Combined._ID + ", " + - Combined.URL + ", " + - Combined.TITLE + ", " + - Combined.VISITS + ", " + - Combined.DISPLAY + ", " + - Combined.DATE_LAST_VISITED + ", " + - qualifyColumn(Obsolete.TABLE_IMAGES, Obsolete.Images.FAVICON) + " AS " + Combined.FAVICON + ", " + - qualifyColumn(Obsolete.TABLE_IMAGES, Obsolete.Images.THUMBNAIL) + " AS " + Obsolete.Combined.THUMBNAIL + - " FROM (" + - // Bookmarks without history. - " SELECT " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks._ID) + " AS " + Combined.BOOKMARK_ID + ", " + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks.URL) + " AS " + Combined.URL + ", " + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TITLE) + " AS " + Combined.TITLE + ", " + - "CASE " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.PARENT) + " WHEN " + - Bookmarks.FIXED_READING_LIST_ID + " THEN " + Combined.DISPLAY_READER + " ELSE " + - Combined.DISPLAY_NORMAL + " END AS " + Combined.DISPLAY + ", " + - "-1 AS " + Combined.HISTORY_ID + ", " + - "-1 AS " + Combined.VISITS + ", " + - "-1 AS " + Combined.DATE_LAST_VISITED + - " FROM " + TABLE_BOOKMARKS + - " WHERE " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TYPE) + " = " + Bookmarks.TYPE_BOOKMARK + " AND " + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks.IS_DELETED) + " = 0 AND " + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks.URL) + - " NOT IN (SELECT " + History.URL + " FROM " + TABLE_HISTORY + ")" + - " UNION ALL" + - // History with and without bookmark. - " SELECT " + "CASE " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.IS_DELETED) + " WHEN 0 THEN " + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks._ID) + " ELSE NULL END AS " + Combined.BOOKMARK_ID + ", " + - qualifyColumn(TABLE_HISTORY, History.URL) + " AS " + Combined.URL + ", " + - // Prioritze bookmark titles over history titles, since the user may have - // customized the title for a bookmark. - "COALESCE(" + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TITLE) + ", " + - qualifyColumn(TABLE_HISTORY, History.TITLE) +")" + " AS " + Combined.TITLE + ", " + - // Only use DISPLAY_READER if the matching bookmark entry inside reading - // list folder is not marked as deleted. - "CASE " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.IS_DELETED) + " WHEN 0 THEN CASE " + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks.PARENT) + " WHEN " + Bookmarks.FIXED_READING_LIST_ID + - " THEN " + Combined.DISPLAY_READER + " ELSE " + Combined.DISPLAY_NORMAL + " END ELSE " + - Combined.DISPLAY_NORMAL + " END AS " + Combined.DISPLAY + ", " + - qualifyColumn(TABLE_HISTORY, History._ID) + " AS " + Combined.HISTORY_ID + ", " + - qualifyColumn(TABLE_HISTORY, History.VISITS) + " AS " + Combined.VISITS + ", " + - qualifyColumn(TABLE_HISTORY, History.DATE_LAST_VISITED) + " AS " + Combined.DATE_LAST_VISITED + - " FROM " + TABLE_HISTORY + " LEFT OUTER JOIN " + TABLE_BOOKMARKS + - " ON " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.URL) + " = " + qualifyColumn(TABLE_HISTORY, History.URL) + - " WHERE " + qualifyColumn(TABLE_HISTORY, History.URL) + " IS NOT NULL AND " + - qualifyColumn(TABLE_HISTORY, History.IS_DELETED) + " = 0 AND (" + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TYPE) + " IS NULL OR " + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TYPE) + " = " + Bookmarks.TYPE_BOOKMARK + ") " + - ") LEFT OUTER JOIN " + Obsolete.TABLE_IMAGES + - " ON " + Combined.URL + " = " + qualifyColumn(Obsolete.TABLE_IMAGES, Obsolete.Images.URL)); - } - - private void createCombinedViewOn12(SQLiteDatabase db) { - debug("Creating " + VIEW_COMBINED + " view"); - - db.execSQL("CREATE VIEW IF NOT EXISTS " + VIEW_COMBINED + " AS" + - " SELECT " + Combined.BOOKMARK_ID + ", " + - Combined.HISTORY_ID + ", " + - // We need to return an _id column because CursorAdapter requires it for its - // default implementation for the getItemId() method. However, since - // we're not using this feature in the parts of the UI using this view, - // we can just use 0 for all rows. - "0 AS " + Combined._ID + ", " + - Combined.URL + ", " + - Combined.TITLE + ", " + - Combined.VISITS + ", " + - Combined.DISPLAY + ", " + - Combined.DATE_LAST_VISITED + - " FROM (" + - // Bookmarks without history. - " SELECT " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks._ID) + " AS " + Combined.BOOKMARK_ID + ", " + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks.URL) + " AS " + Combined.URL + ", " + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TITLE) + " AS " + Combined.TITLE + ", " + - "CASE " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.PARENT) + " WHEN " + - Bookmarks.FIXED_READING_LIST_ID + " THEN " + Combined.DISPLAY_READER + " ELSE " + - Combined.DISPLAY_NORMAL + " END AS " + Combined.DISPLAY + ", " + - "-1 AS " + Combined.HISTORY_ID + ", " + - "-1 AS " + Combined.VISITS + ", " + - "-1 AS " + Combined.DATE_LAST_VISITED + - " FROM " + TABLE_BOOKMARKS + - " WHERE " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TYPE) + " = " + Bookmarks.TYPE_BOOKMARK + " AND " + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks.IS_DELETED) + " = 0 AND " + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks.URL) + - " NOT IN (SELECT " + History.URL + " FROM " + TABLE_HISTORY + ")" + - " UNION ALL" + - // History with and without bookmark. - " SELECT " + "CASE " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.IS_DELETED) + " WHEN 0 THEN " + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks._ID) + " ELSE NULL END AS " + Combined.BOOKMARK_ID + ", " + - qualifyColumn(TABLE_HISTORY, History.URL) + " AS " + Combined.URL + ", " + - // Prioritze bookmark titles over history titles, since the user may have - // customized the title for a bookmark. - "COALESCE(" + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TITLE) + ", " + - qualifyColumn(TABLE_HISTORY, History.TITLE) +")" + " AS " + Combined.TITLE + ", " + - // Only use DISPLAY_READER if the matching bookmark entry inside reading - // list folder is not marked as deleted. - "CASE " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.IS_DELETED) + " WHEN 0 THEN CASE " + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks.PARENT) + " WHEN " + Bookmarks.FIXED_READING_LIST_ID + - " THEN " + Combined.DISPLAY_READER + " ELSE " + Combined.DISPLAY_NORMAL + " END ELSE " + - Combined.DISPLAY_NORMAL + " END AS " + Combined.DISPLAY + ", " + - qualifyColumn(TABLE_HISTORY, History._ID) + " AS " + Combined.HISTORY_ID + ", " + - qualifyColumn(TABLE_HISTORY, History.VISITS) + " AS " + Combined.VISITS + ", " + - qualifyColumn(TABLE_HISTORY, History.DATE_LAST_VISITED) + " AS " + Combined.DATE_LAST_VISITED + - " FROM " + TABLE_HISTORY + " LEFT OUTER JOIN " + TABLE_BOOKMARKS + - " ON " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.URL) + " = " + qualifyColumn(TABLE_HISTORY, History.URL) + - " WHERE " + qualifyColumn(TABLE_HISTORY, History.URL) + " IS NOT NULL AND " + - qualifyColumn(TABLE_HISTORY, History.IS_DELETED) + " = 0 AND (" + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TYPE) + " IS NULL OR " + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TYPE) + " = " + Bookmarks.TYPE_BOOKMARK + ") " + - ")"); - - debug("Creating " + Obsolete.VIEW_COMBINED_WITH_IMAGES + " view"); - - db.execSQL("CREATE VIEW IF NOT EXISTS " + Obsolete.VIEW_COMBINED_WITH_IMAGES + " AS" + - " SELECT *, " + - qualifyColumn(Obsolete.TABLE_IMAGES, Obsolete.Images.FAVICON) + " AS " + Combined.FAVICON + ", " + - qualifyColumn(Obsolete.TABLE_IMAGES, Obsolete.Images.THUMBNAIL) + " AS " + Obsolete.Combined.THUMBNAIL + - " FROM " + VIEW_COMBINED + " LEFT OUTER JOIN " + Obsolete.TABLE_IMAGES + - " ON " + Combined.URL + " = " + qualifyColumn(Obsolete.TABLE_IMAGES, Obsolete.Images.URL)); - } - - private void createCombinedViewOn13(SQLiteDatabase db) { - debug("Creating " + VIEW_COMBINED + " view"); - - db.execSQL("CREATE VIEW IF NOT EXISTS " + VIEW_COMBINED + " AS" + - " SELECT " + Combined.BOOKMARK_ID + ", " + - Combined.HISTORY_ID + ", " + - // We need to return an _id column because CursorAdapter requires it for its - // default implementation for the getItemId() method. However, since - // we're not using this feature in the parts of the UI using this view, - // we can just use 0 for all rows. - "0 AS " + Combined._ID + ", " + - Combined.URL + ", " + - Combined.TITLE + ", " + - Combined.VISITS + ", " + - Combined.DISPLAY + ", " + - Combined.DATE_LAST_VISITED + ", " + - Combined.FAVICON_ID + - " FROM (" + - // Bookmarks without history. - " SELECT " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks._ID) + " AS " + Combined.BOOKMARK_ID + ", " + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks.URL) + " AS " + Combined.URL + ", " + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TITLE) + " AS " + Combined.TITLE + ", " + - "CASE " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.PARENT) + " WHEN " + - Bookmarks.FIXED_READING_LIST_ID + " THEN " + Combined.DISPLAY_READER + " ELSE " + - Combined.DISPLAY_NORMAL + " END AS " + Combined.DISPLAY + ", " + - "-1 AS " + Combined.HISTORY_ID + ", " + - "-1 AS " + Combined.VISITS + ", " + - "-1 AS " + Combined.DATE_LAST_VISITED + ", " + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks.FAVICON_ID) + " AS " + Combined.FAVICON_ID + - " FROM " + TABLE_BOOKMARKS + - " WHERE " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TYPE) + " = " + Bookmarks.TYPE_BOOKMARK + " AND " + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks.IS_DELETED) + " = 0 AND " + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks.URL) + - " NOT IN (SELECT " + History.URL + " FROM " + TABLE_HISTORY + ")" + - " UNION ALL" + - // History with and without bookmark. - " SELECT " + "CASE " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.IS_DELETED) + " WHEN 0 THEN " + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks._ID) + " ELSE NULL END AS " + Combined.BOOKMARK_ID + ", " + - qualifyColumn(TABLE_HISTORY, History.URL) + " AS " + Combined.URL + ", " + - // Prioritize bookmark titles over history titles, since the user may have - // customized the title for a bookmark. - "COALESCE(" + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TITLE) + ", " + - qualifyColumn(TABLE_HISTORY, History.TITLE) +")" + " AS " + Combined.TITLE + ", " + - // Only use DISPLAY_READER if the matching bookmark entry inside reading - // list folder is not marked as deleted. - "CASE " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.IS_DELETED) + " WHEN 0 THEN CASE " + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks.PARENT) + " WHEN " + Bookmarks.FIXED_READING_LIST_ID + - " THEN " + Combined.DISPLAY_READER + " ELSE " + Combined.DISPLAY_NORMAL + " END ELSE " + - Combined.DISPLAY_NORMAL + " END AS " + Combined.DISPLAY + ", " + - qualifyColumn(TABLE_HISTORY, History._ID) + " AS " + Combined.HISTORY_ID + ", " + - qualifyColumn(TABLE_HISTORY, History.VISITS) + " AS " + Combined.VISITS + ", " + - qualifyColumn(TABLE_HISTORY, History.DATE_LAST_VISITED) + " AS " + Combined.DATE_LAST_VISITED + ", " + - qualifyColumn(TABLE_HISTORY, History.FAVICON_ID) + " AS " + Combined.FAVICON_ID + - " FROM " + TABLE_HISTORY + " LEFT OUTER JOIN " + TABLE_BOOKMARKS + - " ON " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.URL) + " = " + qualifyColumn(TABLE_HISTORY, History.URL) + - " WHERE " + qualifyColumn(TABLE_HISTORY, History.URL) + " IS NOT NULL AND " + - qualifyColumn(TABLE_HISTORY, History.IS_DELETED) + " = 0 AND (" + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TYPE) + " IS NULL OR " + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TYPE) + " = " + Bookmarks.TYPE_BOOKMARK + ") " + - ")"); - - debug("Creating " + VIEW_COMBINED_WITH_FAVICONS + " view"); - - db.execSQL("CREATE VIEW IF NOT EXISTS " + VIEW_COMBINED_WITH_FAVICONS + " AS" + - " SELECT " + qualifyColumn(VIEW_COMBINED, "*") + ", " + - qualifyColumn(TABLE_FAVICONS, Favicons.URL) + " AS " + Combined.FAVICON_URL + ", " + - qualifyColumn(TABLE_FAVICONS, Favicons.DATA) + " AS " + Combined.FAVICON + - " FROM " + VIEW_COMBINED + " LEFT OUTER JOIN " + TABLE_FAVICONS + - " ON " + Combined.FAVICON_ID + " = " + qualifyColumn(TABLE_FAVICONS, Favicons._ID)); - } - - private void createCombinedViewOn16(SQLiteDatabase db) { - debug("Creating " + VIEW_COMBINED + " view"); - - db.execSQL("CREATE VIEW IF NOT EXISTS " + VIEW_COMBINED + " AS" + - " SELECT " + Combined.BOOKMARK_ID + ", " + - Combined.HISTORY_ID + ", " + - // We need to return an _id column because CursorAdapter requires it for its - // default implementation for the getItemId() method. However, since - // we're not using this feature in the parts of the UI using this view, - // we can just use 0 for all rows. - "0 AS " + Combined._ID + ", " + - Combined.URL + ", " + - Combined.TITLE + ", " + - Combined.VISITS + ", " + - Combined.DISPLAY + ", " + - Combined.DATE_LAST_VISITED + ", " + - Combined.FAVICON_ID + - " FROM (" + - // Bookmarks without history. - " SELECT " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks._ID) + " AS " + Combined.BOOKMARK_ID + ", " + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks.URL) + " AS " + Combined.URL + ", " + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TITLE) + " AS " + Combined.TITLE + ", " + - "CASE " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.PARENT) + " WHEN " + - Bookmarks.FIXED_READING_LIST_ID + " THEN " + Combined.DISPLAY_READER + " ELSE " + - Combined.DISPLAY_NORMAL + " END AS " + Combined.DISPLAY + ", " + - "-1 AS " + Combined.HISTORY_ID + ", " + - "-1 AS " + Combined.VISITS + ", " + - "-1 AS " + Combined.DATE_LAST_VISITED + ", " + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks.FAVICON_ID) + " AS " + Combined.FAVICON_ID + - " FROM " + TABLE_BOOKMARKS + - " WHERE " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TYPE) + " = " + Bookmarks.TYPE_BOOKMARK + " AND " + - // Ignore pinned bookmarks. - qualifyColumn(TABLE_BOOKMARKS, Bookmarks.PARENT) + " <> " + Bookmarks.FIXED_PINNED_LIST_ID + " AND " + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks.IS_DELETED) + " = 0 AND " + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks.URL) + - " NOT IN (SELECT " + History.URL + " FROM " + TABLE_HISTORY + ")" + - " UNION ALL" + - // History with and without bookmark. - " SELECT " + "CASE " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.IS_DELETED) + " WHEN 0 THEN " + - // Give pinned bookmarks a NULL ID so that they're not treated as bookmarks. We can't - // completely ignore them here because they're joined with history entries we care about. - "CASE " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.PARENT) + " WHEN " + - Bookmarks.FIXED_PINNED_LIST_ID + " THEN NULL ELSE " + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks._ID) + " END " + - "ELSE NULL END AS " + Combined.BOOKMARK_ID + ", " + - qualifyColumn(TABLE_HISTORY, History.URL) + " AS " + Combined.URL + ", " + - // Prioritize bookmark titles over history titles, since the user may have - // customized the title for a bookmark. - "COALESCE(" + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TITLE) + ", " + - qualifyColumn(TABLE_HISTORY, History.TITLE) +")" + " AS " + Combined.TITLE + ", " + - // Only use DISPLAY_READER if the matching bookmark entry inside reading - // list folder is not marked as deleted. - "CASE " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.IS_DELETED) + " WHEN 0 THEN CASE " + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks.PARENT) + " WHEN " + Bookmarks.FIXED_READING_LIST_ID + - " THEN " + Combined.DISPLAY_READER + " ELSE " + Combined.DISPLAY_NORMAL + " END ELSE " + - Combined.DISPLAY_NORMAL + " END AS " + Combined.DISPLAY + ", " + - qualifyColumn(TABLE_HISTORY, History._ID) + " AS " + Combined.HISTORY_ID + ", " + - qualifyColumn(TABLE_HISTORY, History.VISITS) + " AS " + Combined.VISITS + ", " + - qualifyColumn(TABLE_HISTORY, History.DATE_LAST_VISITED) + " AS " + Combined.DATE_LAST_VISITED + ", " + - qualifyColumn(TABLE_HISTORY, History.FAVICON_ID) + " AS " + Combined.FAVICON_ID + - " FROM " + TABLE_HISTORY + " LEFT OUTER JOIN " + TABLE_BOOKMARKS + - " ON " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.URL) + " = " + qualifyColumn(TABLE_HISTORY, History.URL) + - " WHERE " + qualifyColumn(TABLE_HISTORY, History.URL) + " IS NOT NULL AND " + - qualifyColumn(TABLE_HISTORY, History.IS_DELETED) + " = 0 AND (" + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TYPE) + " IS NULL OR " + - qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TYPE) + " = " + Bookmarks.TYPE_BOOKMARK + ") " + - ")"); - - debug("Creating " + VIEW_COMBINED_WITH_FAVICONS + " view"); - - db.execSQL("CREATE VIEW IF NOT EXISTS " + VIEW_COMBINED_WITH_FAVICONS + " AS" + - " SELECT " + qualifyColumn(VIEW_COMBINED, "*") + ", " + - qualifyColumn(TABLE_FAVICONS, Favicons.URL) + " AS " + Combined.FAVICON_URL + ", " + - qualifyColumn(TABLE_FAVICONS, Favicons.DATA) + " AS " + Combined.FAVICON + - " FROM " + VIEW_COMBINED + " LEFT OUTER JOIN " + TABLE_FAVICONS + - " ON " + Combined.FAVICON_ID + " = " + qualifyColumn(TABLE_FAVICONS, Favicons._ID)); - } - - @Override - public void onCreate(SQLiteDatabase db) { - debug("Creating browser.db: " + db.getPath()); - - createBookmarksTableOn13(db); - createHistoryTableOn13(db); - createFaviconsTable(db); - createThumbnailsTable(db); - - createBookmarksWithFaviconsView(db); - createHistoryWithFaviconsView(db); - createCombinedViewOn16(db); - - createOrUpdateSpecialFolder(db, Bookmarks.PLACES_FOLDER_GUID, - R.string.bookmarks_folder_places, 0); - - createOrUpdateAllSpecialFolders(db); - - // Create distribution bookmarks before our own default bookmarks - int pos = createDistributionBookmarks(db); - createDefaultBookmarks(db, pos); - } - - private String getLocalizedProperty(JSONObject bookmark, String property, Locale locale) throws JSONException { - // Try the full locale - String fullLocale = property + "." + locale.toString(); - if (bookmark.has(fullLocale)) { - return bookmark.getString(fullLocale); - } - // Try without a variant - if (!TextUtils.isEmpty(locale.getVariant())) { - String noVariant = fullLocale.substring(0, fullLocale.lastIndexOf("_")); - if (bookmark.has(noVariant)) { - return bookmark.getString(noVariant); - } - } - // Try just the language - String lang = property + "." + locale.getLanguage(); - if (bookmark.has(lang)) { - return bookmark.getString(lang); - } - // Default to the non-localized property name - return bookmark.getString(property); - } - - // Returns the number of bookmarks inserted in the db - private int createDistributionBookmarks(SQLiteDatabase db) { - JSONArray bookmarks = Distribution.getBookmarks(mContext); - if (bookmarks == null) { - return 0; - } - - Locale locale = Locale.getDefault(); - int pos = 0; - Integer mobileFolderId = getMobileFolderId(db); - if (mobileFolderId == null) { - Log.e(LOGTAG, "Error creating distribution bookmarks: mobileFolderId is null"); - return 0; - } - - for (int i = 0; i < bookmarks.length(); i++) { - try { - final JSONObject bookmark = bookmarks.getJSONObject(i); - - String title = getLocalizedProperty(bookmark, "title", locale); - final String url = getLocalizedProperty(bookmark, "url", locale); - createBookmark(db, title, url, pos, mobileFolderId); - - if (bookmark.has("pinned")) { - try { - // Create a fake bookmark in the hidden pinned folder to pin bookmark - // to about:home top sites. Pass pos as the pinned position to pin - // sites in the order that bookmarks are specified in bookmarks.json. - if (bookmark.getBoolean("pinned")) { - createBookmark(db, title, url, pos, Bookmarks.FIXED_PINNED_LIST_ID); - } - } catch (JSONException e) { - Log.e(LOGTAG, "Error pinning bookmark to top sites", e); - } - } - - pos++; - - // return early if there is no icon for this bookmark - if (!bookmark.has("icon")) { - continue; - } - - // create icons in a separate thread to avoid blocking about:home on startup - ThreadUtils.postToBackgroundThread(new Runnable() { - @Override - public void run() { - SQLiteDatabase db = getWritableDatabase(); - try { - String iconData = bookmark.getString("icon"); - Bitmap icon = BitmapUtils.getBitmapFromDataURI(iconData); - if (icon != null) { - createFavicon(db, url, icon); - } - } catch (JSONException e) { - Log.e(LOGTAG, "Error creating distribution bookmark icon", e); - } - } - }); - } catch (JSONException e) { - Log.e(LOGTAG, "Error creating distribution bookmark", e); - } - } - return pos; - } - - // Inserts default bookmarks, starting at a specified position - private void createDefaultBookmarks(SQLiteDatabase db, int pos) { - Class stringsClass = R.string.class; - Field[] fields = stringsClass.getFields(); - Pattern p = Pattern.compile("^bookmarkdefaults_title_"); - - Integer mobileFolderId = getMobileFolderId(db); - if (mobileFolderId == null) { - Log.e(LOGTAG, "Error creating default bookmarks: mobileFolderId is null"); - return; - } - - for (int i = 0; i < fields.length; i++) { - final String name = fields[i].getName(); - Matcher m = p.matcher(name); - if (!m.find()) { - continue; - } - try { - int titleid = fields[i].getInt(null); - String title = mContext.getString(titleid); - - Field urlField = stringsClass.getField(name.replace("_title_", "_url_")); - int urlId = urlField.getInt(null); - final String url = mContext.getString(urlId); - createBookmark(db, title, url, pos, mobileFolderId); - - // create icons in a separate thread to avoid blocking about:home on startup - ThreadUtils.postToBackgroundThread(new Runnable() { - @Override - public void run() { - SQLiteDatabase db = getWritableDatabase(); - Bitmap icon = getDefaultFaviconFromPath(name); - if (icon == null) { - icon = getDefaultFaviconFromDrawable(name); - } - if (icon != null) { - createFavicon(db, url, icon); - } - } - }); - pos++; - } catch (java.lang.IllegalAccessException ex) { - Log.e(LOGTAG, "Can't create bookmark " + name, ex); - } catch (java.lang.NoSuchFieldException ex) { - Log.e(LOGTAG, "Can't create bookmark " + name, ex); - } - } - } - - private void createBookmark(SQLiteDatabase db, String title, String url, int pos, int parent) { - ContentValues bookmarkValues = new ContentValues(); - bookmarkValues.put(Bookmarks.PARENT, parent); - - long now = System.currentTimeMillis(); - bookmarkValues.put(Bookmarks.DATE_CREATED, now); - bookmarkValues.put(Bookmarks.DATE_MODIFIED, now); - - bookmarkValues.put(Bookmarks.TITLE, title); - bookmarkValues.put(Bookmarks.URL, url); - bookmarkValues.put(Bookmarks.GUID, Utils.generateGuid()); - bookmarkValues.put(Bookmarks.POSITION, pos); - db.insertOrThrow(TABLE_BOOKMARKS, Bookmarks.TITLE, bookmarkValues); - } - - private void createFavicon(SQLiteDatabase db, String url, Bitmap icon) { - ByteArrayOutputStream stream = new ByteArrayOutputStream(); - - ContentValues iconValues = new ContentValues(); - iconValues.put(Favicons.PAGE_URL, url); - - byte[] data = null; - if (icon.compress(Bitmap.CompressFormat.PNG, 100, stream)) { - data = stream.toByteArray(); - } else { - Log.w(LOGTAG, "Favicon compression failed."); - } - iconValues.put(Favicons.DATA, data); - - insertFavicon(db, iconValues); - } - - private Bitmap getDefaultFaviconFromPath(String name) { - Class stringClass = R.string.class; - try { - // Look for a drawable with the id R.drawable.bookmarkdefaults_favicon_* - Field faviconField = stringClass.getField(name.replace("_title_", "_favicon_")); - if (faviconField == null) { - return null; - } - int faviconId = faviconField.getInt(null); - String path = mContext.getString(faviconId); - - String apkPath = mContext.getPackageResourcePath(); - File apkFile = new File(apkPath); - String bitmapPath = "jar:jar:" + apkFile.toURI() + "!/" + AppConstants.OMNIJAR_NAME + "!/" + path; - return GeckoJarReader.getBitmap(mContext.getResources(), bitmapPath); - } catch (java.lang.IllegalAccessException ex) { - Log.e(LOGTAG, "[Path] Can't create favicon " + name, ex); - } catch (java.lang.NoSuchFieldException ex) { - // If the field does not exist, that means we intend to load via a drawable - } - return null; - } - - private Bitmap getDefaultFaviconFromDrawable(String name) { - Class drawablesClass = R.drawable.class; - try { - // Look for a drawable with the id R.drawable.bookmarkdefaults_favicon_* - Field faviconField = drawablesClass.getField(name.replace("_title_", "_favicon_")); - if (faviconField == null) { - return null; - } - int faviconId = faviconField.getInt(null); - return BitmapUtils.decodeResource(mContext, faviconId); - } catch (java.lang.IllegalAccessException ex) { - Log.e(LOGTAG, "[Drawable] Can't create favicon " + name, ex); - } catch (java.lang.NoSuchFieldException ex) { - // If the field does not exist, that means we intend to load via a file path - } - return null; - } - - private void createOrUpdateAllSpecialFolders(SQLiteDatabase db) { - createOrUpdateSpecialFolder(db, Bookmarks.MOBILE_FOLDER_GUID, - R.string.bookmarks_folder_mobile, 0); - createOrUpdateSpecialFolder(db, Bookmarks.TOOLBAR_FOLDER_GUID, - R.string.bookmarks_folder_toolbar, 1); - createOrUpdateSpecialFolder(db, Bookmarks.MENU_FOLDER_GUID, - R.string.bookmarks_folder_menu, 2); - createOrUpdateSpecialFolder(db, Bookmarks.TAGS_FOLDER_GUID, - R.string.bookmarks_folder_tags, 3); - createOrUpdateSpecialFolder(db, Bookmarks.UNFILED_FOLDER_GUID, - R.string.bookmarks_folder_unfiled, 4); - createOrUpdateSpecialFolder(db, Bookmarks.READING_LIST_FOLDER_GUID, - R.string.bookmarks_folder_reading_list, 5); - createOrUpdateSpecialFolder(db, Bookmarks.PINNED_FOLDER_GUID, - R.string.bookmarks_folder_pinned, 6); - } - - private void createOrUpdateSpecialFolder(SQLiteDatabase db, - String guid, int titleId, int position) { - ContentValues values = new ContentValues(); - values.put(Bookmarks.GUID, guid); - values.put(Bookmarks.TYPE, Bookmarks.TYPE_FOLDER); - values.put(Bookmarks.POSITION, position); - - if (guid.equals(Bookmarks.PLACES_FOLDER_GUID)) - values.put(Bookmarks._ID, Bookmarks.FIXED_ROOT_ID); - else if (guid.equals(Bookmarks.READING_LIST_FOLDER_GUID)) - values.put(Bookmarks._ID, Bookmarks.FIXED_READING_LIST_ID); - else if (guid.equals(Bookmarks.PINNED_FOLDER_GUID)) - values.put(Bookmarks._ID, Bookmarks.FIXED_PINNED_LIST_ID); - - // Set the parent to 0, which sync assumes is the root - values.put(Bookmarks.PARENT, Bookmarks.FIXED_ROOT_ID); - - String title = mContext.getResources().getString(titleId); - values.put(Bookmarks.TITLE, title); - - long now = System.currentTimeMillis(); - values.put(Bookmarks.DATE_CREATED, now); - values.put(Bookmarks.DATE_MODIFIED, now); - - int updated = db.update(TABLE_BOOKMARKS, values, - Bookmarks.GUID + " = ?", - new String[] { guid }); - - if (updated == 0) { - db.insert(TABLE_BOOKMARKS, Bookmarks.GUID, values); - debug("Inserted special folder: " + guid); - } else { - debug("Updated special folder: " + guid); - } - } - - private boolean isSpecialFolder(ContentValues values) { - String guid = values.getAsString(Bookmarks.GUID); - if (guid == null) - return false; - - return guid.equals(Bookmarks.MOBILE_FOLDER_GUID) || - guid.equals(Bookmarks.MENU_FOLDER_GUID) || - guid.equals(Bookmarks.TOOLBAR_FOLDER_GUID) || - guid.equals(Bookmarks.UNFILED_FOLDER_GUID) || - guid.equals(Bookmarks.TAGS_FOLDER_GUID); - } - - private void migrateBookmarkFolder(SQLiteDatabase db, int folderId, - BookmarkMigrator migrator) { - Cursor c = null; - - debug("Migrating bookmark folder with id = " + folderId); - - String selection = Bookmarks.PARENT + " = " + folderId; - String[] selectionArgs = null; - - boolean isRootFolder = (folderId == Bookmarks.FIXED_ROOT_ID); - - // If we're loading the root folder, we have to account for - // any previously created special folder that was created without - // setting a parent id (e.g. mobile folder) and making sure we're - // not adding any infinite recursion as root's parent is root itself. - if (isRootFolder) { - selection = Bookmarks.GUID + " != ?" + " AND (" + - selection + " OR " + Bookmarks.PARENT + " = NULL)"; - selectionArgs = new String[] { Bookmarks.PLACES_FOLDER_GUID }; - } - - List subFolders = new ArrayList(); - List invalidSpecialEntries = new ArrayList(); - - try { - c = db.query(TABLE_BOOKMARKS_TMP, - null, - selection, - selectionArgs, - null, null, null); - - // The key point here is that bookmarks should be added in - // parent order to avoid any problems with the foreign key - // in Bookmarks.PARENT. - while (c.moveToNext()) { - ContentValues values = new ContentValues(); - - // We're using a null projection in the query which - // means we're getting all columns from the table. - // It's safe to simply transform the row into the - // values to be inserted on the new table. - DatabaseUtils.cursorRowToContentValues(c, values); - - boolean isSpecialFolder = isSpecialFolder(values); - - // The mobile folder used to be created with PARENT = NULL. - // We want fix that here. - if (values.getAsLong(Bookmarks.PARENT) == null && isSpecialFolder) - values.put(Bookmarks.PARENT, Bookmarks.FIXED_ROOT_ID); - - if (isRootFolder && !isSpecialFolder) { - invalidSpecialEntries.add(values); - continue; - } - - if (migrator != null) - migrator.updateForNewTable(values); - - debug("Migrating bookmark: " + values.getAsString(Bookmarks.TITLE)); - db.insert(TABLE_BOOKMARKS, Bookmarks.URL, values); - - Integer type = values.getAsInteger(Bookmarks.TYPE); - if (type != null && type == Bookmarks.TYPE_FOLDER) - subFolders.add(values.getAsInteger(Bookmarks._ID)); - } - } finally { - if (c != null) - c.close(); - } - - // At this point is safe to assume that the mobile folder is - // in the new table given that we've always created it on - // database creation time. - final int nInvalidSpecialEntries = invalidSpecialEntries.size(); - if (nInvalidSpecialEntries > 0) { - Integer mobileFolderId = getMobileFolderId(db); - if (mobileFolderId == null) { - Log.e(LOGTAG, "Error migrating invalid special folder entries: mobile folder id is null"); - return; - } - - debug("Found " + nInvalidSpecialEntries + " invalid special folder entries"); - for (int i = 0; i < nInvalidSpecialEntries; i++) { - ContentValues values = invalidSpecialEntries.get(i); - values.put(Bookmarks.PARENT, mobileFolderId); - - db.insert(TABLE_BOOKMARKS, Bookmarks.URL, values); - } - } - - final int nSubFolders = subFolders.size(); - for (int i = 0; i < nSubFolders; i++) { - int subFolderId = subFolders.get(i); - migrateBookmarkFolder(db, subFolderId, migrator); - } - } - - private void migrateBookmarksTable(SQLiteDatabase db) { - migrateBookmarksTable(db, null); - } - - private void migrateBookmarksTable(SQLiteDatabase db, BookmarkMigrator migrator) { - debug("Renaming bookmarks table to " + TABLE_BOOKMARKS_TMP); - db.execSQL("ALTER TABLE " + TABLE_BOOKMARKS + - " RENAME TO " + TABLE_BOOKMARKS_TMP); - - debug("Dropping views and indexes related to " + TABLE_BOOKMARKS); - db.execSQL("DROP VIEW IF EXISTS " + Obsolete.VIEW_BOOKMARKS_WITH_IMAGES); - - db.execSQL("DROP INDEX IF EXISTS bookmarks_url_index"); - db.execSQL("DROP INDEX IF EXISTS bookmarks_type_deleted_index"); - db.execSQL("DROP INDEX IF EXISTS bookmarks_guid_index"); - db.execSQL("DROP INDEX IF EXISTS bookmarks_modified_index"); - - createBookmarksTable(db); - createBookmarksWithImagesView(db); - - createOrUpdateSpecialFolder(db, Bookmarks.PLACES_FOLDER_GUID, - R.string.bookmarks_folder_places, 0); - - migrateBookmarkFolder(db, Bookmarks.FIXED_ROOT_ID, migrator); - - // Ensure all special folders exist and have the - // right folder hierarchy. - createOrUpdateAllSpecialFolders(db); - - debug("Dropping bookmarks temporary table"); - db.execSQL("DROP TABLE IF EXISTS " + TABLE_BOOKMARKS_TMP); - } - - - private void migrateHistoryTable(SQLiteDatabase db) { - debug("Renaming history table to " + TABLE_HISTORY_TMP); - db.execSQL("ALTER TABLE " + TABLE_HISTORY + - " RENAME TO " + TABLE_HISTORY_TMP); - - debug("Dropping views and indexes related to " + TABLE_HISTORY); - db.execSQL("DROP VIEW IF EXISTS " + Obsolete.VIEW_HISTORY_WITH_IMAGES); - db.execSQL("DROP VIEW IF EXISTS " + Obsolete.VIEW_COMBINED_WITH_IMAGES); - - db.execSQL("DROP INDEX IF EXISTS history_url_index"); - db.execSQL("DROP INDEX IF EXISTS history_guid_index"); - db.execSQL("DROP INDEX IF EXISTS history_modified_index"); - db.execSQL("DROP INDEX IF EXISTS history_visited_index"); - - createHistoryTable(db); - createHistoryWithImagesView(db); - createCombinedWithImagesView(db); - - db.execSQL("INSERT INTO " + TABLE_HISTORY + " SELECT * FROM " + TABLE_HISTORY_TMP); - - debug("Dropping history temporary table"); - db.execSQL("DROP TABLE IF EXISTS " + TABLE_HISTORY_TMP); - } - - private void migrateImagesTable(SQLiteDatabase db) { - debug("Renaming images table to " + TABLE_IMAGES_TMP); - db.execSQL("ALTER TABLE " + Obsolete.TABLE_IMAGES + - " RENAME TO " + TABLE_IMAGES_TMP); - - debug("Dropping views and indexes related to " + Obsolete.TABLE_IMAGES); - db.execSQL("DROP VIEW IF EXISTS " + Obsolete.VIEW_HISTORY_WITH_IMAGES); - db.execSQL("DROP VIEW IF EXISTS " + Obsolete.VIEW_COMBINED_WITH_IMAGES); - - db.execSQL("DROP INDEX IF EXISTS images_url_index"); - db.execSQL("DROP INDEX IF EXISTS images_guid_index"); - db.execSQL("DROP INDEX IF EXISTS images_modified_index"); - - createImagesTable(db); - createHistoryWithImagesView(db); - createCombinedWithImagesView(db); - - db.execSQL("INSERT INTO " + Obsolete.TABLE_IMAGES + " SELECT * FROM " + TABLE_IMAGES_TMP); - - debug("Dropping images temporary table"); - db.execSQL("DROP TABLE IF EXISTS " + TABLE_IMAGES_TMP); - } - - private void upgradeDatabaseFrom1to2(SQLiteDatabase db) { - migrateBookmarksTable(db); - } - - private void upgradeDatabaseFrom2to3(SQLiteDatabase db) { - debug("Dropping view: " + Obsolete.VIEW_BOOKMARKS_WITH_IMAGES); - db.execSQL("DROP VIEW IF EXISTS " + Obsolete.VIEW_BOOKMARKS_WITH_IMAGES); - - createBookmarksWithImagesView(db); - - debug("Dropping view: " + Obsolete.VIEW_HISTORY_WITH_IMAGES); - db.execSQL("DROP VIEW IF EXISTS " + Obsolete.VIEW_HISTORY_WITH_IMAGES); - - createHistoryWithImagesView(db); - } - - private void upgradeDatabaseFrom3to4(SQLiteDatabase db) { - migrateBookmarksTable(db, new BookmarkMigrator3to4()); - } - - private void upgradeDatabaseFrom4to5(SQLiteDatabase db) { - createCombinedWithImagesView(db); - } - - private void upgradeDatabaseFrom5to6(SQLiteDatabase db) { - debug("Dropping view: " + Obsolete.VIEW_COMBINED_WITH_IMAGES); - db.execSQL("DROP VIEW IF EXISTS " + Obsolete.VIEW_COMBINED_WITH_IMAGES); - - createCombinedWithImagesView(db); - } - - private void upgradeDatabaseFrom6to7(SQLiteDatabase db) { - debug("Removing history visits with NULL GUIDs"); - db.execSQL("DELETE FROM " + TABLE_HISTORY + " WHERE " + History.GUID + " IS NULL"); - - debug("Update images with NULL GUIDs"); - String[] columns = new String[] { Obsolete.Images._ID }; - Cursor cursor = null; - try { - cursor = db.query(Obsolete.TABLE_IMAGES, columns, Obsolete.Images.GUID + " IS NULL", null, null ,null, null, null); - ContentValues values = new ContentValues(); - if (cursor.moveToFirst()) { - do { - values.put(Obsolete.Images.GUID, Utils.generateGuid()); - db.update(Obsolete.TABLE_IMAGES, values, Obsolete.Images._ID + " = ?", new String[] { - cursor.getString(cursor.getColumnIndexOrThrow(Obsolete.Images._ID)) - }); - } while (cursor.moveToNext()); - } - } finally { - if (cursor != null) - cursor.close(); - } - - migrateBookmarksTable(db); - migrateHistoryTable(db); - migrateImagesTable(db); - } - - private void upgradeDatabaseFrom7to8(SQLiteDatabase db) { - debug("Combining history entries with the same URL"); - - final String TABLE_DUPES = "duped_urls"; - final String TOTAL = "total"; - final String LATEST = "latest"; - final String WINNER = "winner"; - - db.execSQL("CREATE TEMP TABLE " + TABLE_DUPES + " AS" + - " SELECT " + History.URL + ", " + - "SUM(" + History.VISITS + ") AS " + TOTAL + ", " + - "MAX(" + History.DATE_MODIFIED + ") AS " + LATEST + ", " + - "MAX(" + History._ID + ") AS " + WINNER + - " FROM " + TABLE_HISTORY + - " GROUP BY " + History.URL + - " HAVING count(" + History.URL + ") > 1"); - - db.execSQL("CREATE UNIQUE INDEX " + TABLE_DUPES + "_url_index ON " + - TABLE_DUPES + " (" + History.URL + ")"); - - final String fromClause = " FROM " + TABLE_DUPES + " WHERE " + - qualifyColumn(TABLE_DUPES, History.URL) + " = " + - qualifyColumn(TABLE_HISTORY, History.URL); - - db.execSQL("UPDATE " + TABLE_HISTORY + - " SET " + History.VISITS + " = (SELECT " + TOTAL + fromClause + "), " + - History.DATE_MODIFIED + " = (SELECT " + LATEST + fromClause + "), " + - History.IS_DELETED + " = " + - "(" + History._ID + " <> (SELECT " + WINNER + fromClause + "))" + - " WHERE " + History.URL + " IN (SELECT " + History.URL + " FROM " + TABLE_DUPES + ")"); - - db.execSQL("DROP TABLE " + TABLE_DUPES); - } - - private void upgradeDatabaseFrom8to9(SQLiteDatabase db) { - createOrUpdateSpecialFolder(db, Bookmarks.READING_LIST_FOLDER_GUID, - R.string.bookmarks_folder_reading_list, 5); - - debug("Dropping view: " + Obsolete.VIEW_COMBINED_WITH_IMAGES); - db.execSQL("DROP VIEW IF EXISTS " + Obsolete.VIEW_COMBINED_WITH_IMAGES); - - createCombinedWithImagesViewOn9(db); - } - - private void upgradeDatabaseFrom9to10(SQLiteDatabase db) { - debug("Dropping view: " + Obsolete.VIEW_COMBINED_WITH_IMAGES); - db.execSQL("DROP VIEW IF EXISTS " + Obsolete.VIEW_COMBINED_WITH_IMAGES); - - createCombinedWithImagesViewOn10(db); - } - - private void upgradeDatabaseFrom10to11(SQLiteDatabase db) { - debug("Dropping view: " + Obsolete.VIEW_COMBINED_WITH_IMAGES); - db.execSQL("DROP VIEW IF EXISTS " + Obsolete.VIEW_COMBINED_WITH_IMAGES); - - db.execSQL("CREATE INDEX bookmarks_type_deleted_index ON " + TABLE_BOOKMARKS + "(" - + Bookmarks.TYPE + ", " + Bookmarks.IS_DELETED + ")"); - - createCombinedWithImagesViewOn11(db); - } - - private void upgradeDatabaseFrom11to12(SQLiteDatabase db) { - debug("Dropping view: " + Obsolete.VIEW_COMBINED_WITH_IMAGES); - db.execSQL("DROP VIEW IF EXISTS " + Obsolete.VIEW_COMBINED_WITH_IMAGES); - - createCombinedViewOn12(db); - } - - private void upgradeDatabaseFrom12to13(SQLiteDatabase db) { - // Update images table with favicon URLs - SQLiteDatabase faviconsDb = null; - Cursor c = null; - try { - final String FAVICON_TABLE = "favicon_urls"; - final String FAVICON_URL = "favicon_url"; - final String FAVICON_PAGE = "page_url"; - - String dbPath = mContext.getDatabasePath(Obsolete.FAVICON_DB).getPath(); - faviconsDb = SQLiteDatabase.openDatabase(dbPath, null, SQLiteDatabase.OPEN_READONLY); - String[] columns = new String[] { FAVICON_URL, FAVICON_PAGE }; - c = faviconsDb.query(FAVICON_TABLE, columns, null, null, null, null, null, null); - int faviconIndex = c.getColumnIndexOrThrow(FAVICON_URL); - int pageIndex = c.getColumnIndexOrThrow(FAVICON_PAGE); - while (c.moveToNext()) { - ContentValues values = new ContentValues(1); - String faviconUrl = c.getString(faviconIndex); - String pageUrl = c.getString(pageIndex); - values.put(FAVICON_URL, faviconUrl); - db.update(Obsolete.TABLE_IMAGES, values, Obsolete.Images.URL + " = ?", new String[] { pageUrl }); - } - } catch (SQLException e) { - // If we can't read from the database for some reason, we won't - // be able to import the favicon URLs. This isn't a fatal - // error, so continue the upgrade. - Log.e(LOGTAG, "Exception importing from " + Obsolete.FAVICON_DB, e); - } finally { - if (c != null) - c.close(); - if (faviconsDb != null) - faviconsDb.close(); - } - - createFaviconsTable(db); - - // Import favicons into the favicons table - db.execSQL("ALTER TABLE " + TABLE_HISTORY - + " ADD COLUMN " + History.FAVICON_ID + " INTEGER"); - db.execSQL("ALTER TABLE " + TABLE_BOOKMARKS - + " ADD COLUMN " + Bookmarks.FAVICON_ID + " INTEGER"); - - try { - c = db.query(Obsolete.TABLE_IMAGES, - new String[] { - Obsolete.Images.URL, - Obsolete.Images.FAVICON_URL, - Obsolete.Images.FAVICON, - Obsolete.Images.DATE_MODIFIED, - Obsolete.Images.DATE_CREATED - }, - Obsolete.Images.FAVICON + " IS NOT NULL", - null, null, null, null); - - while (c.moveToNext()) { - long faviconId = -1; - int faviconUrlIndex = c.getColumnIndexOrThrow(Obsolete.Images.FAVICON_URL); - String faviconUrl = null; - if (!c.isNull(faviconUrlIndex)) { - faviconUrl = c.getString(faviconUrlIndex); - Cursor c2 = null; - try { - c2 = db.query(TABLE_FAVICONS, - new String[] { Favicons._ID }, - Favicons.URL + " = ?", - new String[] { faviconUrl }, - null, null, null); - if (c2.moveToFirst()) { - faviconId = c2.getLong(c2.getColumnIndexOrThrow(Favicons._ID)); - } - } finally { - if (c2 != null) - c2.close(); - } - } - - if (faviconId == -1) { - ContentValues values = new ContentValues(4); - values.put(Favicons.URL, faviconUrl); - values.put(Favicons.DATA, c.getBlob(c.getColumnIndexOrThrow(Obsolete.Images.FAVICON))); - values.put(Favicons.DATE_MODIFIED, c.getLong(c.getColumnIndexOrThrow(Obsolete.Images.DATE_MODIFIED))); - values.put(Favicons.DATE_CREATED, c.getLong(c.getColumnIndexOrThrow(Obsolete.Images.DATE_CREATED))); - faviconId = db.insert(TABLE_FAVICONS, null, values); - } - - ContentValues values = new ContentValues(1); - values.put(FaviconColumns.FAVICON_ID, faviconId); - db.update(TABLE_HISTORY, values, History.URL + " = ?", - new String[] { c.getString(c.getColumnIndexOrThrow(Obsolete.Images.URL)) }); - db.update(TABLE_BOOKMARKS, values, Bookmarks.URL + " = ?", - new String[] { c.getString(c.getColumnIndexOrThrow(Obsolete.Images.URL)) }); - } - } finally { - if (c != null) - c.close(); - } - - createThumbnailsTable(db); - - // Import thumbnails into the thumbnails table - db.execSQL("INSERT INTO " + TABLE_THUMBNAILS + " (" - + Thumbnails.URL + ", " - + Thumbnails.DATA + ") " - + "SELECT " + Obsolete.Images.URL + ", " + Obsolete.Images.THUMBNAIL - + " FROM " + Obsolete.TABLE_IMAGES - + " WHERE " + Obsolete.Images.THUMBNAIL + " IS NOT NULL"); - - db.execSQL("DROP VIEW IF EXISTS " + Obsolete.VIEW_BOOKMARKS_WITH_IMAGES); - db.execSQL("DROP VIEW IF EXISTS " + Obsolete.VIEW_HISTORY_WITH_IMAGES); - db.execSQL("DROP VIEW IF EXISTS " + Obsolete.VIEW_COMBINED_WITH_IMAGES); - db.execSQL("DROP VIEW IF EXISTS " + VIEW_COMBINED); - - createBookmarksWithFaviconsView(db); - createHistoryWithFaviconsView(db); - createCombinedViewOn13(db); - - db.execSQL("DROP TABLE IF EXISTS " + Obsolete.TABLE_IMAGES); - } - - private void upgradeDatabaseFrom13to14(SQLiteDatabase db) { - createOrUpdateSpecialFolder(db, Bookmarks.PINNED_FOLDER_GUID, - R.string.bookmarks_folder_pinned, 6); - } - - private void upgradeDatabaseFrom14to15(SQLiteDatabase db) { - Cursor c = null; - try { - // Get all the pinned bookmarks - c = db.query(TABLE_BOOKMARKS, - new String[] { Bookmarks._ID, Bookmarks.URL }, - Bookmarks.PARENT + " = ?", - new String[] { Integer.toString(Bookmarks.FIXED_PINNED_LIST_ID) }, - null, null, null); - - while (c.moveToNext()) { - // Check if this URL can be parsed as a URI with a valid scheme. - String url = c.getString(c.getColumnIndexOrThrow(Bookmarks.URL)); - if (Uri.parse(url).getScheme() != null) { - continue; - } - - // If it can't, update the URL to be an encoded "user-entered" value. - ContentValues values = new ContentValues(1); - String newUrl = Uri.fromParts("user-entered", url, null).toString(); - values.put(Bookmarks.URL, newUrl); - db.update(TABLE_BOOKMARKS, values, Bookmarks._ID + " = ?", - new String[] { Integer.toString(c.getInt(c.getColumnIndexOrThrow(Bookmarks._ID))) }); - } - } finally { - if (c != null) { - c.close(); - } - } - } - - private void upgradeDatabaseFrom15to16(SQLiteDatabase db) { - db.execSQL("DROP VIEW IF EXISTS " + VIEW_COMBINED); - db.execSQL("DROP VIEW IF EXISTS " + VIEW_COMBINED_WITH_FAVICONS); - - createCombinedViewOn16(db); - } - - private void upgradeDatabaseFrom16to17(SQLiteDatabase db) { - // Purge any 0-byte favicons/thumbnails - try { - db.execSQL("DELETE FROM " + TABLE_FAVICONS + - " WHERE length(" + Favicons.DATA + ") = 0"); - db.execSQL("DELETE FROM " + TABLE_THUMBNAILS + - " WHERE length(" + Thumbnails.DATA + ") = 0"); - } catch (SQLException e) { - Log.e(LOGTAG, "Error purging invalid favicons or thumbnails", e); - } - } - - @Override - public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { - debug("Upgrading browser.db: " + db.getPath() + " from " + - oldVersion + " to " + newVersion); - - // We have to do incremental upgrades until we reach the current - // database schema version. - for (int v = oldVersion + 1; v <= newVersion; v++) { - switch(v) { - case 2: - upgradeDatabaseFrom1to2(db); - break; - - case 3: - upgradeDatabaseFrom2to3(db); - break; - - case 4: - upgradeDatabaseFrom3to4(db); - break; - - case 5: - upgradeDatabaseFrom4to5(db); - break; - - case 6: - upgradeDatabaseFrom5to6(db); - break; - - case 7: - upgradeDatabaseFrom6to7(db); - break; - - case 8: - upgradeDatabaseFrom7to8(db); - break; - - case 9: - upgradeDatabaseFrom8to9(db); - break; - - case 10: - upgradeDatabaseFrom9to10(db); - break; - - case 11: - upgradeDatabaseFrom10to11(db); - break; - - case 12: - upgradeDatabaseFrom11to12(db); - break; - - case 13: - upgradeDatabaseFrom12to13(db); - break; - - case 14: - upgradeDatabaseFrom13to14(db); - break; - - case 15: - upgradeDatabaseFrom14to15(db); - break; - - case 16: - upgradeDatabaseFrom15to16(db); - break; - - case 17: - upgradeDatabaseFrom16to17(db); - break; - } - } - - // If an upgrade after 12->13 fails, the entire upgrade is rolled - // back, but we can't undo the deletion of favicon_urls.db if we - // delete this in step 13; therefore, we wait until all steps are - // complete before removing it. - if (oldVersion < 13 && newVersion >= 13 - && mContext.getDatabasePath(Obsolete.FAVICON_DB).exists() - && !mContext.deleteDatabase(Obsolete.FAVICON_DB)) { - throw new SQLException("Could not delete " + Obsolete.FAVICON_DB); - } - } - - @Override - public void onOpen(SQLiteDatabase db) { - debug("Opening browser.db: " + db.getPath()); - - Cursor cursor = null; - try { - cursor = db.rawQuery("PRAGMA foreign_keys=ON", null); - } finally { - if (cursor != null) - cursor.close(); - } - cursor = null; - try { - cursor = db.rawQuery("PRAGMA synchronous=NORMAL", null); - } finally { - if (cursor != null) - cursor.close(); - } - - // From Honeycomb on, it's possible to run several db - // commands in parallel using multiple connections. - if (Build.VERSION.SDK_INT >= 11) { - db.enableWriteAheadLogging(); - db.setLockingEnabled(false); - } else { - // Pre-Honeycomb, we can do some lesser optimizations. - cursor = null; - try { - cursor = db.rawQuery("PRAGMA journal_mode=PERSIST", null); - } finally { - if (cursor != null) - cursor.close(); - } - } - } - - static final String qualifyColumn(String table, String column) { - return DBUtils.qualifyColumn(table, column); - } - - // Calculate these once, at initialization. isLoggable is too expensive to - // have in-line in each log call. - private static boolean logDebug = Log.isLoggable(LOGTAG, Log.DEBUG); - private static boolean logVerbose = Log.isLoggable(LOGTAG, Log.VERBOSE); - protected static void trace(String message) { - if (logVerbose) { - Log.v(LOGTAG, message); - } - } - - protected static void debug(String message) { - if (logDebug) { - Log.d(LOGTAG, message); - } - } - - private Integer getMobileFolderId(SQLiteDatabase db) { - Cursor c = null; - - try { - c = db.query(TABLE_BOOKMARKS, - mobileIdColumns, - Bookmarks.GUID + " = ?", - mobileIdSelectionArgs, - null, null, null); - - if (c == null || !c.moveToFirst()) - return null; - - return c.getInt(c.getColumnIndex(Bookmarks._ID)); - } finally { - if (c != null) - c.close(); - } - } - - private long insertFavicon(SQLiteDatabase db, ContentValues values) { - // This method is a dupicate of BrowserProvider.insertFavicon. - // If changes are needed, please update both - String faviconUrl = values.getAsString(Favicons.URL); - String pageUrl = null; - long faviconId; - - trace("Inserting favicon for URL: " + faviconUrl); - - DBUtils.stripEmptyByteArray(values, Favicons.DATA); - - // Extract the page URL from the ContentValues - if (values.containsKey(Favicons.PAGE_URL)) { - pageUrl = values.getAsString(Favicons.PAGE_URL); - values.remove(Favicons.PAGE_URL); - } - - // If no URL is provided, insert using the default one. - if (TextUtils.isEmpty(faviconUrl) && !TextUtils.isEmpty(pageUrl)) { - values.put(Favicons.URL, org.mozilla.gecko.favicons.Favicons.guessDefaultFaviconURL(pageUrl)); - } - - long now = System.currentTimeMillis(); - values.put(Favicons.DATE_CREATED, now); - values.put(Favicons.DATE_MODIFIED, now); - faviconId = db.insertOrThrow(TABLE_FAVICONS, null, values); - - if (pageUrl != null) { - ContentValues updateValues = new ContentValues(1); - updateValues.put(FaviconColumns.FAVICON_ID, faviconId); - db.update(TABLE_HISTORY, - updateValues, - History.URL + " = ?", - new String[] { pageUrl }); - db.update(TABLE_BOOKMARKS, - updateValues, - Bookmarks.URL + " = ?", - new String[] { pageUrl }); - } - - return faviconId; - } - - private interface BookmarkMigrator { - public void updateForNewTable(ContentValues bookmark); - } - - private class BookmarkMigrator3to4 implements BookmarkMigrator { - @Override - public void updateForNewTable(ContentValues bookmark) { - Integer isFolder = bookmark.getAsInteger("folder"); - if (isFolder == null || isFolder != 1) { - bookmark.put(Bookmarks.TYPE, Bookmarks.TYPE_BOOKMARK); - } else { - bookmark.put(Bookmarks.TYPE, Bookmarks.TYPE_FOLDER); - } - - bookmark.remove("folder"); - } - } -} \ No newline at end of file diff --git a/mobile/android/base/db/BrowserProvider.java b/mobile/android/base/db/BrowserProvider.java index d41b1ce0f60..1f8330faef0 100644 --- a/mobile/android/base/db/BrowserProvider.java +++ b/mobile/android/base/db/BrowserProvider.java @@ -5,11 +5,10 @@ package org.mozilla.gecko.db; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; - +import org.mozilla.gecko.AppConstants; +import org.mozilla.gecko.Distribution; +import org.mozilla.gecko.GeckoProfile; +import org.mozilla.gecko.R; import org.mozilla.gecko.db.BrowserContract.Bookmarks; import org.mozilla.gecko.db.BrowserContract.Combined; import org.mozilla.gecko.db.BrowserContract.CommonColumns; @@ -20,9 +19,18 @@ import org.mozilla.gecko.db.BrowserContract.Schema; import org.mozilla.gecko.db.BrowserContract.SyncColumns; import org.mozilla.gecko.db.BrowserContract.Thumbnails; import org.mozilla.gecko.db.BrowserContract.URLColumns; +import org.mozilla.gecko.db.PerProfileDatabases.DatabaseHelperFactory; +import org.mozilla.gecko.gfx.BitmapUtils; import org.mozilla.gecko.sync.Utils; +import org.mozilla.gecko.util.GeckoJarReader; +import org.mozilla.gecko.util.ThreadUtils; + +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; import android.app.SearchManager; +import android.content.ContentProvider; import android.content.ContentProviderOperation; import android.content.ContentProviderResult; import android.content.ContentUris; @@ -35,13 +43,35 @@ import android.database.DatabaseUtils; import android.database.MatrixCursor; import android.database.SQLException; import android.database.sqlite.SQLiteDatabase; +import android.database.sqlite.SQLiteOpenHelper; import android.database.sqlite.SQLiteQueryBuilder; +import android.graphics.Bitmap; import android.net.Uri; +import android.os.Build; import android.text.TextUtils; import android.util.Log; -public class BrowserProvider extends TransactionalProvider { +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public class BrowserProvider extends ContentProvider { private static final String LOGTAG = "GeckoBrowserProvider"; + private Context mContext; + + private PerProfileDatabases mDatabases; + + static final String DATABASE_NAME = "browser.db"; + + static final int DATABASE_VERSION = 17; // Maximum age of deleted records to be cleaned up (20 days in ms) static final long MAX_AGE_OF_DELETED_RECORDS = 86400000 * 20; @@ -64,15 +94,20 @@ public class BrowserProvider extends TransactionalProvider map; @@ -235,6 +315,24 @@ public class BrowserProvider extends TransactionalProvider= 8) { + foreignKeyOnParent = ", FOREIGN KEY (" + Bookmarks.PARENT + + ") REFERENCES " + TABLE_BOOKMARKS + "(" + Bookmarks._ID + ")"; + } + + db.execSQL("CREATE TABLE " + TABLE_BOOKMARKS + "(" + + Bookmarks._ID + " INTEGER PRIMARY KEY AUTOINCREMENT," + + Bookmarks.TITLE + " TEXT," + + Bookmarks.URL + " TEXT," + + Bookmarks.TYPE + " INTEGER NOT NULL DEFAULT " + Bookmarks.TYPE_BOOKMARK + "," + + Bookmarks.PARENT + " INTEGER," + + Bookmarks.POSITION + " INTEGER NOT NULL," + + Bookmarks.KEYWORD + " TEXT," + + Bookmarks.DESCRIPTION + " TEXT," + + Bookmarks.TAGS + " TEXT," + + Bookmarks.DATE_CREATED + " INTEGER," + + Bookmarks.DATE_MODIFIED + " INTEGER," + + Bookmarks.GUID + " TEXT NOT NULL," + + Bookmarks.IS_DELETED + " INTEGER NOT NULL DEFAULT 0" + + (foreignKeyOnParent != null ? foreignKeyOnParent : "") + + ");"); + + db.execSQL("CREATE INDEX bookmarks_url_index ON " + TABLE_BOOKMARKS + "(" + + Bookmarks.URL + ")"); + db.execSQL("CREATE INDEX bookmarks_type_deleted_index ON " + TABLE_BOOKMARKS + "(" + + Bookmarks.TYPE + ", " + Bookmarks.IS_DELETED + ")"); + db.execSQL("CREATE UNIQUE INDEX bookmarks_guid_index ON " + TABLE_BOOKMARKS + "(" + + Bookmarks.GUID + ")"); + db.execSQL("CREATE INDEX bookmarks_modified_index ON " + TABLE_BOOKMARKS + "(" + + Bookmarks.DATE_MODIFIED + ")"); + } + + private void createBookmarksTableOn13(SQLiteDatabase db) { + debug("Creating " + TABLE_BOOKMARKS + " table"); + + // Android versions older than Froyo ship with an sqlite + // that doesn't support foreign keys. + String foreignKeyOnParent = null; + if (Build.VERSION.SDK_INT >= 8) { + foreignKeyOnParent = ", FOREIGN KEY (" + Bookmarks.PARENT + + ") REFERENCES " + TABLE_BOOKMARKS + "(" + Bookmarks._ID + ")"; + } + + db.execSQL("CREATE TABLE " + TABLE_BOOKMARKS + "(" + + Bookmarks._ID + " INTEGER PRIMARY KEY AUTOINCREMENT," + + Bookmarks.TITLE + " TEXT," + + Bookmarks.URL + " TEXT," + + Bookmarks.TYPE + " INTEGER NOT NULL DEFAULT " + Bookmarks.TYPE_BOOKMARK + "," + + Bookmarks.PARENT + " INTEGER," + + Bookmarks.POSITION + " INTEGER NOT NULL," + + Bookmarks.KEYWORD + " TEXT," + + Bookmarks.DESCRIPTION + " TEXT," + + Bookmarks.TAGS + " TEXT," + + Bookmarks.FAVICON_ID + " INTEGER," + + Bookmarks.DATE_CREATED + " INTEGER," + + Bookmarks.DATE_MODIFIED + " INTEGER," + + Bookmarks.GUID + " TEXT NOT NULL," + + Bookmarks.IS_DELETED + " INTEGER NOT NULL DEFAULT 0" + + (foreignKeyOnParent != null ? foreignKeyOnParent : "") + + ");"); + + db.execSQL("CREATE INDEX bookmarks_url_index ON " + TABLE_BOOKMARKS + "(" + + Bookmarks.URL + ")"); + db.execSQL("CREATE INDEX bookmarks_type_deleted_index ON " + TABLE_BOOKMARKS + "(" + + Bookmarks.TYPE + ", " + Bookmarks.IS_DELETED + ")"); + db.execSQL("CREATE UNIQUE INDEX bookmarks_guid_index ON " + TABLE_BOOKMARKS + "(" + + Bookmarks.GUID + ")"); + db.execSQL("CREATE INDEX bookmarks_modified_index ON " + TABLE_BOOKMARKS + "(" + + Bookmarks.DATE_MODIFIED + ")"); + } + + private void createHistoryTable(SQLiteDatabase db) { + debug("Creating " + TABLE_HISTORY + " table"); + db.execSQL("CREATE TABLE " + TABLE_HISTORY + "(" + + History._ID + " INTEGER PRIMARY KEY AUTOINCREMENT," + + History.TITLE + " TEXT," + + History.URL + " TEXT NOT NULL," + + History.VISITS + " INTEGER NOT NULL DEFAULT 0," + + History.DATE_LAST_VISITED + " INTEGER," + + History.DATE_CREATED + " INTEGER," + + History.DATE_MODIFIED + " INTEGER," + + History.GUID + " TEXT NOT NULL," + + History.IS_DELETED + " INTEGER NOT NULL DEFAULT 0" + + ");"); + + db.execSQL("CREATE INDEX history_url_index ON " + TABLE_HISTORY + "(" + + History.URL + ")"); + db.execSQL("CREATE UNIQUE INDEX history_guid_index ON " + TABLE_HISTORY + "(" + + History.GUID + ")"); + db.execSQL("CREATE INDEX history_modified_index ON " + TABLE_HISTORY + "(" + + History.DATE_MODIFIED + ")"); + db.execSQL("CREATE INDEX history_visited_index ON " + TABLE_HISTORY + "(" + + History.DATE_LAST_VISITED + ")"); + } + + private void createHistoryTableOn13(SQLiteDatabase db) { + debug("Creating " + TABLE_HISTORY + " table"); + db.execSQL("CREATE TABLE " + TABLE_HISTORY + "(" + + History._ID + " INTEGER PRIMARY KEY AUTOINCREMENT," + + History.TITLE + " TEXT," + + History.URL + " TEXT NOT NULL," + + History.VISITS + " INTEGER NOT NULL DEFAULT 0," + + History.FAVICON_ID + " INTEGER," + + History.DATE_LAST_VISITED + " INTEGER," + + History.DATE_CREATED + " INTEGER," + + History.DATE_MODIFIED + " INTEGER," + + History.GUID + " TEXT NOT NULL," + + History.IS_DELETED + " INTEGER NOT NULL DEFAULT 0" + + ");"); + + db.execSQL("CREATE INDEX history_url_index ON " + TABLE_HISTORY + "(" + + History.URL + ")"); + db.execSQL("CREATE UNIQUE INDEX history_guid_index ON " + TABLE_HISTORY + "(" + + History.GUID + ")"); + db.execSQL("CREATE INDEX history_modified_index ON " + TABLE_HISTORY + "(" + + History.DATE_MODIFIED + ")"); + db.execSQL("CREATE INDEX history_visited_index ON " + TABLE_HISTORY + "(" + + History.DATE_LAST_VISITED + ")"); + } + + private void createImagesTable(SQLiteDatabase db) { + debug("Creating " + Obsolete.TABLE_IMAGES + " table"); + db.execSQL("CREATE TABLE " + Obsolete.TABLE_IMAGES + " (" + + Obsolete.Images._ID + " INTEGER PRIMARY KEY AUTOINCREMENT," + + Obsolete.Images.URL + " TEXT UNIQUE NOT NULL," + + Obsolete.Images.FAVICON + " BLOB," + + Obsolete.Images.FAVICON_URL + " TEXT," + + Obsolete.Images.THUMBNAIL + " BLOB," + + Obsolete.Images.DATE_CREATED + " INTEGER," + + Obsolete.Images.DATE_MODIFIED + " INTEGER," + + Obsolete.Images.GUID + " TEXT NOT NULL," + + Obsolete.Images.IS_DELETED + " INTEGER NOT NULL DEFAULT 0" + + ");"); + + db.execSQL("CREATE INDEX images_url_index ON " + Obsolete.TABLE_IMAGES + "(" + + Obsolete.Images.URL + ")"); + db.execSQL("CREATE UNIQUE INDEX images_guid_index ON " + Obsolete.TABLE_IMAGES + "(" + + Obsolete.Images.GUID + ")"); + db.execSQL("CREATE INDEX images_modified_index ON " + Obsolete.TABLE_IMAGES + "(" + + Obsolete.Images.DATE_MODIFIED + ")"); + } + + private void createFaviconsTable(SQLiteDatabase db) { + debug("Creating " + TABLE_FAVICONS + " table"); + db.execSQL("CREATE TABLE " + TABLE_FAVICONS + " (" + + Favicons._ID + " INTEGER PRIMARY KEY AUTOINCREMENT," + + Favicons.URL + " TEXT UNIQUE," + + Favicons.DATA + " BLOB," + + Favicons.DATE_CREATED + " INTEGER," + + Favicons.DATE_MODIFIED + " INTEGER" + + ");"); + + db.execSQL("CREATE INDEX favicons_url_index ON " + TABLE_FAVICONS + "(" + + Favicons.URL + ")"); + db.execSQL("CREATE INDEX favicons_modified_index ON " + TABLE_FAVICONS + "(" + + Favicons.DATE_MODIFIED + ")"); + } + + private void createThumbnailsTable(SQLiteDatabase db) { + debug("Creating " + TABLE_THUMBNAILS + " table"); + db.execSQL("CREATE TABLE " + TABLE_THUMBNAILS + " (" + + Thumbnails._ID + " INTEGER PRIMARY KEY AUTOINCREMENT," + + Thumbnails.URL + " TEXT UNIQUE," + + Thumbnails.DATA + " BLOB" + + ");"); + + db.execSQL("CREATE INDEX thumbnails_url_index ON " + TABLE_THUMBNAILS + "(" + + Thumbnails.URL + ")"); + } + + private void createBookmarksWithImagesView(SQLiteDatabase db) { + debug("Creating " + Obsolete.VIEW_BOOKMARKS_WITH_IMAGES + " view"); + + db.execSQL("CREATE VIEW IF NOT EXISTS " + Obsolete.VIEW_BOOKMARKS_WITH_IMAGES + " AS " + + "SELECT " + qualifyColumn(TABLE_BOOKMARKS, "*") + + ", " + Obsolete.Images.FAVICON + ", " + Obsolete.Images.THUMBNAIL + " FROM " + + Obsolete.TABLE_BOOKMARKS_JOIN_IMAGES); + } + + private void createBookmarksWithFaviconsView(SQLiteDatabase db) { + debug("Creating " + VIEW_BOOKMARKS_WITH_FAVICONS + " view"); + + db.execSQL("CREATE VIEW IF NOT EXISTS " + VIEW_BOOKMARKS_WITH_FAVICONS + " AS " + + "SELECT " + qualifyColumn(TABLE_BOOKMARKS, "*") + + ", " + qualifyColumn(TABLE_FAVICONS, Favicons.DATA) + " AS " + Bookmarks.FAVICON + + ", " + qualifyColumn(TABLE_FAVICONS, Favicons.URL) + " AS " + Bookmarks.FAVICON_URL + + " FROM " + TABLE_BOOKMARKS_JOIN_FAVICONS); + } + + private void createHistoryWithImagesView(SQLiteDatabase db) { + debug("Creating " + Obsolete.VIEW_HISTORY_WITH_IMAGES + " view"); + + db.execSQL("CREATE VIEW IF NOT EXISTS " + Obsolete.VIEW_HISTORY_WITH_IMAGES + " AS " + + "SELECT " + qualifyColumn(TABLE_HISTORY, "*") + + ", " + Obsolete.Images.FAVICON + ", " + Obsolete.Images.THUMBNAIL + " FROM " + + Obsolete.TABLE_HISTORY_JOIN_IMAGES); + } + + private void createHistoryWithFaviconsView(SQLiteDatabase db) { + debug("Creating " + VIEW_HISTORY_WITH_FAVICONS + " view"); + + db.execSQL("CREATE VIEW IF NOT EXISTS " + VIEW_HISTORY_WITH_FAVICONS + " AS " + + "SELECT " + qualifyColumn(TABLE_HISTORY, "*") + + ", " + qualifyColumn(TABLE_FAVICONS, Favicons.DATA) + " AS " + History.FAVICON + + ", " + qualifyColumn(TABLE_FAVICONS, Favicons.URL) + " AS " + History.FAVICON_URL + + " FROM " + TABLE_HISTORY_JOIN_FAVICONS); + } + + private void createCombinedWithImagesView(SQLiteDatabase db) { + debug("Creating " + Obsolete.VIEW_COMBINED_WITH_IMAGES + " view"); + + db.execSQL("CREATE VIEW IF NOT EXISTS " + Obsolete.VIEW_COMBINED_WITH_IMAGES + " AS" + + " SELECT " + Combined.BOOKMARK_ID + ", " + + Combined.HISTORY_ID + ", " + + // We need to return an _id column because CursorAdapter requires it for its + // default implementation for the getItemId() method. However, since + // we're not using this feature in the parts of the UI using this view, + // we can just use 0 for all rows. + "0 AS " + Combined._ID + ", " + + Combined.URL + ", " + + Combined.TITLE + ", " + + Combined.VISITS + ", " + + Combined.DATE_LAST_VISITED + ", " + + qualifyColumn(Obsolete.TABLE_IMAGES, Obsolete.Images.FAVICON) + " AS " + Combined.FAVICON + ", " + + qualifyColumn(Obsolete.TABLE_IMAGES, Obsolete.Images.THUMBNAIL) + " AS " + Obsolete.Combined.THUMBNAIL + + " FROM (" + + // Bookmarks without history. + " SELECT " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks._ID) + " AS " + Combined.BOOKMARK_ID + ", " + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.URL) + " AS " + Combined.URL + ", " + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TITLE) + " AS " + Combined.TITLE + ", " + + "-1 AS " + Combined.HISTORY_ID + ", " + + "-1 AS " + Combined.VISITS + ", " + + "-1 AS " + Combined.DATE_LAST_VISITED + + " FROM " + TABLE_BOOKMARKS + + " WHERE " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TYPE) + " = " + Bookmarks.TYPE_BOOKMARK + " AND " + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.IS_DELETED) + " = 0 AND " + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.URL) + + " NOT IN (SELECT " + History.URL + " FROM " + TABLE_HISTORY + ")" + + " UNION ALL" + + // History with and without bookmark. + " SELECT " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks._ID) + " AS " + Combined.BOOKMARK_ID + ", " + + qualifyColumn(TABLE_HISTORY, History.URL) + " AS " + Combined.URL + ", " + + // Prioritze bookmark titles over history titles, since the user may have + // customized the title for a bookmark. + "COALESCE(" + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TITLE) + ", " + + qualifyColumn(TABLE_HISTORY, History.TITLE) +")" + " AS " + Combined.TITLE + ", " + + qualifyColumn(TABLE_HISTORY, History._ID) + " AS " + Combined.HISTORY_ID + ", " + + qualifyColumn(TABLE_HISTORY, History.VISITS) + " AS " + Combined.VISITS + ", " + + qualifyColumn(TABLE_HISTORY, History.DATE_LAST_VISITED) + " AS " + Combined.DATE_LAST_VISITED + + " FROM " + TABLE_HISTORY + " LEFT OUTER JOIN " + TABLE_BOOKMARKS + + " ON " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.URL) + " = " + qualifyColumn(TABLE_HISTORY, History.URL) + + " WHERE " + qualifyColumn(TABLE_HISTORY, History.URL) + " IS NOT NULL AND " + + qualifyColumn(TABLE_HISTORY, History.IS_DELETED) + " = 0 AND (" + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TYPE) + " IS NULL OR " + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TYPE) + " = " + Bookmarks.TYPE_BOOKMARK + ")" + + ") LEFT OUTER JOIN " + Obsolete.TABLE_IMAGES + + " ON " + Combined.URL + " = " + qualifyColumn(Obsolete.TABLE_IMAGES, Obsolete.Images.URL)); + } + + private void createCombinedWithImagesViewOn9(SQLiteDatabase db) { + debug("Creating " + Obsolete.VIEW_COMBINED_WITH_IMAGES + " view"); + + db.execSQL("CREATE VIEW IF NOT EXISTS " + Obsolete.VIEW_COMBINED_WITH_IMAGES + " AS" + + " SELECT " + Combined.BOOKMARK_ID + ", " + + Combined.HISTORY_ID + ", " + + // We need to return an _id column because CursorAdapter requires it for its + // default implementation for the getItemId() method. However, since + // we're not using this feature in the parts of the UI using this view, + // we can just use 0 for all rows. + "0 AS " + Combined._ID + ", " + + Combined.URL + ", " + + Combined.TITLE + ", " + + Combined.VISITS + ", " + + Combined.DISPLAY + ", " + + Combined.DATE_LAST_VISITED + ", " + + qualifyColumn(Obsolete.TABLE_IMAGES, Obsolete.Images.FAVICON) + " AS " + Combined.FAVICON + ", " + + qualifyColumn(Obsolete.TABLE_IMAGES, Obsolete.Images.THUMBNAIL) + " AS " + Obsolete.Combined.THUMBNAIL + + " FROM (" + + // Bookmarks without history. + " SELECT " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks._ID) + " AS " + Combined.BOOKMARK_ID + ", " + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.URL) + " AS " + Combined.URL + ", " + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TITLE) + " AS " + Combined.TITLE + ", " + + "CASE " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.PARENT) + " WHEN " + + Bookmarks.FIXED_READING_LIST_ID + " THEN " + Combined.DISPLAY_READER + " ELSE " + + Combined.DISPLAY_NORMAL + " END AS " + Combined.DISPLAY + ", " + + "-1 AS " + Combined.HISTORY_ID + ", " + + "-1 AS " + Combined.VISITS + ", " + + "-1 AS " + Combined.DATE_LAST_VISITED + + " FROM " + TABLE_BOOKMARKS + + " WHERE " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TYPE) + " = " + Bookmarks.TYPE_BOOKMARK + " AND " + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.IS_DELETED) + " = 0 AND " + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.URL) + + " NOT IN (SELECT " + History.URL + " FROM " + TABLE_HISTORY + ")" + + " UNION ALL" + + // History with and without bookmark. + " SELECT " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks._ID) + " AS " + Combined.BOOKMARK_ID + ", " + + qualifyColumn(TABLE_HISTORY, History.URL) + " AS " + Combined.URL + ", " + + // Prioritze bookmark titles over history titles, since the user may have + // customized the title for a bookmark. + "COALESCE(" + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TITLE) + ", " + + qualifyColumn(TABLE_HISTORY, History.TITLE) +")" + " AS " + Combined.TITLE + ", " + + "CASE " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.PARENT) + " WHEN " + + Bookmarks.FIXED_READING_LIST_ID + " THEN " + Combined.DISPLAY_READER + " ELSE " + + Combined.DISPLAY_NORMAL + " END AS " + Combined.DISPLAY + ", " + + qualifyColumn(TABLE_HISTORY, History._ID) + " AS " + Combined.HISTORY_ID + ", " + + qualifyColumn(TABLE_HISTORY, History.VISITS) + " AS " + Combined.VISITS + ", " + + qualifyColumn(TABLE_HISTORY, History.DATE_LAST_VISITED) + " AS " + Combined.DATE_LAST_VISITED + + " FROM " + TABLE_HISTORY + " LEFT OUTER JOIN " + TABLE_BOOKMARKS + + " ON " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.URL) + " = " + qualifyColumn(TABLE_HISTORY, History.URL) + + " WHERE " + qualifyColumn(TABLE_HISTORY, History.URL) + " IS NOT NULL AND " + + qualifyColumn(TABLE_HISTORY, History.IS_DELETED) + " = 0 AND (" + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TYPE) + " IS NULL OR " + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TYPE) + " = " + Bookmarks.TYPE_BOOKMARK + ")" + + ") LEFT OUTER JOIN " + Obsolete.TABLE_IMAGES + + " ON " + Combined.URL + " = " + qualifyColumn(Obsolete.TABLE_IMAGES, Obsolete.Images.URL)); + } + + private void createCombinedWithImagesViewOn10(SQLiteDatabase db) { + debug("Creating " + Obsolete.VIEW_COMBINED_WITH_IMAGES + " view"); + + db.execSQL("CREATE VIEW IF NOT EXISTS " + Obsolete.VIEW_COMBINED_WITH_IMAGES + " AS" + + " SELECT " + Combined.BOOKMARK_ID + ", " + + Combined.HISTORY_ID + ", " + + // We need to return an _id column because CursorAdapter requires it for its + // default implementation for the getItemId() method. However, since + // we're not using this feature in the parts of the UI using this view, + // we can just use 0 for all rows. + "0 AS " + Combined._ID + ", " + + Combined.URL + ", " + + Combined.TITLE + ", " + + Combined.VISITS + ", " + + Combined.DISPLAY + ", " + + Combined.DATE_LAST_VISITED + ", " + + qualifyColumn(Obsolete.TABLE_IMAGES, Obsolete.Images.FAVICON) + " AS " + Combined.FAVICON + ", " + + qualifyColumn(Obsolete.TABLE_IMAGES, Obsolete.Images.THUMBNAIL) + " AS " + Obsolete.Combined.THUMBNAIL + + " FROM (" + + // Bookmarks without history. + " SELECT " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks._ID) + " AS " + Combined.BOOKMARK_ID + ", " + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.URL) + " AS " + Combined.URL + ", " + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TITLE) + " AS " + Combined.TITLE + ", " + + "CASE " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.PARENT) + " WHEN " + + Bookmarks.FIXED_READING_LIST_ID + " THEN " + Combined.DISPLAY_READER + " ELSE " + + Combined.DISPLAY_NORMAL + " END AS " + Combined.DISPLAY + ", " + + "-1 AS " + Combined.HISTORY_ID + ", " + + "-1 AS " + Combined.VISITS + ", " + + "-1 AS " + Combined.DATE_LAST_VISITED + + " FROM " + TABLE_BOOKMARKS + + " WHERE " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TYPE) + " = " + Bookmarks.TYPE_BOOKMARK + " AND " + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.IS_DELETED) + " = 0 AND " + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.URL) + + " NOT IN (SELECT " + History.URL + " FROM " + TABLE_HISTORY + ")" + + " UNION ALL" + + // History with and without bookmark. + " SELECT " + "CASE " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.IS_DELETED) + " WHEN 0 THEN " + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks._ID) + " ELSE NULL END AS " + Combined.BOOKMARK_ID + ", " + + qualifyColumn(TABLE_HISTORY, History.URL) + " AS " + Combined.URL + ", " + + // Prioritze bookmark titles over history titles, since the user may have + // customized the title for a bookmark. + "COALESCE(" + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TITLE) + ", " + + qualifyColumn(TABLE_HISTORY, History.TITLE) +")" + " AS " + Combined.TITLE + ", " + + "CASE " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.PARENT) + " WHEN " + + Bookmarks.FIXED_READING_LIST_ID + " THEN " + Combined.DISPLAY_READER + " ELSE " + + Combined.DISPLAY_NORMAL + " END AS " + Combined.DISPLAY + ", " + + qualifyColumn(TABLE_HISTORY, History._ID) + " AS " + Combined.HISTORY_ID + ", " + + qualifyColumn(TABLE_HISTORY, History.VISITS) + " AS " + Combined.VISITS + ", " + + qualifyColumn(TABLE_HISTORY, History.DATE_LAST_VISITED) + " AS " + Combined.DATE_LAST_VISITED + + " FROM " + TABLE_HISTORY + " LEFT OUTER JOIN " + TABLE_BOOKMARKS + + " ON " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.URL) + " = " + qualifyColumn(TABLE_HISTORY, History.URL) + + " WHERE " + qualifyColumn(TABLE_HISTORY, History.URL) + " IS NOT NULL AND " + + qualifyColumn(TABLE_HISTORY, History.IS_DELETED) + " = 0 AND (" + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TYPE) + " IS NULL OR " + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TYPE) + " = " + Bookmarks.TYPE_BOOKMARK + ")" + + ") LEFT OUTER JOIN " + Obsolete.TABLE_IMAGES + + " ON " + Combined.URL + " = " + qualifyColumn(Obsolete.TABLE_IMAGES, Obsolete.Images.URL)); + } + + private void createCombinedWithImagesViewOn11(SQLiteDatabase db) { + debug("Creating " + Obsolete.VIEW_COMBINED_WITH_IMAGES + " view"); + + db.execSQL("CREATE VIEW IF NOT EXISTS " + Obsolete.VIEW_COMBINED_WITH_IMAGES + " AS" + + " SELECT " + Combined.BOOKMARK_ID + ", " + + Combined.HISTORY_ID + ", " + + // We need to return an _id column because CursorAdapter requires it for its + // default implementation for the getItemId() method. However, since + // we're not using this feature in the parts of the UI using this view, + // we can just use 0 for all rows. + "0 AS " + Combined._ID + ", " + + Combined.URL + ", " + + Combined.TITLE + ", " + + Combined.VISITS + ", " + + Combined.DISPLAY + ", " + + Combined.DATE_LAST_VISITED + ", " + + qualifyColumn(Obsolete.TABLE_IMAGES, Obsolete.Images.FAVICON) + " AS " + Combined.FAVICON + ", " + + qualifyColumn(Obsolete.TABLE_IMAGES, Obsolete.Images.THUMBNAIL) + " AS " + Obsolete.Combined.THUMBNAIL + + " FROM (" + + // Bookmarks without history. + " SELECT " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks._ID) + " AS " + Combined.BOOKMARK_ID + ", " + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.URL) + " AS " + Combined.URL + ", " + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TITLE) + " AS " + Combined.TITLE + ", " + + "CASE " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.PARENT) + " WHEN " + + Bookmarks.FIXED_READING_LIST_ID + " THEN " + Combined.DISPLAY_READER + " ELSE " + + Combined.DISPLAY_NORMAL + " END AS " + Combined.DISPLAY + ", " + + "-1 AS " + Combined.HISTORY_ID + ", " + + "-1 AS " + Combined.VISITS + ", " + + "-1 AS " + Combined.DATE_LAST_VISITED + + " FROM " + TABLE_BOOKMARKS + + " WHERE " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TYPE) + " = " + Bookmarks.TYPE_BOOKMARK + " AND " + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.IS_DELETED) + " = 0 AND " + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.URL) + + " NOT IN (SELECT " + History.URL + " FROM " + TABLE_HISTORY + ")" + + " UNION ALL" + + // History with and without bookmark. + " SELECT " + "CASE " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.IS_DELETED) + " WHEN 0 THEN " + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks._ID) + " ELSE NULL END AS " + Combined.BOOKMARK_ID + ", " + + qualifyColumn(TABLE_HISTORY, History.URL) + " AS " + Combined.URL + ", " + + // Prioritze bookmark titles over history titles, since the user may have + // customized the title for a bookmark. + "COALESCE(" + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TITLE) + ", " + + qualifyColumn(TABLE_HISTORY, History.TITLE) +")" + " AS " + Combined.TITLE + ", " + + // Only use DISPLAY_READER if the matching bookmark entry inside reading + // list folder is not marked as deleted. + "CASE " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.IS_DELETED) + " WHEN 0 THEN CASE " + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.PARENT) + " WHEN " + Bookmarks.FIXED_READING_LIST_ID + + " THEN " + Combined.DISPLAY_READER + " ELSE " + Combined.DISPLAY_NORMAL + " END ELSE " + + Combined.DISPLAY_NORMAL + " END AS " + Combined.DISPLAY + ", " + + qualifyColumn(TABLE_HISTORY, History._ID) + " AS " + Combined.HISTORY_ID + ", " + + qualifyColumn(TABLE_HISTORY, History.VISITS) + " AS " + Combined.VISITS + ", " + + qualifyColumn(TABLE_HISTORY, History.DATE_LAST_VISITED) + " AS " + Combined.DATE_LAST_VISITED + + " FROM " + TABLE_HISTORY + " LEFT OUTER JOIN " + TABLE_BOOKMARKS + + " ON " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.URL) + " = " + qualifyColumn(TABLE_HISTORY, History.URL) + + " WHERE " + qualifyColumn(TABLE_HISTORY, History.URL) + " IS NOT NULL AND " + + qualifyColumn(TABLE_HISTORY, History.IS_DELETED) + " = 0 AND (" + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TYPE) + " IS NULL OR " + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TYPE) + " = " + Bookmarks.TYPE_BOOKMARK + ") " + + ") LEFT OUTER JOIN " + Obsolete.TABLE_IMAGES + + " ON " + Combined.URL + " = " + qualifyColumn(Obsolete.TABLE_IMAGES, Obsolete.Images.URL)); + } + + private void createCombinedViewOn12(SQLiteDatabase db) { + debug("Creating " + VIEW_COMBINED + " view"); + + db.execSQL("CREATE VIEW IF NOT EXISTS " + VIEW_COMBINED + " AS" + + " SELECT " + Combined.BOOKMARK_ID + ", " + + Combined.HISTORY_ID + ", " + + // We need to return an _id column because CursorAdapter requires it for its + // default implementation for the getItemId() method. However, since + // we're not using this feature in the parts of the UI using this view, + // we can just use 0 for all rows. + "0 AS " + Combined._ID + ", " + + Combined.URL + ", " + + Combined.TITLE + ", " + + Combined.VISITS + ", " + + Combined.DISPLAY + ", " + + Combined.DATE_LAST_VISITED + + " FROM (" + + // Bookmarks without history. + " SELECT " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks._ID) + " AS " + Combined.BOOKMARK_ID + ", " + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.URL) + " AS " + Combined.URL + ", " + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TITLE) + " AS " + Combined.TITLE + ", " + + "CASE " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.PARENT) + " WHEN " + + Bookmarks.FIXED_READING_LIST_ID + " THEN " + Combined.DISPLAY_READER + " ELSE " + + Combined.DISPLAY_NORMAL + " END AS " + Combined.DISPLAY + ", " + + "-1 AS " + Combined.HISTORY_ID + ", " + + "-1 AS " + Combined.VISITS + ", " + + "-1 AS " + Combined.DATE_LAST_VISITED + + " FROM " + TABLE_BOOKMARKS + + " WHERE " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TYPE) + " = " + Bookmarks.TYPE_BOOKMARK + " AND " + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.IS_DELETED) + " = 0 AND " + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.URL) + + " NOT IN (SELECT " + History.URL + " FROM " + TABLE_HISTORY + ")" + + " UNION ALL" + + // History with and without bookmark. + " SELECT " + "CASE " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.IS_DELETED) + " WHEN 0 THEN " + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks._ID) + " ELSE NULL END AS " + Combined.BOOKMARK_ID + ", " + + qualifyColumn(TABLE_HISTORY, History.URL) + " AS " + Combined.URL + ", " + + // Prioritze bookmark titles over history titles, since the user may have + // customized the title for a bookmark. + "COALESCE(" + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TITLE) + ", " + + qualifyColumn(TABLE_HISTORY, History.TITLE) +")" + " AS " + Combined.TITLE + ", " + + // Only use DISPLAY_READER if the matching bookmark entry inside reading + // list folder is not marked as deleted. + "CASE " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.IS_DELETED) + " WHEN 0 THEN CASE " + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.PARENT) + " WHEN " + Bookmarks.FIXED_READING_LIST_ID + + " THEN " + Combined.DISPLAY_READER + " ELSE " + Combined.DISPLAY_NORMAL + " END ELSE " + + Combined.DISPLAY_NORMAL + " END AS " + Combined.DISPLAY + ", " + + qualifyColumn(TABLE_HISTORY, History._ID) + " AS " + Combined.HISTORY_ID + ", " + + qualifyColumn(TABLE_HISTORY, History.VISITS) + " AS " + Combined.VISITS + ", " + + qualifyColumn(TABLE_HISTORY, History.DATE_LAST_VISITED) + " AS " + Combined.DATE_LAST_VISITED + + " FROM " + TABLE_HISTORY + " LEFT OUTER JOIN " + TABLE_BOOKMARKS + + " ON " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.URL) + " = " + qualifyColumn(TABLE_HISTORY, History.URL) + + " WHERE " + qualifyColumn(TABLE_HISTORY, History.URL) + " IS NOT NULL AND " + + qualifyColumn(TABLE_HISTORY, History.IS_DELETED) + " = 0 AND (" + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TYPE) + " IS NULL OR " + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TYPE) + " = " + Bookmarks.TYPE_BOOKMARK + ") " + + ")"); + + debug("Creating " + Obsolete.VIEW_COMBINED_WITH_IMAGES + " view"); + + db.execSQL("CREATE VIEW IF NOT EXISTS " + Obsolete.VIEW_COMBINED_WITH_IMAGES + " AS" + + " SELECT *, " + + qualifyColumn(Obsolete.TABLE_IMAGES, Obsolete.Images.FAVICON) + " AS " + Combined.FAVICON + ", " + + qualifyColumn(Obsolete.TABLE_IMAGES, Obsolete.Images.THUMBNAIL) + " AS " + Obsolete.Combined.THUMBNAIL + + " FROM " + VIEW_COMBINED + " LEFT OUTER JOIN " + Obsolete.TABLE_IMAGES + + " ON " + Combined.URL + " = " + qualifyColumn(Obsolete.TABLE_IMAGES, Obsolete.Images.URL)); + } + + private void createCombinedViewOn13(SQLiteDatabase db) { + debug("Creating " + VIEW_COMBINED + " view"); + + db.execSQL("CREATE VIEW IF NOT EXISTS " + VIEW_COMBINED + " AS" + + " SELECT " + Combined.BOOKMARK_ID + ", " + + Combined.HISTORY_ID + ", " + + // We need to return an _id column because CursorAdapter requires it for its + // default implementation for the getItemId() method. However, since + // we're not using this feature in the parts of the UI using this view, + // we can just use 0 for all rows. + "0 AS " + Combined._ID + ", " + + Combined.URL + ", " + + Combined.TITLE + ", " + + Combined.VISITS + ", " + + Combined.DISPLAY + ", " + + Combined.DATE_LAST_VISITED + ", " + + Combined.FAVICON_ID + + " FROM (" + + // Bookmarks without history. + " SELECT " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks._ID) + " AS " + Combined.BOOKMARK_ID + ", " + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.URL) + " AS " + Combined.URL + ", " + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TITLE) + " AS " + Combined.TITLE + ", " + + "CASE " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.PARENT) + " WHEN " + + Bookmarks.FIXED_READING_LIST_ID + " THEN " + Combined.DISPLAY_READER + " ELSE " + + Combined.DISPLAY_NORMAL + " END AS " + Combined.DISPLAY + ", " + + "-1 AS " + Combined.HISTORY_ID + ", " + + "-1 AS " + Combined.VISITS + ", " + + "-1 AS " + Combined.DATE_LAST_VISITED + ", " + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.FAVICON_ID) + " AS " + Combined.FAVICON_ID + + " FROM " + TABLE_BOOKMARKS + + " WHERE " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TYPE) + " = " + Bookmarks.TYPE_BOOKMARK + " AND " + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.IS_DELETED) + " = 0 AND " + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.URL) + + " NOT IN (SELECT " + History.URL + " FROM " + TABLE_HISTORY + ")" + + " UNION ALL" + + // History with and without bookmark. + " SELECT " + "CASE " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.IS_DELETED) + " WHEN 0 THEN " + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks._ID) + " ELSE NULL END AS " + Combined.BOOKMARK_ID + ", " + + qualifyColumn(TABLE_HISTORY, History.URL) + " AS " + Combined.URL + ", " + + // Prioritize bookmark titles over history titles, since the user may have + // customized the title for a bookmark. + "COALESCE(" + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TITLE) + ", " + + qualifyColumn(TABLE_HISTORY, History.TITLE) +")" + " AS " + Combined.TITLE + ", " + + // Only use DISPLAY_READER if the matching bookmark entry inside reading + // list folder is not marked as deleted. + "CASE " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.IS_DELETED) + " WHEN 0 THEN CASE " + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.PARENT) + " WHEN " + Bookmarks.FIXED_READING_LIST_ID + + " THEN " + Combined.DISPLAY_READER + " ELSE " + Combined.DISPLAY_NORMAL + " END ELSE " + + Combined.DISPLAY_NORMAL + " END AS " + Combined.DISPLAY + ", " + + qualifyColumn(TABLE_HISTORY, History._ID) + " AS " + Combined.HISTORY_ID + ", " + + qualifyColumn(TABLE_HISTORY, History.VISITS) + " AS " + Combined.VISITS + ", " + + qualifyColumn(TABLE_HISTORY, History.DATE_LAST_VISITED) + " AS " + Combined.DATE_LAST_VISITED + ", " + + qualifyColumn(TABLE_HISTORY, History.FAVICON_ID) + " AS " + Combined.FAVICON_ID + + " FROM " + TABLE_HISTORY + " LEFT OUTER JOIN " + TABLE_BOOKMARKS + + " ON " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.URL) + " = " + qualifyColumn(TABLE_HISTORY, History.URL) + + " WHERE " + qualifyColumn(TABLE_HISTORY, History.URL) + " IS NOT NULL AND " + + qualifyColumn(TABLE_HISTORY, History.IS_DELETED) + " = 0 AND (" + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TYPE) + " IS NULL OR " + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TYPE) + " = " + Bookmarks.TYPE_BOOKMARK + ") " + + ")"); + + debug("Creating " + VIEW_COMBINED_WITH_FAVICONS + " view"); + + db.execSQL("CREATE VIEW IF NOT EXISTS " + VIEW_COMBINED_WITH_FAVICONS + " AS" + + " SELECT " + qualifyColumn(VIEW_COMBINED, "*") + ", " + + qualifyColumn(TABLE_FAVICONS, Favicons.URL) + " AS " + Combined.FAVICON_URL + ", " + + qualifyColumn(TABLE_FAVICONS, Favicons.DATA) + " AS " + Combined.FAVICON + + " FROM " + VIEW_COMBINED + " LEFT OUTER JOIN " + TABLE_FAVICONS + + " ON " + Combined.FAVICON_ID + " = " + qualifyColumn(TABLE_FAVICONS, Favicons._ID)); + } + + private void createCombinedViewOn16(SQLiteDatabase db) { + debug("Creating " + VIEW_COMBINED + " view"); + + db.execSQL("CREATE VIEW IF NOT EXISTS " + VIEW_COMBINED + " AS" + + " SELECT " + Combined.BOOKMARK_ID + ", " + + Combined.HISTORY_ID + ", " + + // We need to return an _id column because CursorAdapter requires it for its + // default implementation for the getItemId() method. However, since + // we're not using this feature in the parts of the UI using this view, + // we can just use 0 for all rows. + "0 AS " + Combined._ID + ", " + + Combined.URL + ", " + + Combined.TITLE + ", " + + Combined.VISITS + ", " + + Combined.DISPLAY + ", " + + Combined.DATE_LAST_VISITED + ", " + + Combined.FAVICON_ID + + " FROM (" + + // Bookmarks without history. + " SELECT " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks._ID) + " AS " + Combined.BOOKMARK_ID + ", " + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.URL) + " AS " + Combined.URL + ", " + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TITLE) + " AS " + Combined.TITLE + ", " + + "CASE " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.PARENT) + " WHEN " + + Bookmarks.FIXED_READING_LIST_ID + " THEN " + Combined.DISPLAY_READER + " ELSE " + + Combined.DISPLAY_NORMAL + " END AS " + Combined.DISPLAY + ", " + + "-1 AS " + Combined.HISTORY_ID + ", " + + "-1 AS " + Combined.VISITS + ", " + + "-1 AS " + Combined.DATE_LAST_VISITED + ", " + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.FAVICON_ID) + " AS " + Combined.FAVICON_ID + + " FROM " + TABLE_BOOKMARKS + + " WHERE " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TYPE) + " = " + Bookmarks.TYPE_BOOKMARK + " AND " + + // Ignore pinned bookmarks. + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.PARENT) + " <> " + Bookmarks.FIXED_PINNED_LIST_ID + " AND " + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.IS_DELETED) + " = 0 AND " + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.URL) + + " NOT IN (SELECT " + History.URL + " FROM " + TABLE_HISTORY + ")" + + " UNION ALL" + + // History with and without bookmark. + " SELECT " + "CASE " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.IS_DELETED) + " WHEN 0 THEN " + + // Give pinned bookmarks a NULL ID so that they're not treated as bookmarks. We can't + // completely ignore them here because they're joined with history entries we care about. + "CASE " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.PARENT) + " WHEN " + + Bookmarks.FIXED_PINNED_LIST_ID + " THEN NULL ELSE " + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks._ID) + " END " + + "ELSE NULL END AS " + Combined.BOOKMARK_ID + ", " + + qualifyColumn(TABLE_HISTORY, History.URL) + " AS " + Combined.URL + ", " + + // Prioritize bookmark titles over history titles, since the user may have + // customized the title for a bookmark. + "COALESCE(" + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TITLE) + ", " + + qualifyColumn(TABLE_HISTORY, History.TITLE) +")" + " AS " + Combined.TITLE + ", " + + // Only use DISPLAY_READER if the matching bookmark entry inside reading + // list folder is not marked as deleted. + "CASE " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.IS_DELETED) + " WHEN 0 THEN CASE " + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.PARENT) + " WHEN " + Bookmarks.FIXED_READING_LIST_ID + + " THEN " + Combined.DISPLAY_READER + " ELSE " + Combined.DISPLAY_NORMAL + " END ELSE " + + Combined.DISPLAY_NORMAL + " END AS " + Combined.DISPLAY + ", " + + qualifyColumn(TABLE_HISTORY, History._ID) + " AS " + Combined.HISTORY_ID + ", " + + qualifyColumn(TABLE_HISTORY, History.VISITS) + " AS " + Combined.VISITS + ", " + + qualifyColumn(TABLE_HISTORY, History.DATE_LAST_VISITED) + " AS " + Combined.DATE_LAST_VISITED + ", " + + qualifyColumn(TABLE_HISTORY, History.FAVICON_ID) + " AS " + Combined.FAVICON_ID + + " FROM " + TABLE_HISTORY + " LEFT OUTER JOIN " + TABLE_BOOKMARKS + + " ON " + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.URL) + " = " + qualifyColumn(TABLE_HISTORY, History.URL) + + " WHERE " + qualifyColumn(TABLE_HISTORY, History.URL) + " IS NOT NULL AND " + + qualifyColumn(TABLE_HISTORY, History.IS_DELETED) + " = 0 AND (" + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TYPE) + " IS NULL OR " + + qualifyColumn(TABLE_BOOKMARKS, Bookmarks.TYPE) + " = " + Bookmarks.TYPE_BOOKMARK + ") " + + ")"); + + debug("Creating " + VIEW_COMBINED_WITH_FAVICONS + " view"); + + db.execSQL("CREATE VIEW IF NOT EXISTS " + VIEW_COMBINED_WITH_FAVICONS + " AS" + + " SELECT " + qualifyColumn(VIEW_COMBINED, "*") + ", " + + qualifyColumn(TABLE_FAVICONS, Favicons.URL) + " AS " + Combined.FAVICON_URL + ", " + + qualifyColumn(TABLE_FAVICONS, Favicons.DATA) + " AS " + Combined.FAVICON + + " FROM " + VIEW_COMBINED + " LEFT OUTER JOIN " + TABLE_FAVICONS + + " ON " + Combined.FAVICON_ID + " = " + qualifyColumn(TABLE_FAVICONS, Favicons._ID)); + } + + @Override + public void onCreate(SQLiteDatabase db) { + debug("Creating browser.db: " + db.getPath()); + + createBookmarksTableOn13(db); + createHistoryTableOn13(db); + createFaviconsTable(db); + createThumbnailsTable(db); + + createBookmarksWithFaviconsView(db); + createHistoryWithFaviconsView(db); + createCombinedViewOn16(db); + + createOrUpdateSpecialFolder(db, Bookmarks.PLACES_FOLDER_GUID, + R.string.bookmarks_folder_places, 0); + + createOrUpdateAllSpecialFolders(db); + + // Create distribution bookmarks before our own default bookmarks + int pos = createDistributionBookmarks(db); + createDefaultBookmarks(db, pos); + } + + private String getLocalizedProperty(JSONObject bookmark, String property, Locale locale) throws JSONException { + // Try the full locale + String fullLocale = property + "." + locale.toString(); + if (bookmark.has(fullLocale)) { + return bookmark.getString(fullLocale); + } + // Try without a variant + if (!TextUtils.isEmpty(locale.getVariant())) { + String noVariant = fullLocale.substring(0, fullLocale.lastIndexOf("_")); + if (bookmark.has(noVariant)) { + return bookmark.getString(noVariant); + } + } + // Try just the language + String lang = property + "." + locale.getLanguage(); + if (bookmark.has(lang)) { + return bookmark.getString(lang); + } + // Default to the non-localized property name + return bookmark.getString(property); + } + + // Returns the number of bookmarks inserted in the db + private int createDistributionBookmarks(SQLiteDatabase db) { + JSONArray bookmarks = Distribution.getBookmarks(mContext); + if (bookmarks == null) { + return 0; + } + + Locale locale = Locale.getDefault(); + int pos = 0; + Integer mobileFolderId = getMobileFolderId(db); + if (mobileFolderId == null) { + Log.e(LOGTAG, "Error creating distribution bookmarks: mobileFolderId is null"); + return 0; + } + + for (int i = 0; i < bookmarks.length(); i++) { + try { + final JSONObject bookmark = bookmarks.getJSONObject(i); + + String title = getLocalizedProperty(bookmark, "title", locale); + final String url = getLocalizedProperty(bookmark, "url", locale); + createBookmark(db, title, url, pos, mobileFolderId); + + if (bookmark.has("pinned")) { + try { + // Create a fake bookmark in the hidden pinned folder to pin bookmark + // to about:home top sites. Pass pos as the pinned position to pin + // sites in the order that bookmarks are specified in bookmarks.json. + if (bookmark.getBoolean("pinned")) { + createBookmark(db, title, url, pos, Bookmarks.FIXED_PINNED_LIST_ID); + } + } catch (JSONException e) { + Log.e(LOGTAG, "Error pinning bookmark to top sites", e); + } + } + + pos++; + + // return early if there is no icon for this bookmark + if (!bookmark.has("icon")) { + continue; + } + + // create icons in a separate thread to avoid blocking about:home on startup + ThreadUtils.postToBackgroundThread(new Runnable() { + @Override + public void run() { + SQLiteDatabase db = getWritableDatabase(); + try { + String iconData = bookmark.getString("icon"); + Bitmap icon = BitmapUtils.getBitmapFromDataURI(iconData); + if (icon != null) { + createFavicon(db, url, icon); + } + } catch (JSONException e) { + Log.e(LOGTAG, "Error creating distribution bookmark icon", e); + } + } + }); + } catch (JSONException e) { + Log.e(LOGTAG, "Error creating distribution bookmark", e); + } + } + return pos; + } + + // Inserts default bookmarks, starting at a specified position + private void createDefaultBookmarks(SQLiteDatabase db, int pos) { + Class stringsClass = R.string.class; + Field[] fields = stringsClass.getFields(); + Pattern p = Pattern.compile("^bookmarkdefaults_title_"); + + Integer mobileFolderId = getMobileFolderId(db); + if (mobileFolderId == null) { + Log.e(LOGTAG, "Error creating default bookmarks: mobileFolderId is null"); + return; + } + + for (int i = 0; i < fields.length; i++) { + final String name = fields[i].getName(); + Matcher m = p.matcher(name); + if (!m.find()) { + continue; + } + try { + int titleid = fields[i].getInt(null); + String title = mContext.getString(titleid); + + Field urlField = stringsClass.getField(name.replace("_title_", "_url_")); + int urlId = urlField.getInt(null); + final String url = mContext.getString(urlId); + createBookmark(db, title, url, pos, mobileFolderId); + + // create icons in a separate thread to avoid blocking about:home on startup + ThreadUtils.postToBackgroundThread(new Runnable() { + @Override + public void run() { + SQLiteDatabase db = getWritableDatabase(); + Bitmap icon = getDefaultFaviconFromPath(name); + if (icon == null) { + icon = getDefaultFaviconFromDrawable(name); + } + if (icon != null) { + createFavicon(db, url, icon); + } + } + }); + pos++; + } catch (java.lang.IllegalAccessException ex) { + Log.e(LOGTAG, "Can't create bookmark " + name, ex); + } catch (java.lang.NoSuchFieldException ex) { + Log.e(LOGTAG, "Can't create bookmark " + name, ex); + } + } + } + + private void createBookmark(SQLiteDatabase db, String title, String url, int pos, int parent) { + ContentValues bookmarkValues = new ContentValues(); + bookmarkValues.put(Bookmarks.PARENT, parent); + + long now = System.currentTimeMillis(); + bookmarkValues.put(Bookmarks.DATE_CREATED, now); + bookmarkValues.put(Bookmarks.DATE_MODIFIED, now); + + bookmarkValues.put(Bookmarks.TITLE, title); + bookmarkValues.put(Bookmarks.URL, url); + bookmarkValues.put(Bookmarks.GUID, Utils.generateGuid()); + bookmarkValues.put(Bookmarks.POSITION, pos); + db.insertOrThrow(TABLE_BOOKMARKS, Bookmarks.TITLE, bookmarkValues); + } + + private void createFavicon(SQLiteDatabase db, String url, Bitmap icon) { + ByteArrayOutputStream stream = new ByteArrayOutputStream(); + + ContentValues iconValues = new ContentValues(); + iconValues.put(Favicons.PAGE_URL, url); + + byte[] data = null; + if (icon.compress(Bitmap.CompressFormat.PNG, 100, stream)) { + data = stream.toByteArray(); + } else { + Log.w(LOGTAG, "Favicon compression failed."); + } + iconValues.put(Favicons.DATA, data); + + insertFavicon(db, iconValues); + } + + private Bitmap getDefaultFaviconFromPath(String name) { + Class stringClass = R.string.class; + try { + // Look for a drawable with the id R.drawable.bookmarkdefaults_favicon_* + Field faviconField = stringClass.getField(name.replace("_title_", "_favicon_")); + if (faviconField == null) { + return null; + } + int faviconId = faviconField.getInt(null); + String path = mContext.getString(faviconId); + + String apkPath = mContext.getPackageResourcePath(); + File apkFile = new File(apkPath); + String bitmapPath = "jar:jar:" + apkFile.toURI() + "!/" + AppConstants.OMNIJAR_NAME + "!/" + path; + return GeckoJarReader.getBitmap(mContext.getResources(), bitmapPath); + } catch (java.lang.IllegalAccessException ex) { + Log.e(LOGTAG, "[Path] Can't create favicon " + name, ex); + } catch (java.lang.NoSuchFieldException ex) { + // If the field does not exist, that means we intend to load via a drawable + } + return null; + } + + private Bitmap getDefaultFaviconFromDrawable(String name) { + Class drawablesClass = R.drawable.class; + try { + // Look for a drawable with the id R.drawable.bookmarkdefaults_favicon_* + Field faviconField = drawablesClass.getField(name.replace("_title_", "_favicon_")); + if (faviconField == null) { + return null; + } + int faviconId = faviconField.getInt(null); + return BitmapUtils.decodeResource(mContext, faviconId); + } catch (java.lang.IllegalAccessException ex) { + Log.e(LOGTAG, "[Drawable] Can't create favicon " + name, ex); + } catch (java.lang.NoSuchFieldException ex) { + // If the field does not exist, that means we intend to load via a file path + } + return null; + } + + private void createOrUpdateAllSpecialFolders(SQLiteDatabase db) { + createOrUpdateSpecialFolder(db, Bookmarks.MOBILE_FOLDER_GUID, + R.string.bookmarks_folder_mobile, 0); + createOrUpdateSpecialFolder(db, Bookmarks.TOOLBAR_FOLDER_GUID, + R.string.bookmarks_folder_toolbar, 1); + createOrUpdateSpecialFolder(db, Bookmarks.MENU_FOLDER_GUID, + R.string.bookmarks_folder_menu, 2); + createOrUpdateSpecialFolder(db, Bookmarks.TAGS_FOLDER_GUID, + R.string.bookmarks_folder_tags, 3); + createOrUpdateSpecialFolder(db, Bookmarks.UNFILED_FOLDER_GUID, + R.string.bookmarks_folder_unfiled, 4); + createOrUpdateSpecialFolder(db, Bookmarks.READING_LIST_FOLDER_GUID, + R.string.bookmarks_folder_reading_list, 5); + createOrUpdateSpecialFolder(db, Bookmarks.PINNED_FOLDER_GUID, + R.string.bookmarks_folder_pinned, 6); + } + + private void createOrUpdateSpecialFolder(SQLiteDatabase db, + String guid, int titleId, int position) { + ContentValues values = new ContentValues(); + values.put(Bookmarks.GUID, guid); + values.put(Bookmarks.TYPE, Bookmarks.TYPE_FOLDER); + values.put(Bookmarks.POSITION, position); + + if (guid.equals(Bookmarks.PLACES_FOLDER_GUID)) + values.put(Bookmarks._ID, Bookmarks.FIXED_ROOT_ID); + else if (guid.equals(Bookmarks.READING_LIST_FOLDER_GUID)) + values.put(Bookmarks._ID, Bookmarks.FIXED_READING_LIST_ID); + else if (guid.equals(Bookmarks.PINNED_FOLDER_GUID)) + values.put(Bookmarks._ID, Bookmarks.FIXED_PINNED_LIST_ID); + + // Set the parent to 0, which sync assumes is the root + values.put(Bookmarks.PARENT, Bookmarks.FIXED_ROOT_ID); + + String title = mContext.getResources().getString(titleId); + values.put(Bookmarks.TITLE, title); + + long now = System.currentTimeMillis(); + values.put(Bookmarks.DATE_CREATED, now); + values.put(Bookmarks.DATE_MODIFIED, now); + + int updated = db.update(TABLE_BOOKMARKS, values, + Bookmarks.GUID + " = ?", + new String[] { guid }); + + if (updated == 0) { + db.insert(TABLE_BOOKMARKS, Bookmarks.GUID, values); + debug("Inserted special folder: " + guid); + } else { + debug("Updated special folder: " + guid); + } + } + + private boolean isSpecialFolder(ContentValues values) { + String guid = values.getAsString(Bookmarks.GUID); + if (guid == null) + return false; + + return guid.equals(Bookmarks.MOBILE_FOLDER_GUID) || + guid.equals(Bookmarks.MENU_FOLDER_GUID) || + guid.equals(Bookmarks.TOOLBAR_FOLDER_GUID) || + guid.equals(Bookmarks.UNFILED_FOLDER_GUID) || + guid.equals(Bookmarks.TAGS_FOLDER_GUID); + } + + private void migrateBookmarkFolder(SQLiteDatabase db, int folderId, + BookmarkMigrator migrator) { + Cursor c = null; + + debug("Migrating bookmark folder with id = " + folderId); + + String selection = Bookmarks.PARENT + " = " + folderId; + String[] selectionArgs = null; + + boolean isRootFolder = (folderId == Bookmarks.FIXED_ROOT_ID); + + // If we're loading the root folder, we have to account for + // any previously created special folder that was created without + // setting a parent id (e.g. mobile folder) and making sure we're + // not adding any infinite recursion as root's parent is root itself. + if (isRootFolder) { + selection = Bookmarks.GUID + " != ?" + " AND (" + + selection + " OR " + Bookmarks.PARENT + " = NULL)"; + selectionArgs = new String[] { Bookmarks.PLACES_FOLDER_GUID }; + } + + List subFolders = new ArrayList(); + List invalidSpecialEntries = new ArrayList(); + + try { + c = db.query(TABLE_BOOKMARKS_TMP, + null, + selection, + selectionArgs, + null, null, null); + + // The key point here is that bookmarks should be added in + // parent order to avoid any problems with the foreign key + // in Bookmarks.PARENT. + while (c.moveToNext()) { + ContentValues values = new ContentValues(); + + // We're using a null projection in the query which + // means we're getting all columns from the table. + // It's safe to simply transform the row into the + // values to be inserted on the new table. + DatabaseUtils.cursorRowToContentValues(c, values); + + boolean isSpecialFolder = isSpecialFolder(values); + + // The mobile folder used to be created with PARENT = NULL. + // We want fix that here. + if (values.getAsLong(Bookmarks.PARENT) == null && isSpecialFolder) + values.put(Bookmarks.PARENT, Bookmarks.FIXED_ROOT_ID); + + if (isRootFolder && !isSpecialFolder) { + invalidSpecialEntries.add(values); + continue; + } + + if (migrator != null) + migrator.updateForNewTable(values); + + debug("Migrating bookmark: " + values.getAsString(Bookmarks.TITLE)); + db.insert(TABLE_BOOKMARKS, Bookmarks.URL, values); + + Integer type = values.getAsInteger(Bookmarks.TYPE); + if (type != null && type == Bookmarks.TYPE_FOLDER) + subFolders.add(values.getAsInteger(Bookmarks._ID)); + } + } finally { + if (c != null) + c.close(); + } + + // At this point is safe to assume that the mobile folder is + // in the new table given that we've always created it on + // database creation time. + final int nInvalidSpecialEntries = invalidSpecialEntries.size(); + if (nInvalidSpecialEntries > 0) { + Integer mobileFolderId = getMobileFolderId(db); + if (mobileFolderId == null) { + Log.e(LOGTAG, "Error migrating invalid special folder entries: mobile folder id is null"); + return; + } + + debug("Found " + nInvalidSpecialEntries + " invalid special folder entries"); + for (int i = 0; i < nInvalidSpecialEntries; i++) { + ContentValues values = invalidSpecialEntries.get(i); + values.put(Bookmarks.PARENT, mobileFolderId); + + db.insert(TABLE_BOOKMARKS, Bookmarks.URL, values); + } + } + + final int nSubFolders = subFolders.size(); + for (int i = 0; i < nSubFolders; i++) { + int subFolderId = subFolders.get(i); + migrateBookmarkFolder(db, subFolderId, migrator); + } + } + + private void migrateBookmarksTable(SQLiteDatabase db) { + migrateBookmarksTable(db, null); + } + + private void migrateBookmarksTable(SQLiteDatabase db, BookmarkMigrator migrator) { + debug("Renaming bookmarks table to " + TABLE_BOOKMARKS_TMP); + db.execSQL("ALTER TABLE " + TABLE_BOOKMARKS + + " RENAME TO " + TABLE_BOOKMARKS_TMP); + + debug("Dropping views and indexes related to " + TABLE_BOOKMARKS); + db.execSQL("DROP VIEW IF EXISTS " + Obsolete.VIEW_BOOKMARKS_WITH_IMAGES); + + db.execSQL("DROP INDEX IF EXISTS bookmarks_url_index"); + db.execSQL("DROP INDEX IF EXISTS bookmarks_type_deleted_index"); + db.execSQL("DROP INDEX IF EXISTS bookmarks_guid_index"); + db.execSQL("DROP INDEX IF EXISTS bookmarks_modified_index"); + + createBookmarksTable(db); + createBookmarksWithImagesView(db); + + createOrUpdateSpecialFolder(db, Bookmarks.PLACES_FOLDER_GUID, + R.string.bookmarks_folder_places, 0); + + migrateBookmarkFolder(db, Bookmarks.FIXED_ROOT_ID, migrator); + + // Ensure all special folders exist and have the + // right folder hierarchy. + createOrUpdateAllSpecialFolders(db); + + debug("Dropping bookmarks temporary table"); + db.execSQL("DROP TABLE IF EXISTS " + TABLE_BOOKMARKS_TMP); + } + + + private void migrateHistoryTable(SQLiteDatabase db) { + debug("Renaming history table to " + TABLE_HISTORY_TMP); + db.execSQL("ALTER TABLE " + TABLE_HISTORY + + " RENAME TO " + TABLE_HISTORY_TMP); + + debug("Dropping views and indexes related to " + TABLE_HISTORY); + db.execSQL("DROP VIEW IF EXISTS " + Obsolete.VIEW_HISTORY_WITH_IMAGES); + db.execSQL("DROP VIEW IF EXISTS " + Obsolete.VIEW_COMBINED_WITH_IMAGES); + + db.execSQL("DROP INDEX IF EXISTS history_url_index"); + db.execSQL("DROP INDEX IF EXISTS history_guid_index"); + db.execSQL("DROP INDEX IF EXISTS history_modified_index"); + db.execSQL("DROP INDEX IF EXISTS history_visited_index"); + + createHistoryTable(db); + createHistoryWithImagesView(db); + createCombinedWithImagesView(db); + + db.execSQL("INSERT INTO " + TABLE_HISTORY + " SELECT * FROM " + TABLE_HISTORY_TMP); + + debug("Dropping history temporary table"); + db.execSQL("DROP TABLE IF EXISTS " + TABLE_HISTORY_TMP); + } + + private void migrateImagesTable(SQLiteDatabase db) { + debug("Renaming images table to " + TABLE_IMAGES_TMP); + db.execSQL("ALTER TABLE " + Obsolete.TABLE_IMAGES + + " RENAME TO " + TABLE_IMAGES_TMP); + + debug("Dropping views and indexes related to " + Obsolete.TABLE_IMAGES); + db.execSQL("DROP VIEW IF EXISTS " + Obsolete.VIEW_HISTORY_WITH_IMAGES); + db.execSQL("DROP VIEW IF EXISTS " + Obsolete.VIEW_COMBINED_WITH_IMAGES); + + db.execSQL("DROP INDEX IF EXISTS images_url_index"); + db.execSQL("DROP INDEX IF EXISTS images_guid_index"); + db.execSQL("DROP INDEX IF EXISTS images_modified_index"); + + createImagesTable(db); + createHistoryWithImagesView(db); + createCombinedWithImagesView(db); + + db.execSQL("INSERT INTO " + Obsolete.TABLE_IMAGES + " SELECT * FROM " + TABLE_IMAGES_TMP); + + debug("Dropping images temporary table"); + db.execSQL("DROP TABLE IF EXISTS " + TABLE_IMAGES_TMP); + } + + private void upgradeDatabaseFrom1to2(SQLiteDatabase db) { + migrateBookmarksTable(db); + } + + private void upgradeDatabaseFrom2to3(SQLiteDatabase db) { + debug("Dropping view: " + Obsolete.VIEW_BOOKMARKS_WITH_IMAGES); + db.execSQL("DROP VIEW IF EXISTS " + Obsolete.VIEW_BOOKMARKS_WITH_IMAGES); + + createBookmarksWithImagesView(db); + + debug("Dropping view: " + Obsolete.VIEW_HISTORY_WITH_IMAGES); + db.execSQL("DROP VIEW IF EXISTS " + Obsolete.VIEW_HISTORY_WITH_IMAGES); + + createHistoryWithImagesView(db); + } + + private void upgradeDatabaseFrom3to4(SQLiteDatabase db) { + migrateBookmarksTable(db, new BookmarkMigrator3to4()); + } + + private void upgradeDatabaseFrom4to5(SQLiteDatabase db) { + createCombinedWithImagesView(db); + } + + private void upgradeDatabaseFrom5to6(SQLiteDatabase db) { + debug("Dropping view: " + Obsolete.VIEW_COMBINED_WITH_IMAGES); + db.execSQL("DROP VIEW IF EXISTS " + Obsolete.VIEW_COMBINED_WITH_IMAGES); + + createCombinedWithImagesView(db); + } + + private void upgradeDatabaseFrom6to7(SQLiteDatabase db) { + debug("Removing history visits with NULL GUIDs"); + db.execSQL("DELETE FROM " + TABLE_HISTORY + " WHERE " + History.GUID + " IS NULL"); + + debug("Update images with NULL GUIDs"); + String[] columns = new String[] { Obsolete.Images._ID }; + Cursor cursor = null; + try { + cursor = db.query(Obsolete.TABLE_IMAGES, columns, Obsolete.Images.GUID + " IS NULL", null, null ,null, null, null); + ContentValues values = new ContentValues(); + if (cursor.moveToFirst()) { + do { + values.put(Obsolete.Images.GUID, Utils.generateGuid()); + db.update(Obsolete.TABLE_IMAGES, values, Obsolete.Images._ID + " = ?", new String[] { + cursor.getString(cursor.getColumnIndexOrThrow(Obsolete.Images._ID)) + }); + } while (cursor.moveToNext()); + } + } finally { + if (cursor != null) + cursor.close(); + } + + migrateBookmarksTable(db); + migrateHistoryTable(db); + migrateImagesTable(db); + } + + private void upgradeDatabaseFrom7to8(SQLiteDatabase db) { + debug("Combining history entries with the same URL"); + + final String TABLE_DUPES = "duped_urls"; + final String TOTAL = "total"; + final String LATEST = "latest"; + final String WINNER = "winner"; + + db.execSQL("CREATE TEMP TABLE " + TABLE_DUPES + " AS" + + " SELECT " + History.URL + ", " + + "SUM(" + History.VISITS + ") AS " + TOTAL + ", " + + "MAX(" + History.DATE_MODIFIED + ") AS " + LATEST + ", " + + "MAX(" + History._ID + ") AS " + WINNER + + " FROM " + TABLE_HISTORY + + " GROUP BY " + History.URL + + " HAVING count(" + History.URL + ") > 1"); + + db.execSQL("CREATE UNIQUE INDEX " + TABLE_DUPES + "_url_index ON " + + TABLE_DUPES + " (" + History.URL + ")"); + + final String fromClause = " FROM " + TABLE_DUPES + " WHERE " + + qualifyColumn(TABLE_DUPES, History.URL) + " = " + + qualifyColumn(TABLE_HISTORY, History.URL); + + db.execSQL("UPDATE " + TABLE_HISTORY + + " SET " + History.VISITS + " = (SELECT " + TOTAL + fromClause + "), " + + History.DATE_MODIFIED + " = (SELECT " + LATEST + fromClause + "), " + + History.IS_DELETED + " = " + + "(" + History._ID + " <> (SELECT " + WINNER + fromClause + "))" + + " WHERE " + History.URL + " IN (SELECT " + History.URL + " FROM " + TABLE_DUPES + ")"); + + db.execSQL("DROP TABLE " + TABLE_DUPES); + } + + private void upgradeDatabaseFrom8to9(SQLiteDatabase db) { + createOrUpdateSpecialFolder(db, Bookmarks.READING_LIST_FOLDER_GUID, + R.string.bookmarks_folder_reading_list, 5); + + debug("Dropping view: " + Obsolete.VIEW_COMBINED_WITH_IMAGES); + db.execSQL("DROP VIEW IF EXISTS " + Obsolete.VIEW_COMBINED_WITH_IMAGES); + + createCombinedWithImagesViewOn9(db); + } + + private void upgradeDatabaseFrom9to10(SQLiteDatabase db) { + debug("Dropping view: " + Obsolete.VIEW_COMBINED_WITH_IMAGES); + db.execSQL("DROP VIEW IF EXISTS " + Obsolete.VIEW_COMBINED_WITH_IMAGES); + + createCombinedWithImagesViewOn10(db); + } + + private void upgradeDatabaseFrom10to11(SQLiteDatabase db) { + debug("Dropping view: " + Obsolete.VIEW_COMBINED_WITH_IMAGES); + db.execSQL("DROP VIEW IF EXISTS " + Obsolete.VIEW_COMBINED_WITH_IMAGES); + + db.execSQL("CREATE INDEX bookmarks_type_deleted_index ON " + TABLE_BOOKMARKS + "(" + + Bookmarks.TYPE + ", " + Bookmarks.IS_DELETED + ")"); + + createCombinedWithImagesViewOn11(db); + } + + private void upgradeDatabaseFrom11to12(SQLiteDatabase db) { + debug("Dropping view: " + Obsolete.VIEW_COMBINED_WITH_IMAGES); + db.execSQL("DROP VIEW IF EXISTS " + Obsolete.VIEW_COMBINED_WITH_IMAGES); + + createCombinedViewOn12(db); + } + + private void upgradeDatabaseFrom12to13(SQLiteDatabase db) { + // Update images table with favicon URLs + SQLiteDatabase faviconsDb = null; + Cursor c = null; + try { + final String FAVICON_TABLE = "favicon_urls"; + final String FAVICON_URL = "favicon_url"; + final String FAVICON_PAGE = "page_url"; + + String dbPath = mContext.getDatabasePath(Obsolete.FAVICON_DB).getPath(); + faviconsDb = SQLiteDatabase.openDatabase(dbPath, null, SQLiteDatabase.OPEN_READONLY); + String[] columns = new String[] { FAVICON_URL, FAVICON_PAGE }; + c = faviconsDb.query(FAVICON_TABLE, columns, null, null, null, null, null, null); + int faviconIndex = c.getColumnIndexOrThrow(FAVICON_URL); + int pageIndex = c.getColumnIndexOrThrow(FAVICON_PAGE); + while (c.moveToNext()) { + ContentValues values = new ContentValues(1); + String faviconUrl = c.getString(faviconIndex); + String pageUrl = c.getString(pageIndex); + values.put(FAVICON_URL, faviconUrl); + db.update(Obsolete.TABLE_IMAGES, values, Obsolete.Images.URL + " = ?", new String[] { pageUrl }); + } + } catch (SQLException e) { + // If we can't read from the database for some reason, we won't + // be able to import the favicon URLs. This isn't a fatal + // error, so continue the upgrade. + Log.e(LOGTAG, "Exception importing from " + Obsolete.FAVICON_DB, e); + } finally { + if (c != null) + c.close(); + if (faviconsDb != null) + faviconsDb.close(); + } + + createFaviconsTable(db); + + // Import favicons into the favicons table + db.execSQL("ALTER TABLE " + TABLE_HISTORY + + " ADD COLUMN " + History.FAVICON_ID + " INTEGER"); + db.execSQL("ALTER TABLE " + TABLE_BOOKMARKS + + " ADD COLUMN " + Bookmarks.FAVICON_ID + " INTEGER"); + + try { + c = db.query(Obsolete.TABLE_IMAGES, + new String[] { + Obsolete.Images.URL, + Obsolete.Images.FAVICON_URL, + Obsolete.Images.FAVICON, + Obsolete.Images.DATE_MODIFIED, + Obsolete.Images.DATE_CREATED + }, + Obsolete.Images.FAVICON + " IS NOT NULL", + null, null, null, null); + + while (c.moveToNext()) { + long faviconId = -1; + int faviconUrlIndex = c.getColumnIndexOrThrow(Obsolete.Images.FAVICON_URL); + String faviconUrl = null; + if (!c.isNull(faviconUrlIndex)) { + faviconUrl = c.getString(faviconUrlIndex); + Cursor c2 = null; + try { + c2 = db.query(TABLE_FAVICONS, + new String[] { Favicons._ID }, + Favicons.URL + " = ?", + new String[] { faviconUrl }, + null, null, null); + if (c2.moveToFirst()) { + faviconId = c2.getLong(c2.getColumnIndexOrThrow(Favicons._ID)); + } + } finally { + if (c2 != null) + c2.close(); + } + } + + if (faviconId == -1) { + ContentValues values = new ContentValues(4); + values.put(Favicons.URL, faviconUrl); + values.put(Favicons.DATA, c.getBlob(c.getColumnIndexOrThrow(Obsolete.Images.FAVICON))); + values.put(Favicons.DATE_MODIFIED, c.getLong(c.getColumnIndexOrThrow(Obsolete.Images.DATE_MODIFIED))); + values.put(Favicons.DATE_CREATED, c.getLong(c.getColumnIndexOrThrow(Obsolete.Images.DATE_CREATED))); + faviconId = db.insert(TABLE_FAVICONS, null, values); + } + + ContentValues values = new ContentValues(1); + values.put(FaviconColumns.FAVICON_ID, faviconId); + db.update(TABLE_HISTORY, values, History.URL + " = ?", + new String[] { c.getString(c.getColumnIndexOrThrow(Obsolete.Images.URL)) }); + db.update(TABLE_BOOKMARKS, values, Bookmarks.URL + " = ?", + new String[] { c.getString(c.getColumnIndexOrThrow(Obsolete.Images.URL)) }); + } + } finally { + if (c != null) + c.close(); + } + + createThumbnailsTable(db); + + // Import thumbnails into the thumbnails table + db.execSQL("INSERT INTO " + TABLE_THUMBNAILS + " (" + + Thumbnails.URL + ", " + + Thumbnails.DATA + ") " + + "SELECT " + Obsolete.Images.URL + ", " + Obsolete.Images.THUMBNAIL + + " FROM " + Obsolete.TABLE_IMAGES + + " WHERE " + Obsolete.Images.THUMBNAIL + " IS NOT NULL"); + + db.execSQL("DROP VIEW IF EXISTS " + Obsolete.VIEW_BOOKMARKS_WITH_IMAGES); + db.execSQL("DROP VIEW IF EXISTS " + Obsolete.VIEW_HISTORY_WITH_IMAGES); + db.execSQL("DROP VIEW IF EXISTS " + Obsolete.VIEW_COMBINED_WITH_IMAGES); + db.execSQL("DROP VIEW IF EXISTS " + VIEW_COMBINED); + + createBookmarksWithFaviconsView(db); + createHistoryWithFaviconsView(db); + createCombinedViewOn13(db); + + db.execSQL("DROP TABLE IF EXISTS " + Obsolete.TABLE_IMAGES); + } + + private void upgradeDatabaseFrom13to14(SQLiteDatabase db) { + createOrUpdateSpecialFolder(db, Bookmarks.PINNED_FOLDER_GUID, + R.string.bookmarks_folder_pinned, 6); + } + + private void upgradeDatabaseFrom14to15(SQLiteDatabase db) { + Cursor c = null; + try { + // Get all the pinned bookmarks + c = db.query(TABLE_BOOKMARKS, + new String[] { Bookmarks._ID, Bookmarks.URL }, + Bookmarks.PARENT + " = ?", + new String[] { Integer.toString(Bookmarks.FIXED_PINNED_LIST_ID) }, + null, null, null); + + while (c.moveToNext()) { + // Check if this URL can be parsed as a URI with a valid scheme. + String url = c.getString(c.getColumnIndexOrThrow(Bookmarks.URL)); + if (Uri.parse(url).getScheme() != null) { + continue; + } + + // If it can't, update the URL to be an encoded "user-entered" value. + ContentValues values = new ContentValues(1); + String newUrl = Uri.fromParts("user-entered", url, null).toString(); + values.put(Bookmarks.URL, newUrl); + db.update(TABLE_BOOKMARKS, values, Bookmarks._ID + " = ?", + new String[] { Integer.toString(c.getInt(c.getColumnIndexOrThrow(Bookmarks._ID))) }); + } + } finally { + if (c != null) { + c.close(); + } + } + } + + private void upgradeDatabaseFrom15to16(SQLiteDatabase db) { + db.execSQL("DROP VIEW IF EXISTS " + VIEW_COMBINED); + db.execSQL("DROP VIEW IF EXISTS " + VIEW_COMBINED_WITH_FAVICONS); + + createCombinedViewOn16(db); + } + + private void upgradeDatabaseFrom16to17(SQLiteDatabase db) { + // Purge any 0-byte favicons/thumbnails + try { + db.execSQL("DELETE FROM " + TABLE_FAVICONS + + " WHERE length(" + Favicons.DATA + ") = 0"); + db.execSQL("DELETE FROM " + TABLE_THUMBNAILS + + " WHERE length(" + Thumbnails.DATA + ") = 0"); + } catch (SQLException e) { + Log.e(LOGTAG, "Error purging invalid favicons or thumbnails", e); + } + } + + @Override + public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { + debug("Upgrading browser.db: " + db.getPath() + " from " + + oldVersion + " to " + newVersion); + + // We have to do incremental upgrades until we reach the current + // database schema version. + for (int v = oldVersion + 1; v <= newVersion; v++) { + switch(v) { + case 2: + upgradeDatabaseFrom1to2(db); + break; + + case 3: + upgradeDatabaseFrom2to3(db); + break; + + case 4: + upgradeDatabaseFrom3to4(db); + break; + + case 5: + upgradeDatabaseFrom4to5(db); + break; + + case 6: + upgradeDatabaseFrom5to6(db); + break; + + case 7: + upgradeDatabaseFrom6to7(db); + break; + + case 8: + upgradeDatabaseFrom7to8(db); + break; + + case 9: + upgradeDatabaseFrom8to9(db); + break; + + case 10: + upgradeDatabaseFrom9to10(db); + break; + + case 11: + upgradeDatabaseFrom10to11(db); + break; + + case 12: + upgradeDatabaseFrom11to12(db); + break; + + case 13: + upgradeDatabaseFrom12to13(db); + break; + + case 14: + upgradeDatabaseFrom13to14(db); + break; + + case 15: + upgradeDatabaseFrom14to15(db); + break; + + case 16: + upgradeDatabaseFrom15to16(db); + break; + + case 17: + upgradeDatabaseFrom16to17(db); + break; + } + } + + // If an upgrade after 12->13 fails, the entire upgrade is rolled + // back, but we can't undo the deletion of favicon_urls.db if we + // delete this in step 13; therefore, we wait until all steps are + // complete before removing it. + if (oldVersion < 13 && newVersion >= 13 + && mContext.getDatabasePath(Obsolete.FAVICON_DB).exists() + && !mContext.deleteDatabase(Obsolete.FAVICON_DB)) { + throw new SQLException("Could not delete " + Obsolete.FAVICON_DB); + } + } + + @Override + public void onOpen(SQLiteDatabase db) { + debug("Opening browser.db: " + db.getPath()); + + Cursor cursor = null; + try { + cursor = db.rawQuery("PRAGMA foreign_keys=ON", null); + } finally { + if (cursor != null) + cursor.close(); + } + cursor = null; + try { + cursor = db.rawQuery("PRAGMA synchronous=NORMAL", null); + } finally { + if (cursor != null) + cursor.close(); + } + + // From Honeycomb on, it's possible to run several db + // commands in parallel using multiple connections. + if (Build.VERSION.SDK_INT >= 11) { + db.enableWriteAheadLogging(); + db.setLockingEnabled(false); + } else { + // Pre-Honeycomb, we can do some lesser optimizations. + cursor = null; + try { + cursor = db.rawQuery("PRAGMA journal_mode=PERSIST", null); + } finally { + if (cursor != null) + cursor.close(); + } + } + } + } + + private static final String[] mobileIdColumns = new String[] { Bookmarks._ID }; + private static final String[] mobileIdSelectionArgs = new String[] { Bookmarks.MOBILE_FOLDER_GUID }; + + private Integer getMobileFolderId(SQLiteDatabase db) { + Cursor c = null; + + try { + c = db.query(TABLE_BOOKMARKS, + mobileIdColumns, + Bookmarks.GUID + " = ?", + mobileIdSelectionArgs, + null, null, null); + + if (c == null || !c.moveToFirst()) + return null; + + return c.getInt(c.getColumnIndex(Bookmarks._ID)); + } finally { + if (c != null) + c.close(); + } + } + + private SQLiteDatabase getReadableDatabase(Uri uri) { + trace("Getting readable database for URI: " + uri); + + String profile = null; + + if (uri != null) + profile = uri.getQueryParameter(BrowserContract.PARAM_PROFILE); + + return mDatabases.getDatabaseHelperForProfile(profile, isTest(uri)).getReadableDatabase(); + } + + private SQLiteDatabase getWritableDatabase(Uri uri) { + trace("Getting writable database for URI: " + uri); + + String profile = null; + + if (uri != null) + profile = uri.getQueryParameter(BrowserContract.PARAM_PROFILE); + + return mDatabases.getDatabaseHelperForProfile(profile, isTest(uri)).getWritableDatabase(); + } + private void cleanupSomeDeletedRecords(Uri fromUri, Uri targetUri, String tableName) { Log.d(LOGTAG, "Cleaning up deleted records from " + tableName); @@ -367,7 +2077,7 @@ public class BrowserProvider extends TransactionalProvider( + getContext(), DATABASE_NAME, new DatabaseHelperFactory() { + @Override + public BrowserDatabaseHelper makeDatabaseHelper(Context context, String databasePath) { + return new BrowserDatabaseHelper(context, databasePath); + } + }); + } + + return true; + } + @Override public String getType(Uri uri) { final int match = URI_MATCHER.match(uri); @@ -428,11 +2161,37 @@ public class BrowserProvider extends TransactionalProvider= 11) { + trace("Beginning delete transaction: " + uri); + db.beginTransaction(); + try { + deleted = deleteInTransaction(db, uri, selection, selectionArgs); + db.setTransactionSuccessful(); + trace("Successful delete transaction: " + uri); + } finally { + db.endTransaction(); + } + } else { + deleted = deleteInTransaction(db, uri, selection, selectionArgs); + } + + if (deleted > 0) + getContext().getContentResolver().notifyChange(uri, null); + + return deleted; + } + + @SuppressWarnings("fallthrough") + public int deleteInTransaction(SQLiteDatabase db, Uri uri, String selection, String[] selectionArgs) { + trace("Calling delete in transaction on URI: " + uri); + final int match = URI_MATCHER.match(uri); int deleted = 0; @@ -516,6 +2275,37 @@ public class BrowserProvider extends TransactionalProvider= 11) { + trace("Beginning insert transaction: " + uri); + db.beginTransaction(); + try { + result = insertInTransaction(uri, values); + db.setTransactionSuccessful(); + trace("Successful insert transaction: " + uri); + } finally { + db.endTransaction(); + } + } else { + result = insertInTransaction(uri, values); + } + } catch (SQLException sqle) { + Log.e(LOGTAG, "exception in DB operation", sqle); + } catch (UnsupportedOperationException uoe) { + Log.e(LOGTAG, "don't know how to perform that insert", uoe); + } + + if (result != null) + getContext().getContentResolver().notifyChange(uri, null); + + return result; + } + public Uri insertInTransaction(Uri uri, ContentValues values) { trace("Calling insert in transaction on URI: " + uri); @@ -559,8 +2349,35 @@ public class BrowserProvider extends TransactionalProvider= 11) { + trace("Beginning update transaction: " + uri); + db.beginTransaction(); + try { + updated = updateInTransaction(uri, values, selection, selectionArgs); + db.setTransactionSuccessful(); + trace("Successful update transaction: " + uri); + } finally { + db.endTransaction(); + } + } else { + updated = updateInTransaction(uri, values, selection, selectionArgs); + } + + if (updated > 0) + getContext().getContentResolver().notifyChange(uri, null); + + return updated; + } + + @SuppressWarnings("fallthrough") public int updateInTransaction(Uri uri, ContentValues values, String selection, String[] selectionArgs) { trace("Calling update in transaction on URI: " + uri); @@ -769,7 +2586,7 @@ public class BrowserProvider extends TransactionalProvider 0) + mContext.getContentResolver().notifyChange(uri, null); + + return successes; } } diff --git a/mobile/android/base/db/DBUtils.java b/mobile/android/base/db/DBUtils.java index 65817151340..71689c4a6b2 100644 --- a/mobile/android/base/db/DBUtils.java +++ b/mobile/android/base/db/DBUtils.java @@ -81,19 +81,4 @@ public class DBUtils { Log.d(LOGTAG, "Failed to unlock database"); GeckoAppShell.listOfOpenFiles(); } - - /** - * Verifies that 0-byte arrays aren't added as favicon or thumbnail data. - * @param values ContentValues of query - * @param columnName Name of data column to verify - */ - public static void stripEmptyByteArray(ContentValues values, String columnName) { - if (values.containsKey(columnName)) { - byte[] data = values.getAsByteArray(columnName); - if (data == null || data.length == 0) { - Log.w(LOGTAG, "Tried to insert an empty or non-byte-array image. Ignoring."); - values.putNull(columnName); - } - } - } } diff --git a/mobile/android/base/db/TransactionalProvider.java b/mobile/android/base/db/TransactionalProvider.java deleted file mode 100644 index 0234c25227a..00000000000 --- a/mobile/android/base/db/TransactionalProvider.java +++ /dev/null @@ -1,277 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -package org.mozilla.gecko.db; - -import org.mozilla.gecko.db.PerProfileDatabases.DatabaseHelperFactory; - -import android.content.ContentProvider; -import android.content.ContentValues; -import android.content.Context; -import android.database.SQLException; -import android.database.sqlite.SQLiteDatabase; -import android.database.sqlite.SQLiteOpenHelper; -import android.net.Uri; -import android.os.Build; -import android.text.TextUtils; -import android.util.Log; - -/* - * Abstract class containing methods needed to make a SQLite-based content provider with a - * database helper of type T. Abstract methods insertInTransaction, deleteInTransaction and - * updateInTransaction all called within a DB transaction so failed modifications can be rolled-back. - */ -public abstract class TransactionalProvider extends ContentProvider { - private static final String LOGTAG = "GeckoTransProvider"; - protected Context mContext; - protected PerProfileDatabases mDatabases; - - /* - * Returns the name of the database file. Used to get a path - * to the DB file. - * - * @return name of the database file - */ - abstract protected String getDatabaseName(); - - /* - * Creates and returns an instance of a DB helper. Given a - * context and a path to the DB file - * - * @param context to use to create the database helper - * @param databasePath path to the DB file - * @return instance of the database helper - */ - abstract protected T createDatabaseHelper(Context context, String databasePath); - - /* - * Inserts an item into the database within a DB transaction. - * - * @param uri query URI - * @param values column values to be inserted - * @return a URI for the newly inserted item - */ - abstract protected Uri insertInTransaction(Uri uri, ContentValues values); - - /* - * Deletes items from the database within a DB transaction. - * - * @param uri query URI - * @param selection An optional filter to match rows to update. - * @param selectionArgs arguments for the selection - * @return number of rows impacted by the deletion - */ - abstract protected int deleteInTransaction(Uri uri, String selection, String[] selectionArgs); - - /* - * Updates the database within a DB transaction. - * - * @param uri Query URI - * @param values A set of column_name/value pairs to add to the database. - * @param selection An optional filter to match rows to update. - * @param selectionArgs Arguments for the selection - * @return number of rows impacted by the update - */ - abstract protected int updateInTransaction(Uri uri, ContentValues values, String selection, String[] selectionArgs); - - /* - * Fetches a readable database based on the profile indicated in the - * passed URI. If the URI does not contain a profile param, the default profile - * is used. - * - * @param uri content URI optionally indicating the profile of the user - * @return instance of a readable SQLiteDatabase - */ - protected SQLiteDatabase getReadableDatabase(Uri uri) { - String profile = null; - if (uri != null) { - profile = uri.getQueryParameter(BrowserContract.PARAM_PROFILE); - } - - return mDatabases.getDatabaseHelperForProfile(profile, isTest(uri)).getReadableDatabase(); - } - - /* - * Fetches a writeable database based on the profile indicated in the - * passed URI. If the URI does not contain a profile param, the default profile - * is used - * - * @param uri content URI optionally indicating the profile of the user - * @return instance of a writeable SQLiteDatabase - */ - protected SQLiteDatabase getWritableDatabase(Uri uri) { - String profile = null; - if (uri != null) { - profile = uri.getQueryParameter(BrowserContract.PARAM_PROFILE); - } - - return mDatabases.getDatabaseHelperForProfile(profile, isTest(uri)).getWritableDatabase(); - } - - @Override - public boolean onCreate() { - synchronized (this) { - mContext = getContext(); - mDatabases = new PerProfileDatabases( - getContext(), getDatabaseName(), new DatabaseHelperFactory() { - @Override - public T makeDatabaseHelper(Context context, String databasePath) { - return createDatabaseHelper(context, databasePath); - } - }); - } - - return true; - } - - @Override - public int delete(Uri uri, String selection, String[] selectionArgs) { - trace("Calling delete on URI: " + uri); - - final SQLiteDatabase db = getWritableDatabase(uri); - int deleted = 0; - - if (Build.VERSION.SDK_INT >= 11) { - trace("Beginning delete transaction: " + uri); - db.beginTransaction(); - try { - deleted = deleteInTransaction(uri, selection, selectionArgs); - db.setTransactionSuccessful(); - trace("Successful delete transaction: " + uri); - } finally { - db.endTransaction(); - } - } else { - deleted = deleteInTransaction(uri, selection, selectionArgs); - } - - if (deleted > 0) { - getContext().getContentResolver().notifyChange(uri, null); - } - - return deleted; - } - - @Override - public Uri insert(Uri uri, ContentValues values) { - trace("Calling insert on URI: " + uri); - - final SQLiteDatabase db = getWritableDatabase(uri); - Uri result = null; - try { - if (Build.VERSION.SDK_INT >= 11) { - trace("Beginning insert transaction: " + uri); - db.beginTransaction(); - try { - result = insertInTransaction(uri, values); - db.setTransactionSuccessful(); - trace("Successful insert transaction: " + uri); - } finally { - db.endTransaction(); - } - } else { - result = insertInTransaction(uri, values); - } - } catch (SQLException sqle) { - Log.e(LOGTAG, "exception in DB operation", sqle); - } catch (UnsupportedOperationException uoe) { - Log.e(LOGTAG, "don't know how to perform that insert", uoe); - } - - if (result != null) { - getContext().getContentResolver().notifyChange(uri, null); - } - - return result; - } - - - @Override - public int update(Uri uri, ContentValues values, String selection, - String[] selectionArgs) { - trace("Calling update on URI: " + uri); - - final SQLiteDatabase db = getWritableDatabase(uri); - int updated = 0; - - if (Build.VERSION.SDK_INT >= 11) { - trace("Beginning update transaction: " + uri); - db.beginTransaction(); - try { - updated = updateInTransaction(uri, values, selection, selectionArgs); - db.setTransactionSuccessful(); - trace("Successful update transaction: " + uri); - } finally { - db.endTransaction(); - } - } else { - updated = updateInTransaction(uri, values, selection, selectionArgs); - } - - if (updated > 0) { - getContext().getContentResolver().notifyChange(uri, null); - } - - return updated; - } - - @Override - public int bulkInsert(Uri uri, ContentValues[] values) { - if (values == null) { - return 0; - } - - int numValues = values.length; - int successes = 0; - - final boolean hasTransactions = Build.VERSION.SDK_INT >= 11; - final SQLiteDatabase db = getWritableDatabase(uri); - - if (hasTransactions) { - db.beginTransaction(); - } - - try { - for (int i = 0; i < numValues; i++) { - insertInTransaction(uri, values[i]); - successes++; - } - if (hasTransactions) { - trace("Flushing DB bulkinsert..."); - db.setTransactionSuccessful(); - } - } finally { - if (hasTransactions) { - db.endTransaction(); - } - } - - if (successes > 0) { - mContext.getContentResolver().notifyChange(uri, null); - } - - return successes; - } - - protected boolean isTest(Uri uri) { - String isTest = uri.getQueryParameter(BrowserContract.PARAM_IS_TEST); - return !TextUtils.isEmpty(isTest); - } - - // Calculate these once, at initialization. isLoggable is too expensive to - // have in-line in each log call. - private static boolean logDebug = Log.isLoggable(LOGTAG, Log.DEBUG); - private static boolean logVerbose = Log.isLoggable(LOGTAG, Log.VERBOSE); - protected static void trace(String message) { - if (logVerbose) { - Log.v(LOGTAG, message); - } - } - - protected static void debug(String message) { - if (logDebug) { - Log.d(LOGTAG, message); - } - } -} diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build index 404a849de84..1133aa6d425 100644 --- a/mobile/android/base/moz.build +++ b/mobile/android/base/moz.build @@ -112,7 +112,6 @@ gbjar.sources += [ 'CustomEditText.java', 'DataReportingNotification.java', 'db/BrowserContract.java', - 'db/BrowserDatabaseHelper.java', 'db/BrowserDB.java', 'db/BrowserProvider.java', 'db/DBUtils.java', @@ -123,7 +122,6 @@ gbjar.sources += [ 'db/PerProfileDatabases.java', 'db/SQLiteBridgeContentProvider.java', 'db/TabsProvider.java', - 'db/TransactionalProvider.java', 'Distribution.java', 'DoorHangerPopup.java', 'EditBookmarkDialog.java',