- * Docs: - * http://developer.android.com/guide/components/tasks-and-back-stack.html#TaskLaunchModes - */ - @Override - public void onNewIntent(Intent intent) { - // onNewIntent doesn't change the result of getIntent() by default, so here we set it since - // that makes the most sense. - setIntent(intent); - - // This method is called whenever a MainActivity intent is started. Sometimes this is from a - // notification; other times it's from the user clicking on the app icon in the home screen - long threadId = intent.getLongExtra(EXTRA_THREAD_ID, -1); - - // The activity can also be launched by clicking on the message button from the contacts app - // Check for {sms,mms}{,to}: schemes, in which case we know to open a conversation - if (intent.getData() != null) { - String data = intent.getData().toString(); - String scheme = intent.getData().getScheme(); - - if (scheme.startsWith("smsto") || scheme.startsWith("mmsto")) { - String address = data.replace("smsto:", "").replace("mmsto:", ""); - threadId = Utils.getThreadId(this, formatPhoneNumber(address)); - } else if (scheme.startsWith("sms") || (scheme.startsWith("mms"))) { - String address = data.replace("sms:", "").replace("mms:", ""); - threadId = Utils.getThreadId(this, formatPhoneNumber(address)); - } - } - - // If it has a thread id, then we know it's from a notification and we can set the - // conversation. - if (threadId != -1) { - Log.v(TAG, "Opening thread: " + threadId); - MessageListActivity.launch(this, threadId, -1, null, true); - mSlidingMenu.showContent(); - } - - // Otherwise we'll just resume what was previously there, which doesn't require any code. - } - - private String formatPhoneNumber(String address) { - address = URLDecoder.decode(address); - address = "" + Html.fromHtml(address); - address = PhoneNumberUtils.formatNumber(address); - return address; - } - private void beginMmsSetup() { if (!mPrefs.getBoolean(MMS_SETUP_DONT_ASK_AGAIN, false) && TextUtils.isEmpty(mPrefs.getString(SettingsFragment.MMSC_URL, "")) && diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java index c3fb3e7e..0f7c3741 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java @@ -2,17 +2,24 @@ package com.moez.QKSMS.ui.messagelist; import android.content.Intent; import android.os.Bundle; +import android.telephony.PhoneNumberUtils; +import android.text.Html; +import android.util.Log; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; import com.moez.QKSMS.R; import com.moez.QKSMS.common.DonationManager; +import com.moez.QKSMS.mmssms.Utils; import com.moez.QKSMS.ui.base.QKActivity; import com.moez.QKSMS.ui.base.QKSwipeBackActivity; -public class MessageListActivity extends QKSwipeBackActivity { +import java.net.URLDecoder; - public static final String ARG_THREAD_ID = "threadId"; +public class MessageListActivity extends QKSwipeBackActivity { + private final String TAG = "MessageListActivity"; + + public static final String ARG_THREAD_ID = "thread_id"; public static final String ARG_ROW_ID = "rowId"; public static final String ARG_HIGHLIGHT = "highlight"; public static final String ARG_SHOW_IMMEDIATE = "showImmediate"; @@ -44,13 +51,39 @@ public class MessageListActivity extends QKSwipeBackActivity { mRowId = intent.getLongExtra(ARG_ROW_ID, -1); mHighlight = intent.getStringExtra(ARG_HIGHLIGHT); mShowImmediate = intent.getBooleanExtra(ARG_SHOW_IMMEDIATE, false); + + if (mThreadId == -1 && intent.getData() != null) { + String data = intent.getData().toString(); + String scheme = intent.getData().getScheme(); + + String address = null; + if (scheme.startsWith("smsto") || scheme.startsWith("mmsto")) { + address = data.replace("smsto:", "").replace("mmsto:", ""); + } else if (scheme.startsWith("sms") || (scheme.startsWith("mms"))) { + address = data.replace("sms:", "").replace("mms:", ""); + } + + mThreadId = Utils.getOrCreateThreadId(this, formatPhoneNumber(address)); + } } - MessageListFragment fragment = MessageListFragment.getInstance(mThreadId, mRowId, mHighlight, mShowImmediate); - getFragmentManager() - .beginTransaction() - .replace(R.id.content_frame, fragment) - .commitAllowingStateLoss(); + if (mThreadId != -1) { + Log.v(TAG, "Opening thread: " + mThreadId); + MessageListFragment fragment = MessageListFragment.getInstance(mThreadId, mRowId, mHighlight, mShowImmediate); + getFragmentManager() + .beginTransaction() + .replace(R.id.content_frame, fragment) + .commitAllowingStateLoss(); + } else { + // TODO log crashlytics event and show toast + } + } + + private String formatPhoneNumber(String address) { + address = URLDecoder.decode(address); + address = "" + Html.fromHtml(address); + address = PhoneNumberUtils.formatNumber(address); + return address; } @Override 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 130a08f0..1be50e4b 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 @@ -133,7 +133,7 @@ public class MessageListFragment extends QKContentFragment implements ActivityLa private long mLastMessageId; private BackgroundQueryHandler mBackgroundQueryHandler; - public static final String ARG_THREAD_ID = "threadId"; + public static final String ARG_THREAD_ID = "thread_id"; public static final String ARG_ROW_ID = "rowId"; public static final String ARG_HIGHLIGHT = "highlight"; public static final String ARG_SHOW_IMMEDIATE = "showImmediate";