Merge lp:~cmiller/ubuntuone-android-contacts/dismiss-dialog-of-never-shown-bug626851 into lp:ubuntuone-android-contacts

[Chad Miller]

[Martin Albisetti (beuno)]

Looks sane (for java, that is!).

review: Approve

=== modified file 'src/com/ubuntuone/android/contacts/funambol/activities/settings/AndroidAccountView.java'
--- src/com/ubuntuone/android/contacts/funambol/activities/settings/AndroidAccountView.java	2010-08-23 13:14:59 +0000
+++ src/com/ubuntuone/android/contacts/funambol/activities/settings/AndroidAccountView.java	2010-09-03 14:11:04 +0000
@@ -475,9 +475,19 @@
             if (value) {
                 String text = getCheckingCredentialsText();
                 pDialogId = displayManager.showProgressDialog(AndroidAccountView.this, text);
-            } else if(pDialogId != -1){
-                displayManager.dismissProgressDialog(AndroidAccountView.this, pDialogId);
+                Log.trace(TAG_LOG, "lpbug626851, showing progress dialog " + pDialogId);
+                return;
+            }
+
+            if (pDialogId != -1) {
+                try {
+                    displayManager.dismissProgressDialog(AndroidAccountView.this, pDialogId);
+                    Log.trace(TAG_LOG, "lpbug626851, successfully dismissed dialog " + pDialogId);
+                } catch (IllegalArgumentException e) {
+                    Log.error(TAG_LOG, "lpbug626851, tried to dismiss nonexistent dialog" + pDialogId);
+                }
                 pDialogId = -1;
+                return;
             }
         }
     }