Call dialog.dismiss()
In many of the click handlers, we neglected to dismiss the dialog.
Bug 3072307
Change-Id: Ie461492394c9f29ce2a7bb6e7f00a93068ea2bf8
diff --git a/src/com/android/mms/ui/ClassZeroActivity.java b/src/com/android/mms/ui/ClassZeroActivity.java
index 260d72c..6994bd4 100644
--- a/src/com/android/mms/ui/ClassZeroActivity.java
+++ b/src/com/android/mms/ui/ClassZeroActivity.java
@@ -166,6 +166,7 @@
private final OnClickListener mCancelListener = new OnClickListener() {
public void onClick(DialogInterface dialog, int whichButton) {
+ dialog.dismiss();
finish();
}
};
@@ -174,6 +175,7 @@
public void onClick(DialogInterface dialog, int whichButton) {
mRead = true;
saveMessage();
+ dialog.dismiss();
finish();
}
};
diff --git a/src/com/android/mms/ui/ComposeMessageActivity.java b/src/com/android/mms/ui/ComposeMessageActivity.java
index 83e70aa..b9f6441 100644
--- a/src/com/android/mms/ui/ComposeMessageActivity.java
+++ b/src/com/android/mms/ui/ComposeMessageActivity.java
@@ -482,12 +482,14 @@
public void onClick(DialogInterface dialog, int whichButton) {
mBackgroundQueryHandler.startDelete(DELETE_MESSAGE_TOKEN,
null, mDeleteUri, mDeleteLocked ? null : "locked=0", null);
+ dialog.dismiss();
}
}
private class DiscardDraftListener implements OnClickListener {
public void onClick(DialogInterface dialog, int whichButton) {
mWorkingMessage.discard();
+ dialog.dismiss();
finish();
}
}
@@ -495,6 +497,7 @@
private class SendIgnoreInvalidRecipientListener implements OnClickListener {
public void onClick(DialogInterface dialog, int whichButton) {
sendMessage(true);
+ dialog.dismiss();
}
}
@@ -503,6 +506,7 @@
if (isRecipientsEditorVisible()) {
mRecipientsEditor.requestFocus();
}
+ dialog.dismiss();
}
}
@@ -2471,6 +2475,7 @@
builder.setAdapter(mAttachmentTypeSelectorAdapter, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
addAttachment(mAttachmentTypeSelectorAdapter.buttonToCommand(which), replace);
+ dialog.dismiss();
}
});
diff --git a/src/com/android/mms/ui/ConversationList.java b/src/com/android/mms/ui/ConversationList.java
index 11cf8e5..f0350e4 100644
--- a/src/com/android/mms/ui/ConversationList.java
+++ b/src/com/android/mms/ui/ConversationList.java
@@ -544,6 +544,7 @@
}
}
});
+ dialog.dismiss();
}
}
diff --git a/src/com/android/mms/ui/ManageSimMessages.java b/src/com/android/mms/ui/ManageSimMessages.java
index a29d011..1c8792c 100644
--- a/src/com/android/mms/ui/ManageSimMessages.java
+++ b/src/com/android/mms/ui/ManageSimMessages.java
@@ -200,6 +200,7 @@
public void onClick(DialogInterface dialog, int which) {
updateState(SHOW_BUSY);
deleteFromSim(cursor);
+ dialog.dismiss();
}
}, R.string.confirm_delete_SIM_message);
return true;
@@ -295,6 +296,7 @@
public void onClick(DialogInterface dialog, int which) {
updateState(SHOW_BUSY);
deleteAllFromSim();
+ dialog.dismiss();
}
}, R.string.confirm_delete_all_SIM_messages);
break;
diff --git a/src/com/android/mms/ui/MessageListItem.java b/src/com/android/mms/ui/MessageListItem.java
index 352772b..e849ca4 100644
--- a/src/com/android/mms/ui/MessageListItem.java
+++ b/src/com/android/mms/ui/MessageListItem.java
@@ -505,6 +505,7 @@
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
mContext.startActivity(intent);
}
+ dialog.dismiss();
}
};
diff --git a/src/com/android/mms/ui/MessageUtils.java b/src/com/android/mms/ui/MessageUtils.java
index b31e91d..fe5dbe1 100644
--- a/src/com/android/mms/ui/MessageUtils.java
+++ b/src/com/android/mms/ui/MessageUtils.java
@@ -737,6 +737,7 @@
if (callback != null) {
callback.run();
}
+ dialog.dismiss();
}
};
@@ -745,6 +746,7 @@
if (callback != null) {
callback.run();
}
+ dialog.dismiss();
}
};
@@ -753,6 +755,7 @@
if (callback != null) {
callback.run();
}
+ dialog.dismiss();
}
};
diff --git a/src/com/android/mms/ui/MessagingPreferenceActivity.java b/src/com/android/mms/ui/MessagingPreferenceActivity.java
index c2350d1..b3adbe9 100644
--- a/src/com/android/mms/ui/MessagingPreferenceActivity.java
+++ b/src/com/android/mms/ui/MessagingPreferenceActivity.java
@@ -211,6 +211,7 @@
if (recent != null) {
recent.clearHistory();
}
+ dialog.dismiss();
}
})
.setNegativeButton(android.R.string.cancel, null)
diff --git a/src/com/android/mms/ui/NumberPickerDialog.java b/src/com/android/mms/ui/NumberPickerDialog.java
index 40323cf..3656775 100644
--- a/src/com/android/mms/ui/NumberPickerDialog.java
+++ b/src/com/android/mms/ui/NumberPickerDialog.java
@@ -106,6 +106,7 @@
if (mCallback != null) {
mNumberPicker.clearFocus();
mCallback.onNumberSet(mNumberPicker.getCurrent());
+ dialog.dismiss();
}
}
diff --git a/src/com/android/mms/ui/SlideEditorActivity.java b/src/com/android/mms/ui/SlideEditorActivity.java
index 29181c7..c9aa420 100644
--- a/src/com/android/mms/ui/SlideEditorActivity.java
+++ b/src/com/android/mms/ui/SlideEditorActivity.java
@@ -491,6 +491,7 @@
mSlideshowModel.get(mPosition).getDuration() / 1000); // in seconds
startActivityForResult(intent, REQUEST_CODE_CHANGE_DURATION);
}
+ dialog.dismiss();
}
});
@@ -515,6 +516,7 @@
mSlideshowEditor.changeLayout(LayoutModel.LAYOUT_BOTTOM_TEXT);
break;
}
+ dialog.dismiss();
}
});
diff --git a/src/com/android/mms/ui/WarnOfStorageLimitsActivity.java b/src/com/android/mms/ui/WarnOfStorageLimitsActivity.java
index 9964d6c..e3f97a0 100644
--- a/src/com/android/mms/ui/WarnOfStorageLimitsActivity.java
+++ b/src/com/android/mms/ui/WarnOfStorageLimitsActivity.java
@@ -81,6 +81,7 @@
MessagingPreferenceActivity.class);
startActivity(intent);
}
+ dialog.dismiss();
// No matter what, finish the activity
finish();
