diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/compose/ComposeFragment.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/compose/ComposeFragment.java index e6b84abe..852b9fb6 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/compose/ComposeFragment.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/compose/ComposeFragment.java @@ -1,5 +1,6 @@ package com.moez.QKSMS.ui.compose; +import android.content.Intent; import android.os.Bundle; import android.os.Handler; import android.view.LayoutInflater; @@ -88,6 +89,16 @@ public class ComposeFragment extends QKFragment implements ActivityLauncher, Rec return addresses; } + /** + * Photo Selection result + */ + @Override + public void onActivityResult(int requestCode, int resultCode, final Intent data) { + if (!mComposeView.onActivityResult(requestCode, resultCode, data)) { + // Wasn't handled by ComposeView + } + } + @Override public void onItemClick(AdapterView parent, View view, int position, long id) { mRecipients.onItemClick(parent, view, position, id); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/ComposeView.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/ComposeView.java index e77e223c..328358ab 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/ComposeView.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/ComposeView.java @@ -426,7 +426,6 @@ public class ComposeView extends LinearLayout implements View.OnClickListener { } else { attachment = null; } - clearAttachment(); String[] recipients = null; if (mConversation != null) { @@ -440,6 +439,8 @@ public class ComposeView extends LinearLayout implements View.OnClickListener { // If we have some recipients, send the message! if (recipients != null && recipients.length > 0) { + clearAttachment(); + mReplyText.setText(""); AnalyticsManager.getInstance().sendEvent(