forked from upstream-mirrors/quik
Lifecycle fixes
This commit is contained in:
@@ -92,7 +92,6 @@ public class MainActivity extends QKActivity {
|
|||||||
ButterKnife.bind(this);
|
ButterKnife.bind(this);
|
||||||
|
|
||||||
FragmentManager fm = getFragmentManager();
|
FragmentManager fm = getFragmentManager();
|
||||||
|
|
||||||
mConversationList = (ConversationListFragment) fm.findFragmentById(R.id.content_frame);
|
mConversationList = (ConversationListFragment) fm.findFragmentById(R.id.content_frame);
|
||||||
if (mConversationList == null) {
|
if (mConversationList == null) {
|
||||||
mConversationList = new ConversationListFragment();
|
mConversationList = new ConversationListFragment();
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
package com.moez.QKSMS.ui.messagelist;
|
package com.moez.QKSMS.ui.messagelist;
|
||||||
|
|
||||||
|
import android.app.FragmentManager;
|
||||||
|
import android.app.FragmentTransaction;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.text.Html;
|
import android.text.Html;
|
||||||
@@ -73,12 +75,14 @@ public class MessageListActivity extends QKSwipeBackActivity {
|
|||||||
|
|
||||||
if (mThreadId != -1) {
|
if (mThreadId != -1) {
|
||||||
Log.v(TAG, "Opening thread: " + mThreadId);
|
Log.v(TAG, "Opening thread: " + mThreadId);
|
||||||
MessageListFragment fragment = MessageListFragment.getInstance(mThreadId, mRowId, mHighlight, mShowImmediate);
|
FragmentManager fm = getFragmentManager();
|
||||||
mSwipeBackLayout.setScrollChangedListener(fragment);
|
MessageListFragment fragment = (MessageListFragment) fm.findFragmentById(R.id.content_frame);
|
||||||
getFragmentManager()
|
if (fragment == null) {
|
||||||
.beginTransaction()
|
fragment = MessageListFragment.getInstance(mThreadId, mRowId, mHighlight, mShowImmediate);
|
||||||
.replace(R.id.content_frame, fragment)
|
}
|
||||||
.commitAllowingStateLoss();
|
FragmentTransaction menuTransaction = fm.beginTransaction();
|
||||||
|
menuTransaction.replace(R.id.content_frame, fragment);
|
||||||
|
menuTransaction.commit();
|
||||||
} else {
|
} else {
|
||||||
String msg = "Couldn't open conversation: {action:";
|
String msg = "Couldn't open conversation: {action:";
|
||||||
msg += intent.getAction();
|
msg += intent.getAction();
|
||||||
|
|||||||
@@ -134,11 +134,6 @@ public class MessageListFragment extends QKFragment implements ActivityLauncher,
|
|||||||
private long mLastMessageId;
|
private long mLastMessageId;
|
||||||
private BackgroundQueryHandler mBackgroundQueryHandler;
|
private BackgroundQueryHandler mBackgroundQueryHandler;
|
||||||
|
|
||||||
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";
|
|
||||||
|
|
||||||
private long mThreadId;
|
private long mThreadId;
|
||||||
private long mRowId;
|
private long mRowId;
|
||||||
private String mHighlight;
|
private String mHighlight;
|
||||||
@@ -147,10 +142,10 @@ public class MessageListFragment extends QKFragment implements ActivityLauncher,
|
|||||||
protected static MessageListFragment getInstance(long threadId, long rowId, String highlight, boolean showImmediate) {
|
protected static MessageListFragment getInstance(long threadId, long rowId, String highlight, boolean showImmediate) {
|
||||||
|
|
||||||
Bundle args = new Bundle();
|
Bundle args = new Bundle();
|
||||||
args.putLong(ARG_THREAD_ID, threadId);
|
args.putLong(MessageListActivity.ARG_THREAD_ID, threadId);
|
||||||
args.putLong(ARG_ROW_ID, rowId);
|
args.putLong(MessageListActivity.ARG_ROW_ID, rowId);
|
||||||
args.putString(ARG_HIGHLIGHT, highlight);
|
args.putString(MessageListActivity.ARG_HIGHLIGHT, highlight);
|
||||||
args.putBoolean(ARG_SHOW_IMMEDIATE, showImmediate);
|
args.putBoolean(MessageListActivity.ARG_SHOW_IMMEDIATE, showImmediate);
|
||||||
|
|
||||||
MessageListFragment fragment = new MessageListFragment();
|
MessageListFragment fragment = new MessageListFragment();
|
||||||
fragment.setArguments(args);
|
fragment.setArguments(args);
|
||||||
@@ -166,12 +161,17 @@ public class MessageListFragment extends QKFragment implements ActivityLauncher,
|
|||||||
public void onCreate(Bundle savedInstanceState) {
|
public void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
|
|
||||||
loadFromArguments();
|
if (getArguments() != null) {
|
||||||
if (savedInstanceState != null) {
|
Bundle args = getArguments();
|
||||||
mThreadId = savedInstanceState.getLong(ARG_THREAD_ID, -1);
|
mThreadId = args.getLong(MessageListActivity.ARG_THREAD_ID, -1);
|
||||||
mRowId = savedInstanceState.getLong(ARG_ROW_ID, -1);
|
mRowId = args.getLong(MessageListActivity.ARG_ROW_ID, -1);
|
||||||
mHighlight = savedInstanceState.getString(ARG_HIGHLIGHT, null);
|
mHighlight = args.getString(MessageListActivity.ARG_HIGHLIGHT, null);
|
||||||
mShowImmediate = savedInstanceState.getBoolean(ARG_SHOW_IMMEDIATE, false);
|
mShowImmediate = args.getBoolean(MessageListActivity.ARG_SHOW_IMMEDIATE, false);
|
||||||
|
} else if (savedInstanceState != null) {
|
||||||
|
mThreadId = savedInstanceState.getLong(MessageListActivity.ARG_THREAD_ID, -1);
|
||||||
|
mRowId = savedInstanceState.getLong(MessageListActivity.ARG_ROW_ID, -1);
|
||||||
|
mHighlight = savedInstanceState.getString(MessageListActivity.ARG_HIGHLIGHT, null);
|
||||||
|
mShowImmediate = savedInstanceState.getBoolean(MessageListActivity.ARG_SHOW_IMMEDIATE, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
mConversationPrefs = new ConversationPrefsHelper(mContext, mThreadId);
|
mConversationPrefs = new ConversationPrefsHelper(mContext, mThreadId);
|
||||||
@@ -195,15 +195,6 @@ public class MessageListFragment extends QKFragment implements ActivityLauncher,
|
|||||||
mBackgroundQueryHandler = new BackgroundQueryHandler(mContext.getContentResolver());
|
mBackgroundQueryHandler = new BackgroundQueryHandler(mContext.getContentResolver());
|
||||||
}
|
}
|
||||||
|
|
||||||
public void loadFromArguments() {
|
|
||||||
// Save the fields from the arguments
|
|
||||||
Bundle args = getArguments();
|
|
||||||
mThreadId = args.getLong(ARG_THREAD_ID, -1);
|
|
||||||
mRowId = args.getLong(ARG_ROW_ID, -1);
|
|
||||||
mHighlight = args.getString(ARG_HIGHLIGHT, null);
|
|
||||||
mShowImmediate = args.getBoolean(ARG_SHOW_IMMEDIATE, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
||||||
|
|
||||||
@@ -263,18 +254,12 @@ public class MessageListFragment extends QKFragment implements ActivityLauncher,
|
|||||||
ThemeManager.setActiveColor(mConversationPrefs.getColor());
|
ThemeManager.setActiveColor(mConversationPrefs.getColor());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onDestroy() {
|
|
||||||
super.onDestroy();
|
|
||||||
mComposeView.saveDraft();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onSaveInstanceState(Bundle outState) {
|
public void onSaveInstanceState(Bundle outState) {
|
||||||
outState.putLong(ARG_THREAD_ID, mThreadId);
|
outState.putLong(MessageListActivity.ARG_THREAD_ID, mThreadId);
|
||||||
outState.putLong(ARG_ROW_ID, mRowId);
|
outState.putLong(MessageListActivity.ARG_ROW_ID, mRowId);
|
||||||
outState.putString(ARG_HIGHLIGHT, mHighlight);
|
outState.putString(MessageListActivity.ARG_HIGHLIGHT, mHighlight);
|
||||||
outState.putBoolean(ARG_SHOW_IMMEDIATE, mShowImmediate);
|
outState.putBoolean(MessageListActivity.ARG_SHOW_IMMEDIATE, mShowImmediate);
|
||||||
}
|
}
|
||||||
|
|
||||||
public long getThreadId() {
|
public long getThreadId() {
|
||||||
@@ -592,6 +577,8 @@ public class MessageListFragment extends QKFragment implements ActivityLauncher,
|
|||||||
@Override
|
@Override
|
||||||
public void onPause() {
|
public void onPause() {
|
||||||
super.onPause();
|
super.onPause();
|
||||||
|
mComposeView.saveDraft();
|
||||||
|
|
||||||
if (mSensorManager != null) {
|
if (mSensorManager != null) {
|
||||||
mSensorManager.unregisterListener(this);
|
mSensorManager.unregisterListener(this);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user