Attempt to fix allowed accounts

Refs #1664
M66B · May 17, 2014 · 616c204 · 616c204
1 parent 79b4d8e
commit 616c204
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/biz/bokhorst/xprivacy/Util.java b/src/biz/bokhorst/xprivacy/Util.java
@@ -431,10 +431,14 @@ private static boolean verifyData(byte[] data, byte[] signature, PublicKey publi
 		return verifier.verify(signature);
 	}
 
+	private static String getSalt() {
+		return (Build.SERIAL == null ? "" : Build.SERIAL);
+	}
+
 	public static String sha1(String text) throws NoSuchAlgorithmException, UnsupportedEncodingException {
 		// SHA1
 		int userId = Util.getUserId(Process.myUid());
-		String salt = PrivacyManager.getSetting(userId, PrivacyManager.cSettingSalt, Build.SERIAL, true);
+		String salt = PrivacyManager.getSetting(userId, PrivacyManager.cSettingSalt, getSalt(), true);
 		MessageDigest digest = MessageDigest.getInstance("SHA-1");
 		byte[] bytes = (text + salt).getBytes("UTF-8");
 		digest.update(bytes, 0, bytes.length);
@@ -448,7 +452,7 @@ public static String sha1(String text) throws NoSuchAlgorithmException, Unsuppor
 	public static String md5(String text) throws NoSuchAlgorithmException, UnsupportedEncodingException {
 		// MD5
 		int userId = Util.getUserId(Process.myUid());
-		String salt = PrivacyManager.getSetting(userId, PrivacyManager.cSettingSalt, Build.SERIAL, true);
+		String salt = PrivacyManager.getSetting(userId, PrivacyManager.cSettingSalt, getSalt(), true);
 		byte[] bytes = MessageDigest.getInstance("MD5").digest((text + salt).getBytes("UTF-8"));
 		StringBuilder sb = new StringBuilder();
 		for (byte b : bytes)