From 6abbcfc0d20337b67195de1d87a085a76931bc28 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 10 Apr 2016 00:10:34 -0400 Subject: [PATCH] Use single instance of MessageListActivity --- QKSMS/src/main/AndroidManifest.xml | 3 +- .../ui/messagelist/MessageListActivity.java | 41 ++++++++++--------- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/QKSMS/src/main/AndroidManifest.xml b/QKSMS/src/main/AndroidManifest.xml index a34eecd4..ef93f972 100644 --- a/QKSMS/src/main/AndroidManifest.xml +++ b/QKSMS/src/main/AndroidManifest.xml @@ -81,7 +81,8 @@ + android:windowSoftInputMode="adjustResize" + android:launchMode="singleTask"> 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 4bb59ac4..8cfc4deb 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 @@ -45,29 +45,32 @@ public class MessageListActivity extends QKSwipeBackActivity { setContentView(R.layout.activity_fragment); showBackButton(true); - Intent intent = getIntent(); - if (intent != null) { - mThreadId = intent.getLongExtra(ARG_THREAD_ID, -1); - mRowId = intent.getLongExtra(ARG_ROW_ID, -1); - mHighlight = intent.getStringExtra(ARG_HIGHLIGHT); - mShowImmediate = intent.getBooleanExtra(ARG_SHOW_IMMEDIATE, false); + onNewIntent(getIntent()); + } - if (mThreadId == -1 && intent.getData() != null) { - String data = intent.getData().toString(); - String scheme = intent.getData().getScheme(); + @Override + protected void onNewIntent(Intent intent) { + super.onNewIntent(intent); + mThreadId = intent.getLongExtra(ARG_THREAD_ID, -1); + mRowId = intent.getLongExtra(ARG_ROW_ID, -1); + mHighlight = intent.getStringExtra(ARG_HIGHLIGHT); + mShowImmediate = intent.getBooleanExtra(ARG_SHOW_IMMEDIATE, false); - 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:", ""); - } + if (mThreadId == -1 && intent.getData() != null) { + String data = intent.getData().toString(); + String scheme = intent.getData().getScheme(); - address = URLDecoder.decode(address); - address = "" + Html.fromHtml(address); - address = PhoneNumberUtils.formatNumber(address); - mThreadId = Utils.getOrCreateThreadId(this, address); + 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:", ""); } + + address = URLDecoder.decode(address); + address = "" + Html.fromHtml(address); + address = PhoneNumberUtils.formatNumber(address); + mThreadId = Utils.getOrCreateThreadId(this, address); } if (mThreadId != -1) {