commit ae4ee2b125c0fb1ea08d35f970ffeb85ab2b2760
author George Chang <georgekgchang@google.com> Tue Aug 06 11:32:56 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 06 11:32:56 2019 +0000
tree 33275375f9ee6f5eb2dbde5f45e362bab485c553
parent 4158d1a05ca3ee1753f61f63d7b8f63aa9fa89ef
parent 1c21fc7737fc10995a83666eec83b78e83bcc6ac

Merge "Improve Toast usage"

src/com/android/nfc/NfcService.java

diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java
index f792bdf..1bbc267 100644
--- a/src/com/android/nfc/NfcService.java
+++ b/src/com/android/nfc/NfcService.java
@@ -2178,11 +2178,11 @@
                         if (!tag.reconnect()) {
                             tag.disconnect();
                             if (mScreenState == ScreenStateHelper.SCREEN_STATE_ON_UNLOCKED) {
-                                if (mToast == null) {
-                                  mToast = Toast.makeText(mContext,
-                                      R.string.tag_read_error, Toast.LENGTH_SHORT);
+                                if (mToast != null) {
+                                    if (mToast.getView().isShown()) mToast.cancel();
                                 }
-                                mToast.setText(R.string.tag_read_error);
+                                mToast = Toast.makeText(mContext, R.string.tag_read_error,
+                                                        Toast.LENGTH_SHORT);
                                 mToast.show();
                             }
                             break;
@@ -2545,12 +2545,12 @@
             if (dispatchResult == NfcDispatcher.DISPATCH_FAIL && !mInProvisionMode) {
                 unregisterObject(tagEndpoint.getHandle());
                 if (mScreenState == ScreenStateHelper.SCREEN_STATE_ON_UNLOCKED) {
-                  if (mToast == null) {
-                    mToast = Toast.makeText(mContext,
-                        R.string.tag_dispatch_failed, Toast.LENGTH_SHORT);
-                  }
-                  mToast.setText(R.string.tag_dispatch_failed);
-                  mToast.show();
+                    if (mToast != null) {
+                        if (mToast.getView().isShown()) mToast.cancel();
+                    }
+                    mToast = Toast.makeText(mContext, R.string.tag_dispatch_failed,
+                                            Toast.LENGTH_SHORT);
+                    mToast.show();
                 }
                 playSound(SOUND_ERROR);
             } else if (dispatchResult == NfcDispatcher.DISPATCH_SUCCESS) {