diff options
Diffstat (limited to 'src/com/android/dialer/calllog')
| -rw-r--r-- | src/com/android/dialer/calllog/CallLogAdapter.java | 6 | ||||
| -rw-r--r-- | src/com/android/dialer/calllog/CallLogFragment.java | 23 |
2 files changed, 21 insertions, 8 deletions
diff --git a/src/com/android/dialer/calllog/CallLogAdapter.java b/src/com/android/dialer/calllog/CallLogAdapter.java index 5738e977f..921ec506c 100644 --- a/src/com/android/dialer/calllog/CallLogAdapter.java +++ b/src/com/android/dialer/calllog/CallLogAdapter.java @@ -117,8 +117,10 @@ public class CallLogAdapter extends GroupingListAdapter return; } - // Always reset the voicemail playback state on expand or collapse. - mVoicemailPlaybackPresenter.reset(); + if (mVoicemailPlaybackPresenter != null) { + // Always reset the voicemail playback state on expand or collapse. + mVoicemailPlaybackPresenter.reset(); + } if (viewHolder.getAdapterPosition() == mCurrentlyExpandedPosition) { // Hide actions, if the clicked item is the expanded item. diff --git a/src/com/android/dialer/calllog/CallLogFragment.java b/src/com/android/dialer/calllog/CallLogFragment.java index 0f19f1491..21ea97ea6 100644 --- a/src/com/android/dialer/calllog/CallLogFragment.java +++ b/src/com/android/dialer/calllog/CallLogFragment.java @@ -187,7 +187,10 @@ public class CallLogFragment extends Fragment resolver.registerContentObserver(Status.CONTENT_URI, true, mVoicemailStatusObserver); setHasOptionsMenu(true); - mVoicemailPlaybackPresenter = new VoicemailPlaybackPresenter(activity, state); + if (mCallTypeFilter == Calls.VOICEMAIL_TYPE) { + mVoicemailPlaybackPresenter = VoicemailPlaybackPresenter + .getInstance(activity, state); + } } /** Called by the CallLogQueryHandler when the list of calls has been fetched or updated. */ @@ -321,23 +324,28 @@ public class CallLogFragment extends Fragment @Override public void onPause() { - mVoicemailPlaybackPresenter.onPause(getActivity().isFinishing()); + if (mVoicemailPlaybackPresenter != null) { + mVoicemailPlaybackPresenter.onPause(); + } mAdapter.pauseCache(); super.onPause(); } @Override public void onStop() { - super.onStop(); - updateOnTransition(false /* onEntry */); + + super.onStop(); } @Override public void onDestroy() { mAdapter.pauseCache(); mAdapter.changeCursor(null); - mVoicemailPlaybackPresenter.onDestroy(getActivity().isFinishing()); + + if (mVoicemailPlaybackPresenter != null) { + mVoicemailPlaybackPresenter.onDestroy(); + } getActivity().getContentResolver().unregisterContentObserver(mCallLogObserver); getActivity().getContentResolver().unregisterContentObserver(mContactsObserver); @@ -353,7 +361,10 @@ public class CallLogFragment extends Fragment outState.putLong(KEY_DATE_LIMIT, mDateLimit); mAdapter.onSaveInstanceState(outState); - mVoicemailPlaybackPresenter.onSaveInstanceState(outState); + + if (mVoicemailPlaybackPresenter != null) { + mVoicemailPlaybackPresenter.onSaveInstanceState(outState); + } } @Override |