diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/popup/QKReplyActivity.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/popup/QKReplyActivity.java index a214b9ed..b081a96d 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/popup/QKReplyActivity.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/popup/QKReplyActivity.java @@ -27,7 +27,6 @@ import com.moez.QKSMS.ui.MainActivity; import com.moez.QKSMS.ui.base.QKPopupActivity; import com.moez.QKSMS.ui.messagelist.MessageColumns; import com.moez.QKSMS.ui.view.ComposeView; -import com.moez.QKSMS.ui.welcome.DemoConversationCursorLoader; public class QKReplyActivity extends QKPopupActivity implements DialogInterface.OnDismissListener, LoaderManager.LoaderCallbacks, ActivityLauncher, ComposeView.OnSendListener { @@ -80,12 +79,6 @@ public class QKReplyActivity extends QKPopupActivity implements DialogInterface. mListView = (ListView) findViewById(R.id.popup_messages); mListView.setAdapter(mAdapter); - // Disable the compose view for the welcome screen (so that they can't send texts to nobody) - if (extras.getLong(EXTRA_THREAD_ID) == DemoConversationCursorLoader.THREAD_ID_WELCOME_SCREEN) { - String sendingBlockedMessage = getString(R.string.sending_blocked_welcome_screen_message); - mComposeView.setSendingBlocked(sendingBlockedMessage); - } - // Set the conversation data objects. These are used to save drafts, send sms messages, etc. mComposeView.onOpenConversation(mConversation, mConversationLegacy); @@ -108,12 +101,7 @@ public class QKReplyActivity extends QKPopupActivity implements DialogInterface. protected void onPostExecute(Void aVoid) { super.onPostExecute(aVoid); - // FIXME - if (sThreadId == DemoConversationCursorLoader.THREAD_ID_WELCOME_SCREEN) { - setTitle("QKSMS"); - } else { - setTitle(mConversationLegacy.getName(true)); - } + setTitle(mConversationLegacy.getName(true)); initLoaderManager(); } @@ -248,13 +236,9 @@ public class QKReplyActivity extends QKPopupActivity implements DialogInterface. public Loader onCreateLoader(int id, Bundle args) { String selection = mShowUnreadOnly ? SmsHelper.UNREAD_SELECTION : null; - if (sThreadId == DemoConversationCursorLoader.THREAD_ID_WELCOME_SCREEN) { - return new DemoConversationCursorLoader(this, sThreadId, selection); - } else { - return new CursorLoader(this, - Uri.withAppendedPath(Message.MMS_SMS_CONTENT_PROVIDER, "" + mConversationLegacy.getThreadId()), - MessageColumns.PROJECTION, selection, null, "normalized_date ASC"); - } + return new CursorLoader(this, + Uri.withAppendedPath(Message.MMS_SMS_CONTENT_PROVIDER, "" + mConversationLegacy.getThreadId()), + MessageColumns.PROJECTION, selection, null, "normalized_date ASC"); } public void onLoadFinished(Loader loader, Cursor data) { @@ -273,14 +257,14 @@ public class QKReplyActivity extends QKPopupActivity implements DialogInterface. /** * Other areas of the app can tell the QK Reply window to close itself if necessary - * + *

* 1. MainActivity. When it's resumed, we don't want any QK Reply windows to open, which may have - * happened while the screen was off. - * + * happened while the screen was off. + *

* 2. PushbulletService. If a message is replied to via PB, close the window - * + *

* 3. MarkReadReceiver. A QK Reply window may have opened while the screen was off, so if it's marked - * as read from the lock screen via notification, the QK Reply window should be dismissed + * as read from the lock screen via notification, the QK Reply window should be dismissed */ public static void dismiss(long threadId) { if (sThreadId == threadId) { 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 b95350c2..25d3f8de 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 @@ -51,14 +51,12 @@ import com.moez.QKSMS.common.utils.PhoneNumberUtils; import com.moez.QKSMS.common.utils.Units; import com.moez.QKSMS.transaction.NotificationManager; import com.moez.QKSMS.transaction.SmsHelper; -import com.moez.QKSMS.ui.MainActivity; import com.moez.QKSMS.ui.ThemeManager; import com.moez.QKSMS.ui.base.QKActivity; import com.moez.QKSMS.ui.dialog.DefaultSmsHelper; import com.moez.QKSMS.ui.dialog.QKDialog; import com.moez.QKSMS.ui.dialog.mms.MMSSetupFragment; import com.moez.QKSMS.ui.settings.SettingsFragment; -import com.moez.QKSMS.ui.welcome.DemoConversationCursorLoader; import java.io.File; import java.io.FileNotFoundException; @@ -729,8 +727,7 @@ public class ComposeView extends LinearLayout implements View.OnClickListener, L public void saveDraft() { // If the conversation_reply view is null, then we won't worry about saving drafts at all. We also don't save // drafts if a message is about to be sent (delayed) - if (mReplyText != null && mConversation != null && mConversation.getThreadId() != DemoConversationCursorLoader.THREAD_ID_WELCOME_SCREEN && - mButtonState != SendButtonState.CANCEL) { + if (mReplyText != null && mConversation != null && mButtonState != SendButtonState.CANCEL) { String draft = mReplyText.getText().toString(); if (mConversationLegacy.hasDraft() && TextUtils.isEmpty(draft)) { diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/welcome/DemoConversationCursorLoader.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/welcome/DemoConversationCursorLoader.java deleted file mode 100644 index 3e3d179a..00000000 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/welcome/DemoConversationCursorLoader.java +++ /dev/null @@ -1,209 +0,0 @@ -package com.moez.QKSMS.ui.welcome; - -import android.content.Context; -import android.content.Loader; -import android.content.res.Resources; -import android.database.AbstractCursor; -import android.database.Cursor; -import android.provider.Telephony; -import com.moez.QKSMS.R; -import com.moez.QKSMS.data.Message; -import com.moez.QKSMS.transaction.SmsHelper; -import com.moez.QKSMS.ui.messagelist.MessageColumns; - -import java.util.ArrayList; - -/** - * A CursorLoader for demo conversations. - */ -public class DemoConversationCursorLoader extends Loader { - - private long mThreadId; - private String mSelection; - - public static long THREAD_ID_WELCOME_SCREEN = -2; - - /** - * Stores away the application context associated with context. - * Since Loaders can be used across multiple activities it's dangerous to - * store the context directly; always use {@link #getContext()} to retrieve - * the Loader's Context, don't use the constructor argument directly. - * The Context returned by {@link #getContext} is safe to use across - * Activity instances. - * - * @param context used to retrieve the application context. - * @param threadId tells the loader which demo thread cursor to load - */ - public DemoConversationCursorLoader(Context context, long threadId, String selection) { - super(context); - mThreadId = threadId; - mSelection = selection; - } - - /** - * This method starts loading the cursor object. In this case, we don't need to do any - * work on a background thread, so at the end of this method we can just call deliverResult. - */ - @Override - public void onStartLoading() { - Resources res = getContext().getResources(); - - // First, build a list of all results. Then, filter the results using mSelection and return - // that list. - ArrayList candidates = new ArrayList<>(); - - if (THREAD_ID_WELCOME_SCREEN == mThreadId) { - candidates = new ArrayList<>(); - long time = System.currentTimeMillis() - 50000; - candidates.add(new MessageData( - "sms", 0, mThreadId, "QKSMS", - res.getString(R.string.welcome_quickreply_message_1), - time, time, - 1, Message.RECEIVED, Telephony.Sms.STATUS_COMPLETE, 0, 0 - )); - candidates.add(new MessageData( - "sms", 1, mThreadId, "QKSMS", - res.getString(R.string.welcome_quickreply_message_2), - System.currentTimeMillis(), System.currentTimeMillis(), - 0, Message.RECEIVED, Telephony.Sms.STATUS_COMPLETE, 0, 0 - )); - } - - // Build the actual list based on the selection. - ArrayList data = new ArrayList<>(); - for (MessageData m : candidates) { - if (!SmsHelper.UNREAD_SELECTION.equals(mSelection) || m.read == 0) { - data.add(m); - } - } - - // Deliver the result cursor. - deliverResult(new DemoConversationCursor(data)); - } - - private class MessageData { - public static final int COLUMN_MSG_TYPE = 0; - public static final int COLUMN_ID = 1; - public static final int COLUMN_THREAD_ID = 2; - public static final int COLUMN_SMS_ADDRESS = 3; - public static final int COLUMN_SMS_BODY = 4; - public static final int COLUMN_SMS_DATE = 5; - public static final int COLUMN_SMS_DATE_SENT = 6; - public static final int COLUMN_SMS_READ = 7; - public static final int COLUMN_SMS_TYPE = 8; - public static final int COLUMN_SMS_STATUS = 9; - public static final int COLUMN_SMS_LOCKED = 10; - public static final int COLUMN_SMS_ERROR_CODE = 11; - - public String msg_type; - public long id; - public long thread_id; - public String address; - public String body; - public long date; - public long date_sent; - public int read; - public int sms_type; - public int status; - public int locked; - public int error_code; - - public MessageData(String msg_type, long id, long thread_id, String address, String body, - long date, long date_sent, int read, int sms_type, int status, - int locked, int error_code) { - - this.msg_type = msg_type; this.id = id; this.thread_id = thread_id; - this.address = address; this.body = body; this.date = date; - this.date_sent = date_sent; this.read = read; this.sms_type = sms_type; - this.status = status; this.locked = locked; this.error_code = error_code; - } - } - - private class DemoConversationCursor extends AbstractCursor { - public static final String TAG = "DemoConversationCursor"; - - private ArrayList mMessageDataList; - - public DemoConversationCursor(ArrayList messageDataList) { - mMessageDataList = messageDataList; - } - - @Override - public int getCount() { - return mMessageDataList.size(); - } - - @Override - public String[] getColumnNames() { - return MessageColumns.PROJECTION; - } - - @Override - public String getString(int column) { - MessageData data = mMessageDataList.get(mPos); - switch (column) { - case MessageData.COLUMN_MSG_TYPE: - return data.msg_type; - case MessageData.COLUMN_SMS_ADDRESS: - return data.address; - case MessageData.COLUMN_SMS_BODY: - return data.body; - } - return null; - } - - @Override - public short getShort(int column) { - return 0; - } - - @Override - public int getInt(int column) { - MessageData data = mMessageDataList.get(mPos); - switch (column) { - case MessageData.COLUMN_SMS_READ: - return data.read; - case MessageData.COLUMN_SMS_TYPE: - return data.sms_type; - case MessageData.COLUMN_SMS_STATUS: - return data.status; - case MessageData.COLUMN_SMS_LOCKED: - return data.locked; - case MessageData.COLUMN_SMS_ERROR_CODE: - return data.error_code; - } - return 0; - } - - @Override - public long getLong(int column) { - MessageData data = mMessageDataList.get(mPos); - switch (column) { - case MessageData.COLUMN_ID: - return data.id; - case MessageData.COLUMN_THREAD_ID: - return data.thread_id; - case MessageData.COLUMN_SMS_DATE: - return data.date; - case MessageData.COLUMN_SMS_DATE_SENT: - return data.date_sent; - } - return 0; - } - - @Override - public float getFloat(int column) { - return 0; - } - - @Override - public double getDouble(int column) { - return 0; - } - - @Override - public boolean isNull(int column) { - return false; - } - } -}