chrome/android/java/src/org/chromium/chrome/browser/download/DownloadSharedPreferenceEntry.java - Issue 2843073002: Remove the GUID requirement from the ContentId

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/download/DownloadSharedPreferenceEntry.java

Issue 2843073002: Remove the GUID requirement from the ContentId (Closed)

Patch Set: Created 3 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/download/DownloadNotificationService.java ('k') | chrome/android/junit/src/org/chromium/chrome/browser/download/DownloadSharedPreferenceEntryTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/download/DownloadSharedPreferenceEntry.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadSharedPreferenceEntry.java b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadSharedPreferenceEntry.java

index 1ed6241dd1d691e3028155da581dd6cf97474c10..b9bd93cac66b2fb7e73e910efa778e4096cfe2dc 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadSharedPreferenceEntry.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadSharedPreferenceEntry.java

@@ -265,12 +265,12 @@ public class DownloadSharedPreferenceEntry {

static DownloadSharedPreferenceEntry parseFromVersion6(String string) {

String[] entries = string.split(",", 9);

if (entries.length != 9) return INVALID_ENTRY;

- // VERSION,NOTIFICATIONID,NAMESPACE,GUID,OFFTHERECORD,METEREDOK,AUTORESUMEOK,ISTRANSIENT,

+ // VERSION,NOTIFICATIONID,NAMESPACE,ID,OFFTHERECORD,METEREDOK,AUTORESUMEOK,ISTRANSIENT,

// FILENAME

String stringVersion = entries[0];

String stringNotificationId = entries[1];

String stringNamespace = entries[2];

- String stringGuid = entries[3];

+ String stringId = entries[3];

String stringOffTheRecord = entries[4];

String stringMetered = entries[5];

String stringAutoResume = entries[6];

@@ -291,10 +291,10 @@ public class DownloadSharedPreferenceEntry {

}

if (version != 6) return INVALID_ENTRY;

- if (!isValidGUID(stringGuid)) return INVALID_ENTRY;

+ if (TextUtils.isEmpty(stringId)) return INVALID_ENTRY;

if (TextUtils.isEmpty(stringNamespace)) return INVALID_ENTRY;

- return new DownloadSharedPreferenceEntry(new ContentId(stringNamespace, stringGuid),

+ return new DownloadSharedPreferenceEntry(new ContentId(stringNamespace, stringId),

notificationId, offTheRecord, metered, stringFileName, autoResume, isTransient);

}