From b9e620dea9659b1d41ed748185ea5c2ad13f1ab3 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 17 Apr 2016 00:42:15 -0400 Subject: [PATCH] Launch Conversation from intent through MainActivity, so it always exists in stack --- QKSMS/src/main/AndroidManifest.xml | 16 +++----- .../transaction/NotificationManager.java | 12 +++--- .../java/com/moez/QKSMS/ui/MainActivity.java | 39 +++++++++++++++++-- .../ui/messagelist/MessageListActivity.java | 2 +- .../ui/messagelist/MessageListFragment.java | 2 +- .../moez/QKSMS/ui/popup/QKReplyActivity.java | 3 +- .../moez/QKSMS/ui/widget/WidgetService.java | 3 +- 7 files changed, 54 insertions(+), 23 deletions(-) diff --git a/QKSMS/src/main/AndroidManifest.xml b/QKSMS/src/main/AndroidManifest.xml index b8204b87..748d6c3c 100644 --- a/QKSMS/src/main/AndroidManifest.xml +++ b/QKSMS/src/main/AndroidManifest.xml @@ -72,21 +72,14 @@ android:logo="@color/transparent" android:windowSoftInputMode="stateUnchanged|adjustResize"> + + + - - - - - - - @@ -97,6 +90,9 @@ + { @@ -288,6 +287,40 @@ public class MainActivity extends QKActivity { NotificationManager.initQuickCompose(this, false, false); } + /** + * MainActivity has a "singleTask" launch mode, which means that if it is currently running + * and another intent is launched to open it, instead of creating a new MainActivity it + * just opens the current MainActivity. We use this so that when you click on notifications, + * only one main activity is ever used. + *

+ * onNewIntent() is called every time the homescreen shortcut is tapped, even if the app + * is already running in the background. It's also called when the app is launched via other + * intents + *

+ * 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); + + boolean shouldOpenConversation = intent.hasExtra(MessageListActivity.ARG_THREAD_ID); + + // 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 scheme = intent.getData().getScheme(); + shouldOpenConversation = shouldOpenConversation || scheme.startsWith("sms") || scheme.startsWith("mms"); + } + + if (shouldOpenConversation) { + intent.setClass(this, MessageListActivity.class); + startActivity(intent); + } + } + 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 014b6ac3..018661ad 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,7 +2,6 @@ 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; @@ -11,6 +10,7 @@ import android.view.MenuItem; import com.crashlytics.android.Crashlytics; import com.moez.QKSMS.R; import com.moez.QKSMS.common.DonationManager; +import com.moez.QKSMS.common.utils.PhoneNumberUtils; import com.moez.QKSMS.mmssms.Utils; import com.moez.QKSMS.ui.base.QKActivity; import com.moez.QKSMS.ui.base.QKSwipeBackActivity; 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 b8964a72..15d84a68 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 = "thread_id"; + public static final String ARG_THREAD_ID = "threadId"; public static final String ARG_ROW_ID = "rowId"; public static final String ARG_HIGHLIGHT = "highlight"; public static final String ARG_SHOW_IMMEDIATE = "showImmediate"; 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 eb681102..24666ec8 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 @@ -28,6 +28,7 @@ import com.moez.QKSMS.ui.MainActivity; import com.moez.QKSMS.ui.ThemeManager; import com.moez.QKSMS.ui.base.QKPopupActivity; import com.moez.QKSMS.ui.messagelist.MessageColumns; +import com.moez.QKSMS.ui.messagelist.MessageListActivity; import com.moez.QKSMS.ui.view.ComposeView; public class QKReplyActivity extends QKPopupActivity implements DialogInterface.OnDismissListener, @@ -190,7 +191,7 @@ public class QKReplyActivity extends QKPopupActivity implements DialogInterface. case R.id.menu_open_thread: Intent threadIntent = new Intent(this, MainActivity.class); - threadIntent.putExtra(MainActivity.EXTRA_THREAD_ID, mConversationLegacy.getThreadId()); + threadIntent.putExtra(MessageListActivity.ARG_THREAD_ID, mConversationLegacy.getThreadId()); startActivity(threadIntent); finish(); return true; diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/widget/WidgetService.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/widget/WidgetService.java index cbfdbe54..1bce49bc 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/widget/WidgetService.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/widget/WidgetService.java @@ -41,6 +41,7 @@ import com.moez.QKSMS.data.ContactHelper; import com.moez.QKSMS.data.Conversation; import com.moez.QKSMS.ui.MainActivity; import com.moez.QKSMS.ui.ThemeManager; +import com.moez.QKSMS.ui.messagelist.MessageListActivity; public class WidgetService extends RemoteViewsService { private static final String TAG = "WidgetService"; @@ -205,7 +206,7 @@ public class WidgetService extends RemoteViewsService { // On click intent. Intent clickIntent = new Intent(); - clickIntent.putExtra(MainActivity.EXTRA_THREAD_ID, conversation.getThreadId()); + clickIntent.putExtra(MessageListActivity.ARG_THREAD_ID, conversation.getThreadId()); remoteViews.setOnClickFillInIntent(R.id.conversation, clickIntent); return remoteViews;