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 718615 - Fix history visit update when dealing with deleted entries (r=blassey)

Browse Source
This commit is contained in:
Lucas Rocha 2012-02-15 15:05:03 +00:00
parent 3427f28642
commit 4afe1d9b84
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mobile/android/base/db/LocalBrowserDB.java
View File

@ -90,6 +90,11 @@ public class LocalBrowserDB implements BrowserDB.BrowserDBIface {
appendQueryParameter(BrowserContract.PARAM_LIMIT, String.valueOf(limit)).build();
}
private Uri appendProfileAndShowDeleted(Uri uri) {
return uri.buildUpon().appendQueryParameter(BrowserContract.PARAM_PROFILE, mProfile).
appendQueryParameter(BrowserContract.PARAM_SHOW_DELETED, "1").build();
}
private Uri appendProfile(Uri uri) {
return uri.buildUpon().appendQueryParameter(BrowserContract.PARAM_PROFILE, mProfile).build();
}
@ -170,7 +175,7 @@ public class LocalBrowserDB implements BrowserDB.BrowserDBIface {
History.VISITS, // 1
};
cursor = cr.query(appendProfile(History.CONTENT_URI),
cursor = cr.query(appendProfileAndShowDeleted(History.CONTENT_URI),
projection,
History.URL + " = ?",
new String[] { uri },
@ -182,6 +187,9 @@ public class LocalBrowserDB implements BrowserDB.BrowserDBIface {
values.put(History.VISITS, cursor.getInt(1) + 1);
values.put(History.DATE_LAST_VISITED, now);
// Restore deleted record if possible
values.put(History.IS_DELETED, 0);
Uri historyUri = ContentUris.withAppendedId(History.CONTENT_URI, cursor.getLong(0));
cr.update(appendProfile(historyUri), values, null, null);
} else {