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

Merge

Browse Source
This commit is contained in:
Gregor Wagner 2012-11-16 10:25:01 -08:00
commit 40abc8113a
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
mobile/android/base/db/BrowserProvider.java.in
View File

@ -198,6 +198,8 @@ public class BrowserProvider extends ContentProvider {
static final String TABLE_HISTORY_JOIN_IMAGES = TABLE_HISTORY + " LEFT OUTER JOIN " +
Obsolete.TABLE_IMAGES + " ON " + qualifyColumn(TABLE_HISTORY, History.URL) + " = " +
qualifyColumn(Obsolete.TABLE_IMAGES, Obsolete.Images.URL);
static final String FAVICON_DB = "favicon_urls.db";
}
static {
@ -1343,8 +1345,6 @@ public class BrowserProvider extends ContentProvider {
}
private void upgradeDatabaseFrom12to13(SQLiteDatabase db) {
final String FAVICON_DB = "favicon_urls.db";
// Update images table with favicon URLs
SQLiteDatabase faviconsDb = null;
Cursor c = null;
@ -1353,7 +1353,7 @@ public class BrowserProvider extends ContentProvider {
final String FAVICON_URL = "favicon_url";
final String FAVICON_PAGE = "page_url";
String dbPath = mContext.getDatabasePath(FAVICON_DB).getPath();
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);
@ -1366,6 +1366,11 @@ public class BrowserProvider extends ContentProvider {
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();
@ -1455,7 +1460,6 @@ public class BrowserProvider extends ContentProvider {
createCombinedViewOn13(db);
db.execSQL("DROP TABLE IF EXISTS " + Obsolete.TABLE_IMAGES);
mContext.deleteDatabase(FAVICON_DB);
}
@Override
@ -1516,11 +1520,21 @@ public class BrowserProvider extends ContentProvider {
case 13:
upgradeDatabaseFrom12to13(db);
break;
}
}
}
}
db.setTransactionSuccessful();
db.endTransaction();
// 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);
}
db.setTransactionSuccessful();
db.endTransaction();
}
@Override