From fd5f5f1a2814004613d2f085542e4478e8740fb8 Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Mon, 23 Aug 2010 17:45:50 -0700
Subject: [PATCH] A little bit of extra checking when creating dialogs in case
 activity is finishing

---
 .../todoroo/andlib/utility/DialogUtilities.java   | 15 +++++++++++++++
 .../astrid/rmilk/sync/RTMSyncProvider.java        |  1 -
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/astrid/common-src/com/todoroo/andlib/utility/DialogUtilities.java b/astrid/common-src/com/todoroo/andlib/utility/DialogUtilities.java
index f0e69e976..3ccb6d7ea 100644
--- a/astrid/common-src/com/todoroo/andlib/utility/DialogUtilities.java
+++ b/astrid/common-src/com/todoroo/andlib/utility/DialogUtilities.java
@@ -32,6 +32,9 @@ public class DialogUtilities {
     public void viewDialog(final Activity activity, final String text,
             final View view, final DialogInterface.OnClickListener okListener,
             final DialogInterface.OnClickListener cancelListener) {
+        if(activity.isFinishing())
+            return;
+
         activity.runOnUiThread(new Runnable() {
             public void run() {
                 new AlertDialog.Builder(activity)
@@ -55,6 +58,9 @@ public class DialogUtilities {
      */
     public void okDialog(final Activity activity, final String text,
             final DialogInterface.OnClickListener okListener) {
+        if(activity.isFinishing())
+            return;
+
         activity.runOnUiThread(new Runnable() {
             public void run() {
                 new AlertDialog.Builder(activity)
@@ -76,6 +82,9 @@ public class DialogUtilities {
      */
     public void okDialog(final Activity activity, final int icon, final CharSequence text,
             final DialogInterface.OnClickListener okListener) {
+        if(activity.isFinishing())
+            return;
+
         activity.runOnUiThread(new Runnable() {
             public void run() {
                 new AlertDialog.Builder(activity)
@@ -100,6 +109,9 @@ public class DialogUtilities {
     public void okCancelDialog(final Activity activity, final String title,
             final String text, final DialogInterface.OnClickListener okListener,
             final DialogInterface.OnClickListener cancelListener) {
+        if(activity.isFinishing())
+            return;
+
         activity.runOnUiThread(new Runnable() {
             public void run() {
                 new AlertDialog.Builder(activity)
@@ -124,6 +136,9 @@ public class DialogUtilities {
     public void okCancelDialog(final Activity activity, final String text,
             final DialogInterface.OnClickListener okListener,
             final DialogInterface.OnClickListener cancelListener) {
+        if(activity.isFinishing())
+            return;
+
         activity.runOnUiThread(new Runnable() {
             public void run() {
                 new AlertDialog.Builder(activity)
diff --git a/astrid/plugin-src/com/todoroo/astrid/rmilk/sync/RTMSyncProvider.java b/astrid/plugin-src/com/todoroo/astrid/rmilk/sync/RTMSyncProvider.java
index 5184af5ff..e1584cbcf 100644
--- a/astrid/plugin-src/com/todoroo/astrid/rmilk/sync/RTMSyncProvider.java
+++ b/astrid/plugin-src/com/todoroo/astrid/rmilk/sync/RTMSyncProvider.java
@@ -228,7 +228,6 @@ public class RTMSyncProvider extends SyncProvider<RTMTaskContainer> {
                     if(rtmService == null) {
                         return null;
                     }
-
                     try {
                         String token = rtmService.completeAuthorization();
                         MilkUtilities.setToken(token);