Messaging: Language cleanup

No unnecessary boxing, enhanced for loops, redundant checks and throws, imports (removal, reordering), possible void returns Change-Id: I7a8e1b2007e3b0906e01b41785c518d02c2f3fab
2024-12-26 15:54:37 +01:00
parent e335f6bec8
commit e128bff457
77 changed files with 202 additions and 334 deletions
@@ -21,9 +21,6 @@ import android.content.res.Resources;
 import android.graphics.Rect;
 import android.net.Uri;
 import android.os.Bundle;
-
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.ActionBar;
 import android.text.Editable;
 import android.text.Html;
 import android.text.InputFilter;
@@ -41,6 +38,8 @@ import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.TextView;

+import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBar;
 import com.android.messaging.Factory;
 import com.android.messaging.R;
 import com.android.messaging.datamodel.binding.Binding;
@@ -320,14 +319,12 @@ public class ComposeMessageView extends LinearLayout
    }

    // returns true if it actually shows the subject editor and false if already showing
-    private boolean showSubjectEditor() {
+    private void showSubjectEditor() {
        // show the subject editor
        if (mSubjectView.getVisibility() == View.GONE) {
            mSubjectView.setVisibility(View.VISIBLE);
            mSubjectView.requestFocus();
-            return true;
        }
-        return false;
    }

    private void hideSubjectEditor() {
@@ -24,12 +24,6 @@ import android.content.res.Resources;
 import android.graphics.Rect;
 import android.graphics.drawable.StateListDrawable;
 import android.os.Handler;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver;
-import androidx.recyclerview.widget.RecyclerView.ViewHolder;
 import android.util.StateSet;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
@@ -40,6 +34,11 @@ import android.view.ViewGroupOverlay;
 import android.widget.ImageView;
 import android.widget.TextView;

+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver;
+import androidx.recyclerview.widget.RecyclerView.ViewHolder;

 import com.android.messaging.R;
 import com.android.messaging.datamodel.data.ConversationMessageData;
@@ -77,9 +76,7 @@ public class ConversationFastScroller extends RecyclerView.OnScrollListener impl
    private static final int HIDE_ANIMATION_DURATION_MS = 300;
    private static final int HIDE_DELAY_MS = 1500;

-    private final Context mContext;
    private final RecyclerView mRv;
-    private final ViewGroupOverlay mOverlay;
    private final ImageView mTrackImageView;
    private final ImageView mThumbImageView;
    private final TextView mPreviewTextView;
@@ -117,7 +114,7 @@ public class ConversationFastScroller extends RecyclerView.OnScrollListener impl
    };

    private ConversationFastScroller(RecyclerView rv, int position) {
-        mContext = rv.getContext();
+        final Context context  = rv.getContext();
        mRv = rv;
        mRv.addOnLayoutChangeListener(this);
        mRv.addOnScrollListener(this);
@@ -131,7 +128,7 @@ public class ConversationFastScroller extends RecyclerView.OnScrollListener impl
        mPosRight = (position == POSITION_RIGHT_SIDE);

        // Cache the dimensions we'll need during layout
-        final Resources res = mContext.getResources();
+        final Resources res = context.getResources();
        mTrackWidth = res.getDimensionPixelSize(R.dimen.fastscroll_track_width);
        mThumbHeight = res.getDimensionPixelSize(R.dimen.fastscroll_thumb_height);
        mPreviewHeight = res.getDimensionPixelSize(R.dimen.fastscroll_preview_height);
@@ -141,7 +138,7 @@ public class ConversationFastScroller extends RecyclerView.OnScrollListener impl
                R.dimen.fastscroll_preview_margin_left_right);
        mTouchSlop = res.getDimensionPixelOffset(R.dimen.fastscroll_touch_slop);

-        final LayoutInflater inflator = LayoutInflater.from(mContext);
+        final LayoutInflater inflator = LayoutInflater.from(context);
        mTrackImageView = (ImageView) inflator.inflate(R.layout.fastscroll_track, null);
        mThumbImageView = (ImageView) inflator.inflate(R.layout.fastscroll_thumb, null);
        mPreviewTextView = (TextView) inflator.inflate(R.layout.fastscroll_preview, null);
@@ -149,10 +146,10 @@ public class ConversationFastScroller extends RecyclerView.OnScrollListener impl
        refreshConversationThemeColor();

        // Add the fast scroll views to the overlay, so they are rendered above the list
-        mOverlay = rv.getOverlay();
-        mOverlay.add(mTrackImageView);
-        mOverlay.add(mThumbImageView);
-        mOverlay.add(mPreviewTextView);
+        final ViewGroupOverlay overlay = rv.getOverlay();
+        overlay.add(mTrackImageView);
+        overlay.add(mThumbImageView);
+        overlay.add(mPreviewTextView);

        hide(false /* animate */);
        mPreviewTextView.setAlpha(0f);
@@ -177,8 +177,8 @@ public class ConversationInputManager implements ConversationInput.ConversationI
    }

    public boolean onNavigationUpPressed() {
-        for (int i = 0; i < mInputs.length; i++) {
-            if (mInputs[i].onNavigationUpPressed()) {
+        for (ConversationInput input : mInputs) {
+            if (input.onNavigationUpPressed()) {
                return true;
            }
        }
@@ -209,8 +209,8 @@ public class ConversationInputManager implements ConversationInput.ConversationI

    public void hideAllInputs(final boolean animate) {
        beginUpdate();
-        for (int i = 0; i < mInputs.length; i++) {
-            showHideInternal(mInputs[i], false, animate);
+        for (ConversationInput input : mInputs) {
+            showHideInternal(input, false, animate);
        }
        endUpdate();
    }
@@ -225,9 +225,9 @@ public class ConversationInputManager implements ConversationInput.ConversationI
    }

    public boolean updateActionBar(final ActionBar actionBar) {
-        for (int i = 0; i < mInputs.length; i++) {
-            if (mInputs[i].mShowing) {
-                return mInputs[i].updateActionBar(actionBar);
+        for (ConversationInput input : mInputs) {
+            if (input.mShowing) {
+                return input.updateActionBar(actionBar);
            }
        }
        return false;
@@ -271,8 +271,7 @@ public class ConversationInputManager implements ConversationInput.ConversationI
        // All inputs are mutually exclusive. Showing one will hide everything else.
        // The one exception, is that the keyboard and location media chooser can be open at the
        // time to enable searching within that chooser
-        for (int i = 0; i < mInputs.length; i++) {
-            final ConversationInput currInput = mInputs[i];
+        for (final ConversationInput currInput : mInputs) {
            if (currInput != target) {
                // TODO : If there's more exceptions we will want to make this more
                // generic
@@ -1,5 +1,6 @@
 /*
 * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -23,15 +24,11 @@ import android.view.View;
 import android.view.ViewGroup;

 import com.android.messaging.R;
-import com.android.messaging.ui.AsyncImageView;
 import com.android.messaging.ui.CursorRecyclerAdapter;
 import com.android.messaging.ui.AsyncImageView.AsyncImageViewDelayLoader;
 import com.android.messaging.ui.conversation.ConversationMessageView.ConversationMessageViewHost;
 import com.android.messaging.util.Assert;

-import java.util.HashSet;
-import java.util.List;
-
 /**
 * Provides an interface to expose Conversation Message Cursor data to a UI widget like a
 * RecyclerView.
@@ -73,7 +73,6 @@ import com.android.messaging.util.UiUtils;
 import com.android.messaging.util.YouTubeUtil;
 import com.google.common.base.Predicate;

-import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;

@@ -238,8 +237,7 @@ public class ConversationMessageView extends FrameLayout implements View.OnClick
     * @param cursor The cursor from a MessageList that this view is in, pointing to its entry.
     * @param oneOnOne Whether this is a 1:1 conversation
     */
-    public void bind(final Cursor cursor,
-            final boolean oneOnOne, final String selectedMessageId) {
+    public void bind(final Cursor cursor, final boolean oneOnOne, final String selectedMessageId) {
        mOneOnOne = oneOnOne;

        // Update our UI model
@@ -494,7 +492,7 @@ public class ConversationMessageView extends FrameLayout implements View.OnClick
        // Bind image attachments. If there are multiple, they are shown in a collage view.
        final List<MessagePartData> imageParts = mData.getAttachments(sImageFilter);
        if (imageParts.size() > 1) {
-            Collections.sort(imageParts, sImageComparator);
+            imageParts.sort(sImageComparator);
            mMultiAttachmentView.bindAttachments(imageParts, null, imageParts.size());
            mMultiAttachmentView.setVisibility(View.VISIBLE);
        } else {
@@ -26,7 +26,6 @@ import com.android.messaging.datamodel.data.SubscriptionListData;
 import com.android.messaging.datamodel.data.SubscriptionListData.SubscriptionListEntry;
 import com.android.messaging.ui.conversation.SimSelectorView.SimSelectorViewListener;
 import com.android.messaging.util.AccessibilityUtil;
-import com.android.messaging.util.Assert;
 import com.android.messaging.util.ThreadUtil;

 /**
@@ -1,5 +1,6 @@
 /*
 * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,15 +18,12 @@ package com.android.messaging.ui.conversation;

 import android.content.Context;
 import android.graphics.Outline;
-import android.net.Uri;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewOutlineProvider;

 import com.android.messaging.ui.ContactIconView;
-import com.android.messaging.util.Assert;
-import com.android.messaging.util.AvatarUriUtil;

 /**
 * Shows SIM avatar icon in the SIM switcher / Self-send button.