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

Merge "Fix NPE in NfcHandler"

Browse Source
This commit is contained in:
Marc Blank 2011-08-03 14:54:46 -07:00 committed by Android (Google) Code Review
commit c74874c4af
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/email/activity/NfcHandler.java
View File

@ -16,15 +16,13 @@
package com.android.email.activity; package com.android.email.activity;
import com.android.emailcommon.provider.Account;
import android.app.Activity; import android.app.Activity;
import android.content.Context;
import android.nfc.NdefMessage; import android.nfc.NdefMessage;
import android.nfc.NdefRecord; import android.nfc.NdefRecord;
import android.nfc.NfcAdapter; import android.nfc.NfcAdapter;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log;
import com.android.emailcommon.provider.Account;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.net.URLEncoder; import java.net.URLEncoder;
@ -42,7 +40,6 @@ public class NfcHandler implements NfcAdapter.NdefPushCallback {
private UIControllerBase mUiController; private UIControllerBase mUiController;
private Activity mActivity; private Activity mActivity;
private String mCurrentEmail; private String mCurrentEmail;
private static final String TAG = "ContactsNfcHandler";
public NfcHandler(UIControllerBase controller, Activity public NfcHandler(UIControllerBase controller, Activity
activity) { activity) {
@ -54,8 +51,8 @@ public class NfcHandler implements NfcAdapter.NdefPushCallback {
public void onAccountChanged() { public void onAccountChanged() {
if (mUiController.isActualAccountSelected()) { if (mUiController.isActualAccountSelected()) {
final long accountId = mUiController.getActualAccountId(); final long accountId = mUiController.getActualAccountId();
final Account account = Account.restoreAccountWithId( final Account account = Account.restoreAccountWithId(mActivity, accountId);
mActivity, accountId); if (account == null) return;
mCurrentEmail = account.mEmailAddress; mCurrentEmail = account.mEmailAddress;
} else { } else {
mCurrentEmail = null; mCurrentEmail = null;