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

Bug 716729 - Consider deleted entries when looking whether to insert or update. r=lucasr

Browse Source
This commit is contained in:
Gian-Carlo Pascutto 2012-03-26 19:06:51 +02:00
parent e462a99306
commit ccb74c70f8
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mobile/android/base/ProfileMigrator.java
View File

@ -192,15 +192,22 @@ public class ProfileMigrator {
private ArrayList<ContentProviderOperation> mOperations;
protected Uri getBookmarksUri() {
return Bookmarks.CONTENT_URI;
Uri.Builder uriBuilder = Bookmarks.CONTENT_URI.buildUpon()
.appendQueryParameter(BrowserContract.PARAM_SHOW_DELETED, "1");
return uriBuilder.build();
}
protected Uri getHistoryUri() {
return History.CONTENT_URI;
Uri.Builder uriBuilder = History.CONTENT_URI.buildUpon()
.appendQueryParameter(BrowserContract.PARAM_SHOW_DELETED, "1");
return uriBuilder.build();
}
protected Uri getImagesUri() {
return Images.CONTENT_URI;
Uri.Builder uriBuilder = Images.CONTENT_URI.buildUpon()
.appendQueryParameter(BrowserContract.PARAM_SHOW_DELETED, "1");
return uriBuilder.build();
}
private long getFolderId(String guid) {
@ -316,6 +323,8 @@ public class ProfileMigrator {
ContentValues values = new ContentValues();
ContentProviderOperation.Builder builder = null;
values.put(History.DATE_LAST_VISITED, date);
// Restore deleted record if possible
values.put(History.IS_DELETED, 0);
if (cursor.moveToFirst()) {
int visitsCol = cursor.getColumnIndexOrThrow(History.VISITS);