mirror of https://github.com/tasks/tasks
Simplified UUID generation, no more proof text
Sam Bosley
12 years ago
parent
3f2e3921a4
commit
c1f1681bc0
@ -1,86 +1,20 @@
|
|||||||
package com.todoroo.astrid.helper;
|
package com.todoroo.astrid.helper;
|
||||||
|
|
||||||
import java.security.SecureRandom;
|
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
import com.todoroo.andlib.utility.Pair;
|
|
||||||
import com.todoroo.andlib.utility.Preferences;
|
|
||||||
import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
|
|
||||||
|
|
||||||
public class UUIDHelper {
|
public class UUIDHelper {
|
||||||
|
|
||||||
private static final String PREF_DEVICE_ID = "pref_device_id"; //$NON-NLS-1$
|
|
||||||
|
|
||||||
private static final String PREF_LAST_KNOWN_USER = "pref_last_known_user"; //$NON-NLS-1$
|
|
||||||
|
|
||||||
public static String getDeviceId() {
|
|
||||||
long lastUser = Preferences.getLong(PREF_LAST_KNOWN_USER, 0);
|
|
||||||
long currentUser = ActFmPreferenceService.userId();
|
|
||||||
if (currentUser > 0 && lastUser > 0 && currentUser != lastUser) { // User has changed
|
|
||||||
Preferences.clear(PREF_DEVICE_ID);
|
|
||||||
Preferences.setLong(PREF_LAST_KNOWN_USER, currentUser);
|
|
||||||
} else if (currentUser > 0 && lastUser <= 0) {
|
|
||||||
Preferences.setLong(PREF_LAST_KNOWN_USER, currentUser);
|
|
||||||
}
|
|
||||||
|
|
||||||
String saved = Preferences.getStringValue(PREF_DEVICE_ID);
|
|
||||||
if (saved != null)
|
|
||||||
return saved;
|
|
||||||
|
|
||||||
saved = UUID.randomUUID().toString();
|
|
||||||
Preferences.setString(PREF_DEVICE_ID, saved);
|
|
||||||
return saved;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static final SecureRandom RANDOM = new SecureRandom();
|
|
||||||
private static final long MIN_UUID = 100000000;
|
private static final long MIN_UUID = 100000000;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return a pair consisting of the newly
|
* @return a pair consisting of the newly
|
||||||
* generated uuid and the corresponding proof text
|
* generated uuid and the corresponding proof text
|
||||||
*/
|
*/
|
||||||
public static Pair<String, String> newUUID() {
|
public static String newUUID() {
|
||||||
long uuid = 0;
|
long uuid = 0;
|
||||||
String proofText = ""; //$NON-NLS-1$
|
|
||||||
do {
|
do {
|
||||||
String hexDigits = "0123456789abcdef"; //$NON-NLS-1$
|
uuid = UUID.randomUUID().getLeastSignificantBits() & 0x7fffffffffffffffL;;
|
||||||
char[] chars = new char[80];
|
|
||||||
for (int i = 0; i < chars.length; i++) {
|
|
||||||
chars[i] = hexDigits.charAt(RANDOM.nextInt(hexDigits.length()));
|
|
||||||
}
|
|
||||||
String s = new String(chars);
|
|
||||||
String d = getDeviceId();
|
|
||||||
|
|
||||||
proofText = d + "," + s; //$NON-NLS-1$
|
|
||||||
uuid = bcryptToLong(proofText);
|
|
||||||
} while (uuid < MIN_UUID);
|
} while (uuid < MIN_UUID);
|
||||||
return Pair.create(Long.toString(uuid), proofText);
|
return Long.toString(uuid);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final String SALT = "$2a$10$2RHhxhKaPb4VXlQUJyBU/O"; //$NON-NLS-1$
|
|
||||||
private static final String BASE_64_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789./"; //$NON-NLS-1$
|
|
||||||
|
|
||||||
|
|
||||||
private static long bcryptToLong(String proofText) {
|
|
||||||
String a = BCrypt.hashpw(proofText, SALT);
|
|
||||||
int start = 29;
|
|
||||||
int endPlusOne = 60;
|
|
||||||
String b = a.substring(start, endPlusOne);
|
|
||||||
long result = 1;
|
|
||||||
for (int i = 0; i < b.length(); i++) {
|
|
||||||
result = 31 * result + iOf(b.charAt(i));
|
|
||||||
}
|
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
@SuppressWarnings("nls")
|
|
||||||
private static int iOf(char c) {
|
|
||||||
int index = BASE_64_CHARS.indexOf(c);
|
|
||||||
if (index < 0)
|
|
||||||
throw new RuntimeException("Base64Chars is wrong! No character " + c + " found. Probably needs to be replaces with something else");
|
|
||||||
return index;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue