Messaging: Further code improvements
* Remove redundant casts * getParcelable(ArrayList|Exra) without class argument is deprecated * ViewPager.setOnPageChangeListener -> addOnPageChangeListener * RecyclerView.setOnScrollListener -> addOnScrollListener * Remove unused initializations * Remove unused code Change-Id: I21beb6c90c675a4f2cfd7e3d5ebbd18b745f5911
This commit is contained in:
@@ -171,8 +171,8 @@ public class ConversationListFragment extends Fragment implements ConversationLi
|
||||
final Bundle savedInstanceState) {
|
||||
final ViewGroup rootView = (ViewGroup) inflater.inflate(R.layout.conversation_list_fragment,
|
||||
container, false);
|
||||
mRecyclerView = (RecyclerView) rootView.findViewById(android.R.id.list);
|
||||
mEmptyListMessageView = (ListEmptyView) rootView.findViewById(R.id.no_conversations_view);
|
||||
mRecyclerView = rootView.findViewById(android.R.id.list);
|
||||
mEmptyListMessageView = rootView.findViewById(R.id.no_conversations_view);
|
||||
mEmptyListMessageView.setImageHint(R.drawable.ic_oobe_conv_list);
|
||||
// The default behavior for default layout param generation by LinearLayoutManager is to
|
||||
// provide width and height of WRAP_CONTENT, but this is not desirable for
|
||||
@@ -189,7 +189,7 @@ public class ConversationListFragment extends Fragment implements ConversationLi
|
||||
mRecyclerView.setLayoutManager(manager);
|
||||
mRecyclerView.setHasFixedSize(true);
|
||||
mRecyclerView.setAdapter(mAdapter);
|
||||
mRecyclerView.setOnScrollListener(new RecyclerView.OnScrollListener() {
|
||||
mRecyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
|
||||
int mCurrentState = AbsListView.OnScrollListener.SCROLL_STATE_IDLE;
|
||||
|
||||
@Override
|
||||
@@ -216,11 +216,11 @@ public class ConversationListFragment extends Fragment implements ConversationLi
|
||||
mRecyclerView.addOnItemTouchListener(new ConversationListSwipeHelper(mRecyclerView));
|
||||
|
||||
if (savedInstanceState != null) {
|
||||
mListState = savedInstanceState.getParcelable(SAVED_INSTANCE_STATE_LIST_VIEW_STATE_KEY);
|
||||
mListState = savedInstanceState.getParcelable(SAVED_INSTANCE_STATE_LIST_VIEW_STATE_KEY,
|
||||
Parcelable.class);
|
||||
}
|
||||
|
||||
mStartNewConversationButton = (ExtendedFloatingActionButton) rootView.findViewById(
|
||||
R.id.start_new_conversation_button);
|
||||
mStartNewConversationButton = rootView.findViewById(R.id.start_new_conversation_button);
|
||||
if (mArchiveMode || mForwardMessageMode) {
|
||||
mStartNewConversationButton.setVisibility(View.GONE);
|
||||
} else {
|
||||
|
||||
@@ -145,22 +145,21 @@ public class ConversationListItemView extends FrameLayout implements OnClickList
|
||||
@Override
|
||||
protected void onFinishInflate() {
|
||||
super.onFinishInflate();
|
||||
mSwipeableContainer = (ViewGroup) findViewById(R.id.swipeableContainer);
|
||||
mCrossSwipeBackground = (ViewGroup) findViewById(R.id.crossSwipeBackground);
|
||||
mSwipeableContent = (ViewGroup) findViewById(R.id.swipeableContent);
|
||||
mConversationNameView = (TextView) findViewById(R.id.conversation_name);
|
||||
mSnippetTextView = (TextView) findViewById(R.id.conversation_snippet);
|
||||
mSubjectTextView = (TextView) findViewById(R.id.conversation_subject);
|
||||
mWorkProfileIconView = (ImageView) findViewById(R.id.work_profile_icon);
|
||||
mTimestampTextView = (TextView) findViewById(R.id.conversation_timestamp);
|
||||
mContactIconView = (ContactIconView) findViewById(R.id.conversation_icon);
|
||||
mContactCheckmarkView = (ImageView) findViewById(R.id.conversation_checkmark);
|
||||
mFailedStatusIconView = (ImageView) findViewById(R.id.conversation_failed_status_icon);
|
||||
mCrossSwipeArchiveLeftImageView = (ImageView) findViewById(R.id.crossSwipeArchiveIconLeft);
|
||||
mCrossSwipeArchiveRightImageView =
|
||||
(ImageView) findViewById(R.id.crossSwipeArchiveIconRight);
|
||||
mImagePreviewView = (AsyncImageView) findViewById(R.id.conversation_image_preview);
|
||||
mAudioAttachmentView = (AudioAttachmentView) findViewById(R.id.audio_attachment_view);
|
||||
mSwipeableContainer = findViewById(R.id.swipeableContainer);
|
||||
mCrossSwipeBackground = findViewById(R.id.crossSwipeBackground);
|
||||
mSwipeableContent = findViewById(R.id.swipeableContent);
|
||||
mConversationNameView = findViewById(R.id.conversation_name);
|
||||
mSnippetTextView = findViewById(R.id.conversation_snippet);
|
||||
mSubjectTextView = findViewById(R.id.conversation_subject);
|
||||
mWorkProfileIconView = findViewById(R.id.work_profile_icon);
|
||||
mTimestampTextView = findViewById(R.id.conversation_timestamp);
|
||||
mContactIconView = findViewById(R.id.conversation_icon);
|
||||
mContactCheckmarkView = findViewById(R.id.conversation_checkmark);
|
||||
mFailedStatusIconView = findViewById(R.id.conversation_failed_status_icon);
|
||||
mCrossSwipeArchiveLeftImageView = findViewById(R.id.crossSwipeArchiveIconLeft);
|
||||
mCrossSwipeArchiveRightImageView = findViewById(R.id.crossSwipeArchiveIconRight);
|
||||
mImagePreviewView = findViewById(R.id.conversation_image_preview);
|
||||
mAudioAttachmentView = findViewById(R.id.audio_attachment_view);
|
||||
mConversationNameView.addOnLayoutChangeListener(this);
|
||||
mSnippetTextView.addOnLayoutChangeListener(this);
|
||||
|
||||
|
||||
@@ -46,7 +46,8 @@ public class ForwardMessageActivity extends BaseBugleActivity
|
||||
final ConversationListFragment fragment =
|
||||
ConversationListFragment.createForwardMessageConversationListFragment();
|
||||
getSupportFragmentManager().beginTransaction().add(android.R.id.content, fragment).commit();
|
||||
mDraftMessage = getIntent().getParcelableExtra(UIIntents.UI_INTENT_EXTRA_DRAFT_DATA);
|
||||
mDraftMessage = getIntent().getParcelableExtra(UIIntents.UI_INTENT_EXTRA_DRAFT_DATA,
|
||||
MessageData.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -94,7 +94,7 @@ public class ShareIntentActivity extends BaseBugleActivity implements
|
||||
}
|
||||
|
||||
if (Intent.ACTION_SEND.equals(action)) {
|
||||
final Uri contentUri = (Uri) intent.getParcelableExtra(Intent.EXTRA_STREAM);
|
||||
final Uri contentUri = intent.getParcelableExtra(Intent.EXTRA_STREAM, Uri.class);
|
||||
if (UriUtil.isFileUri(contentUri)) {
|
||||
LogUtil.i(
|
||||
LogUtil.BUGLE_TAG,
|
||||
@@ -134,7 +134,8 @@ public class ShareIntentActivity extends BaseBugleActivity implements
|
||||
} else if (Intent.ACTION_SEND_MULTIPLE.equals(action)) {
|
||||
final String contentType = intent.getType();
|
||||
// Handle sharing multiple contents.
|
||||
final ArrayList<Uri> uris = intent.getParcelableArrayListExtra(Intent.EXTRA_STREAM);
|
||||
final ArrayList<Uri> uris = intent.getParcelableArrayListExtra(Intent.EXTRA_STREAM,
|
||||
Uri.class);
|
||||
if (uris != null && !uris.isEmpty()) {
|
||||
ArrayMap<Uri, String> uriMap = new ArrayMap<>();
|
||||
StringBuffer strBuffer = new StringBuffer();
|
||||
|
||||
@@ -71,7 +71,7 @@ public class ShareIntentFragment extends DialogFragment implements ConversationL
|
||||
final Activity activity = getActivity();
|
||||
final LayoutInflater inflater = activity.getLayoutInflater();
|
||||
View view = inflater.inflate(R.layout.share_intent_conversation_list_view, null);
|
||||
mEmptyListMessageView = (ListEmptyView) view.findViewById(R.id.no_conversations_view);
|
||||
mEmptyListMessageView = view.findViewById(R.id.no_conversations_view);
|
||||
mEmptyListMessageView.setImageHint(R.drawable.ic_oobe_conv_list);
|
||||
// The default behavior for default layout param generation by LinearLayoutManager is to
|
||||
// provide width and height of WRAP_CONTENT, but this is not desirable for
|
||||
@@ -86,7 +86,7 @@ public class ShareIntentFragment extends DialogFragment implements ConversationL
|
||||
};
|
||||
mListBinding.getData().init(LoaderManager.getInstance(this), mListBinding);
|
||||
mAdapter = new ShareIntentAdapter(activity, null, this);
|
||||
mRecyclerView = (RecyclerView) view.findViewById(android.R.id.list);
|
||||
mRecyclerView = view.findViewById(android.R.id.list);
|
||||
mRecyclerView.setLayoutManager(manager);
|
||||
mRecyclerView.setHasFixedSize(true);
|
||||
mRecyclerView.setAdapter(mAdapter);
|
||||
|
||||
Reference in New Issue
Block a user