Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-08 05:52:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 708151 - Change GUID generation to be more compliant with Sync (r=rnewman, a=mfinkle)

Browse Source
This commit is contained in:
Lucas Rocha 2011-12-13 14:46:58 +00:00
parent 24d5588a3c
commit 1a7516c84e
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
mobile/android/base/db/BrowserProvider.java
View File

@ -39,7 +39,7 @@ package org.mozilla.gecko.db;
import java.io.File;
import java.util.HashMap;
import java.util.UUID;
import java.util.Random;
import org.mozilla.gecko.GeckoApp;
import org.mozilla.gecko.db.BrowserContract.Bookmarks;
@ -63,6 +63,7 @@ import android.database.sqlite.SQLiteQueryBuilder;
import android.net.Uri;
import android.os.Build;
import android.text.TextUtils;
import android.util.Base64;
import android.util.Log;
public class BrowserProvider extends ContentProvider {
@ -192,6 +193,20 @@ public class BrowserProvider extends ContentProvider {
return table + "." + column;
}
public static String generateGuid() {
byte[] encodedBytes = Base64.encode(generateRandomBytes(9), Base64.URL_SAFE);
return new String(encodedBytes);
}
private static byte[] generateRandomBytes(int length) {
byte[] bytes = new byte[length];
Random random = new Random(System.nanoTime());
random.nextBytes(bytes);
return bytes;
}
// This is available in Android >= 11. Implemented locally to be
// compatible with older versions.
public static String concatenateWhere(String a, String b) {
@ -604,7 +619,7 @@ public class BrowserProvider extends ContentProvider {
// Generate GUID for new bookmark. Don't override specified GUIDs.
if (!values.containsKey(Bookmarks.GUID)) {
values.put(Bookmarks.GUID, UUID.randomUUID().toString());
values.put(Bookmarks.GUID, generateGuid());
}
if (!values.containsKey(Bookmarks.POSITION)) {
@ -637,7 +652,7 @@ public class BrowserProvider extends ContentProvider {
// Generate GUID for new history entry. Don't override specified GUIDs.
if (!values.containsKey(History.GUID)) {
values.put(History.GUID, UUID.randomUUID().toString());
values.put(History.GUID, generateGuid());
}
String url = values.getAsString(History.URL);
@ -664,7 +679,7 @@ public class BrowserProvider extends ContentProvider {
values.put(History.DATE_MODIFIED, now);
// Generate GUID for new history entry
values.put(History.GUID, UUID.randomUUID().toString());
values.put(History.GUID, generateGuid());
String url = values.getAsString(Images.URL);
@ -1085,7 +1100,7 @@ public class BrowserProvider extends ContentProvider {
if (updated == 0 && insertIfNeeded) {
// Generate GUID for new image, if one is not already provided.
if (!values.containsKey(Images.GUID)) {
values.put(Images.GUID, UUID.randomUUID().toString());
values.put(Images.GUID, generateGuid());
}
values.put(Images.DATE_CREATED, now);