ADHOC
/
replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Fix NPE during Imap2 setup when using WiFi only device" into jb-ub-mail

This commit is contained in:
Marc Blank 2012-08-03 13:22:42 -07:00 committed by Android (Google) Code Review
parent cee9881650 8826466533
commit 10c7158254
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
imap2/src/com/android/imap2/ImapId.java
View File

@ -27,6 +27,7 @@ import com.android.emailcommon.Logging;
import com.android.emailcommon.VendorPolicyLoader;
import com.google.common.annotations.VisibleForTesting;
import java.io.IOException;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.regex.Pattern;
@ -89,7 +90,13 @@ public class ImapId {
// Generate a UID that mixes a "stable" device UID with the email address
try {
String devUID = Device.getConsistentDeviceId(context);
String devUID;
try {
devUID = Device.getDeviceId(context);
} catch (IOException e) {
// This would only happen with file system failure; it's fine to generate one
devUID = "_dev" + System.currentTimeMillis();
}
MessageDigest messageDigest;
messageDigest = MessageDigest.getInstance("SHA-1");
messageDigest.update(userName.getBytes());