diff --git a/QKSMS/src/main/java/com/moez/QKSMS/data/ConversationLegacy.java b/QKSMS/src/main/java/com/moez/QKSMS/data/ConversationLegacy.java index 38b9439f..bfc6a3d6 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/data/ConversationLegacy.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/data/ConversationLegacy.java @@ -162,41 +162,29 @@ public class ConversationLegacy { public void saveDraft(final String draft) { - new AsyncTask() { + clearDrafts(); - @Override - protected Void doInBackground(Void... params) { - clearDrafts(); + if (draft.length() > 0) { + try { + DraftCache.getInstance().setSavingDraft(true); + DraftCache.getInstance().setDraftState(threadId, true); + ConversationLegacy.this.draft = draft; - if (draft.length() > 0) { - try { - DraftCache.getInstance().setSavingDraft(true); - DraftCache.getInstance().setDraftState(threadId, true); - ConversationLegacy.this.draft = draft; + ContentResolver contentResolver = context.getContentResolver(); + ContentValues cv = new ContentValues(); - ContentResolver contentResolver = context.getContentResolver(); - ContentValues cv = new ContentValues(); + cv.put("address", getAddress()); + cv.put("body", draft); - cv.put("address", getAddress()); - cv.put("body", draft); - - contentResolver.insert(SmsHelper.DRAFTS_CONTENT_PROVIDER, cv); - } finally { - DraftCache.getInstance().setSavingDraft(false); - } - } else { - ConversationLegacy.this.draft = null; - } - - return null; + contentResolver.insert(SmsHelper.DRAFTS_CONTENT_PROVIDER, cv); + } finally { + DraftCache.getInstance().setSavingDraft(false); } + } else { + ConversationLegacy.this.draft = null; + } - @Override - protected void onPostExecute(Void aVoid) { - super.onPostExecute(aVoid); - Toast.makeText(context, R.string.toast_draft, Toast.LENGTH_SHORT).show(); - } - }.execute((Void[]) null); + Toast.makeText(context, R.string.toast_draft, Toast.LENGTH_SHORT).show(); } public int getType() { diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java index 08219a18..93f43d4b 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java @@ -268,6 +268,12 @@ public class MessageListFragment extends QKContentFragment implements ActivityLa onOpenConversation(); } + @Override + public void onDestroy() { + super.onDestroy(); + mComposeView.saveDraft(); + } + @Override public void onSaveInstanceState(Bundle outState) { outState.putLong(ARG_THREAD_ID, mThreadId); @@ -511,14 +517,6 @@ public class MessageListFragment extends QKContentFragment implements ActivityLa v.vibrate(vibrateTime); } - @Override - public void onPause() { - super.onPause(); - - // Save the draft. This should also clear the EditText. - mComposeView.saveDraft(); - } - /** * Photo Selection result */ 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 50c829b3..257c023e 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 @@ -742,8 +742,7 @@ public class ComposeView extends LinearLayout implements View.OnClickListener { mConversationLegacy.clearDrafts(); } else if (!TextUtils.isEmpty(draft) && - (!mConversationLegacy.hasDraft() || - !draft.equals(mConversationLegacy.getDraft()))) { + (!mConversationLegacy.hasDraft() || !draft.equals(mConversationLegacy.getDraft()))) { mConversationLegacy.saveDraft(draft); } }