commit 381f1749b5d297c2245c6aeb03969136beda9050
author Nicolas Catania <niko@google.com> Fri Mar 12 11:31:59 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 12 11:31:59 2010 -0800
tree 9fe13ab53ec3ee99eebdcb59341922a056aa40a2
parent 107736c545322d658402c52168d4275794052d6f
parent 2cacc55964e737078f982e19dcda74439eabb932

Merge "Fixed crash Unable to add window"

src/com/android/contacts/ImportVCardActivity.java

diff --git a/src/com/android/contacts/ImportVCardActivity.java b/src/com/android/contacts/ImportVCardActivity.java
index 30b6cbf..d91bb5b 100644
--- a/src/com/android/contacts/ImportVCardActivity.java
+++ b/src/com/android/contacts/ImportVCardActivity.java
@@ -104,7 +104,7 @@
     private static final String LOG_TAG = "ImportVCardActivity";
     private static final boolean DO_PERFORMANCE_PROFILE = false;
 
-    private Handler mHandler = new Handler();
+    private Handler mHandler = new Handler();  // Run on the UI thread.
     private Account mAccount;
 
     private ProgressDialog mProgressDialogForScanVCard;
@@ -118,6 +118,7 @@
 
     private boolean mNeedReview = false;
 
+    // Runs on the UI thread.
     private class DialogDisplayer implements Runnable {
         private final int mResId;
         public DialogDisplayer(int resId) {
@@ -128,10 +129,7 @@
             mErrorMessage = errorMessage;
         }
         public void run() {
-            // Show the Dialog only when the parent Activity is still alive.
-            if (!ImportVCardActivity.this.isFinishing()) {
-                showDialog(mResId);
-            }
+            showDialog(mResId);
         }
     }
 
@@ -828,8 +826,8 @@
     }
 
     @Override
-    protected void onStop() {
-        super.onStop();
+    protected void onPause() {
+        super.onPause();
         if (mVCardReadThread != null) {
             // The Activity is no longer visible. Stop the thread.
             mVCardReadThread.cancel();
@@ -837,7 +835,7 @@
         }
 
         // ImportVCardActivity should not be persistent. In other words, if there's some
-        // event calling onStop(), this Activity should finish its work and give the main
+        // event calling onPause(), this Activity should finish its work and give the main
         // screen back to the caller Activity.
         if (!isFinishing()) {
             finish();
@@ -845,10 +843,27 @@
     }
 
     @Override
+    protected void onDestroy() {
+        // The code assumes the handler runs on the UI thread. If not,
+        // clearing the message queue is not enough, one would have to
+        // make sure that the handler does not run any callback when
+        // this activity isFinishing().
+
+        // Callbacks messages have what == 0.
+        if (mHandler.hasMessages(0)) {
+            mHandler.removeMessages(0);
+        }
+
+        mHandler = null;  // Prevents memory leaks by breaking any circular dependency.
+        super.onDestroy();
+    }
+
+    @Override
     public void finalize() {
+        // TODO: This should not be needed. Throw exception instead.
         if (mVCardReadThread != null) {
             // Not sure this procedure is really needed, but just in case...
-            Log.w(LOG_TAG, "VCardReadThread exists while this Activity is now being killed!");
+            Log.e(LOG_TAG, "VCardReadThread exists while this Activity is now being killed!");
             mVCardReadThread.cancel();
             mVCardReadThread = null;
         }