Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3c3d592 authored by Michael W's avatar Michael W
Browse files

LineageParts: Remove, add, move ... 

* Modifiers
* Redundant casts
* Conditions that are always true
* Explicit types

* Unused / Unnecessary
  * code
  * variables
  * initialization values
  * imports
  * parameters
  * boxing

* Make global variables local

Change-Id: Icde9891f318b25c82d100b4c121d93643b2c03ac
parent 9a203e5c

src/org/lineageos/lineageparts/PartsUpdater.java

+4 −3
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 The CyanogenMod Project

 * Copyright (C) 2022 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.
@@ -62,7 +63,7 @@ public class PartsUpdater extends RemotePreferenceUpdater { 
            return null;

        }



        if (clazz == null || !Refreshable.class.isAssignableFrom(clazz)) {

        if (!Refreshable.class.isAssignableFrom(clazz)) {

            return null;

        }
@@ -99,8 +100,8 @@ public class PartsUpdater extends RemotePreferenceUpdater { 
    }



    public interface Refreshable extends SettingsHelper.OnSettingsChangeListener {

        public interface SummaryProvider {

            public String getSummary(Context context, String key);

        interface SummaryProvider {

            String getSummary(Context context, String key);

        }

    }

}

src/org/lineageos/lineageparts/SettingsPreferenceFragment.java

+9 −14
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2010 The Android Open Source Project

 *               2020-2021 The LineageOS Project

 *               2020-2022 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.
@@ -86,12 +86,11 @@ public abstract class SettingsPreferenceFragment extends ObservablePreferenceFra 
    // Cache the content resolver for async callbacks

    private ContentResolver mContentResolver;



    private String mPreferenceKey;

    private boolean mPreferenceHighlighted = false;



    private RecyclerView.Adapter mCurrentRootAdapter;

    private boolean mIsDataSetObserverRegistered = false;

    private RecyclerView.AdapterDataObserver mDataSetObserver =

    private final RecyclerView.AdapterDataObserver mDataSetObserver =

            new RecyclerView.AdapterDataObserver() {

        @Override

        public void onChanged() {
@@ -106,7 +105,6 @@ public abstract class SettingsPreferenceFragment extends ObservablePreferenceFra 


    private LayoutPreference mFooter;

    private View mEmptyView;

    private LinearLayoutManager mLayoutManager;

    private HighlightablePreferenceGroupAdapter mAdapter;

    private ArrayMap<String, Preference> mPreferenceCache;

    private boolean mAnimationAllowed;
@@ -126,8 +124,8 @@ public abstract class SettingsPreferenceFragment extends ObservablePreferenceFra 
    public View onCreateView(LayoutInflater inflater, ViewGroup container,

            Bundle savedInstanceState) {

        final View root = super.onCreateView(inflater, container, savedInstanceState);

        mPinnedHeaderFrameLayout = (ViewGroup) root.findViewById(R.id.pinned_header);

        mButtonBar = (ViewGroup) root.findViewById(R.id.button_bar);

        mPinnedHeaderFrameLayout = root.findViewById(R.id.pinned_header);

        mButtonBar = root.findViewById(R.id.button_bar);

        return root;

    }
@@ -171,7 +169,6 @@ public abstract class SettingsPreferenceFragment extends ObservablePreferenceFra 


        final Bundle args = getArguments();

        if (args != null) {

            mPreferenceKey = args.getString(PartsActivity.EXTRA_FRAGMENT_ARG_KEY);

            highlightPreferenceIfNeeded();

        }

    }
@@ -363,8 +360,7 @@ public abstract class SettingsPreferenceFragment extends ObservablePreferenceFra 


    @Override

    public RecyclerView.LayoutManager onCreateLayoutManager() {

        mLayoutManager = new LinearLayoutManager(getContext());

        return mLayoutManager;

        return new LinearLayoutManager(getContext());

    }



    @Override
@@ -470,8 +466,7 @@ public abstract class SettingsPreferenceFragment extends ObservablePreferenceFra 
    public void onAttach(Activity activity) {

        super.onAttach(activity);

        synchronized (mTriggerUris) {

            SettingsHelper.get(activity).startWatching(this,

                    mTriggerUris.toArray(new Uri[mTriggerUris.size()]));

            SettingsHelper.get(activity).startWatching(this, mTriggerUris.toArray(new Uri[0]));

        }

    }
@@ -495,7 +490,7 @@ public abstract class SettingsPreferenceFragment extends ObservablePreferenceFra 
            mTriggerUris.addAll(Arrays.asList(contentUris));

            if (!isDetached()) {

                SettingsHelper.get(getActivity()).startWatching(this,

                        mTriggerUris.toArray(new Uri[mTriggerUris.size()]));

                        mTriggerUris.toArray(new Uri[0]));

            }

        }

    }
@@ -692,11 +687,11 @@ public abstract class SettingsPreferenceFragment extends ObservablePreferenceFra 
    }



    protected Button getBackButton() {

        return (Button) ((PartsActivity)getActivity()).getBackButton();

        return ((PartsActivity)getActivity()).getBackButton();

    }



    protected Button getNextButton() {

        return (Button) ((PartsActivity)getActivity()).getNextButton();

        return ((PartsActivity)getActivity()).getNextButton();

    }



    protected void showButtonBar(boolean show) {

src/org/lineageos/lineageparts/applications/LongScreenSettings.java

+12 −22
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import android.view.LayoutInflater; 
import android.view.View;

import android.view.ViewGroup;

import android.widget.BaseAdapter;

import android.widget.CompoundButton;

import android.widget.ImageView;

import android.widget.ListView;

import android.widget.SectionIndexer;
@@ -43,9 +42,7 @@ import org.lineageos.lineageparts.SettingsPreferenceFragment; 


import java.util.ArrayList;

import java.util.Arrays;

import java.util.HashMap;

import java.util.List;

import java.util.Map;



public class LongScreenSettings extends SettingsPreferenceFragment

        implements ApplicationsState.Callbacks {
@@ -54,10 +51,7 @@ public class LongScreenSettings extends SettingsPreferenceFragment 
    private ApplicationsState mApplicationsState;

    private ApplicationsState.Session mSession;

    private ActivityFilter mActivityFilter;

    private Map<String, ApplicationsState.AppEntry> mEntryMap =

            new HashMap<String, ApplicationsState.AppEntry>();



    private ListView mUserListView;

    private LongScreen mLongScreen;



    @Override
@@ -88,9 +82,9 @@ public class LongScreenSettings extends SettingsPreferenceFragment 
    public void onViewCreated(final View view, @Nullable Bundle savedInstanceState) {

        super.onViewCreated(view, savedInstanceState);



        mUserListView = (ListView) view.findViewById(R.id.user_list_view);

        mUserListView.setAdapter(mAllPackagesAdapter);

        mUserListView.setEmptyView(view.findViewById(R.id.user_list_empty_view));

        ListView userListView = view.findViewById(R.id.user_list_view);

        userListView.setAdapter(mAllPackagesAdapter);

        userListView.setEmptyView(view.findViewById(R.id.user_list_empty_view));

    }



    @Override
@@ -173,10 +167,6 @@ public class LongScreenSettings extends SettingsPreferenceFragment 
        }



        mAllPackagesAdapter.setEntries(entries, sections, positions);

        mEntryMap.clear();

        for (ApplicationsState.AppEntry e : entries) {

            mEntryMap.put(e.info.packageName, e);

        }

    }



    private void rebuild() {
@@ -253,7 +243,7 @@ public class LongScreenSettings extends SettingsPreferenceFragment 
        private void setEntries(List<ApplicationsState.AppEntry> entries,

                List<String> sections, List<Integer> positions) {

            mEntries = entries;

            mSections = sections.toArray(new String[sections.size()]);

            mSections = sections.toArray(new String[0]);

            mPositions = new int[positions.size()];

            for (int i = 0; i < positions.size(); i++) {

                mPositions[i] = positions.get(i);
@@ -296,15 +286,15 @@ public class LongScreenSettings extends SettingsPreferenceFragment 
    }



    private static class ViewHolder {

        private TextView title;

        private ImageView icon;

        private Switch state;

        private View rootView;

        private final TextView title;

        private final ImageView icon;

        private final Switch state;

        private final View rootView;



        private ViewHolder(View view) {

            this.title = (TextView) view.findViewById(R.id.app_name);

            this.icon = (ImageView) view.findViewById(R.id.app_icon);

            this.state = (Switch) view.findViewById(R.id.state);

            this.title = view.findViewById(R.id.app_name);

            this.icon = view.findViewById(R.id.app_icon);

            this.state = view.findViewById(R.id.state);

            this.rootView = view;



            view.setTag(this);
@@ -314,7 +304,7 @@ public class LongScreenSettings extends SettingsPreferenceFragment 
    private class ActivityFilter implements ApplicationsState.AppFilter {



        private final PackageManager mPackageManager;

        private final List<String> mLauncherResolveInfoList = new ArrayList<String>();

        private final List<String> mLauncherResolveInfoList = new ArrayList<>();



        private ActivityFilter(PackageManager packageManager) {

            this.mPackageManager = packageManager;

src/org/lineageos/lineageparts/atv/KeyHandler.java

+0 −2
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package org.lineageos.lineageparts.atv; 
import android.content.Context;

import android.content.Intent;

import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.os.SystemProperties;

import android.provider.Settings;

import android.util.Log;
@@ -27,7 +26,6 @@ import android.view.KeyEvent; 


import com.android.internal.os.DeviceKeyHandler;



import java.util.HashMap;

import java.util.Map;

import java.util.stream.Collectors;

import java.util.stream.IntStream;

src/org/lineageos/lineageparts/contributors/ContributorsCloudFragment.java

+9 −12
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ public class ContributorsCloudFragment extends Fragment implements SearchView.On 
                LayoutInflater li = LayoutInflater.from(getContext());

                convertView = li.inflate(R.layout.contributors_search_result, null);

                ContributorsViewHolder viewHolder = new ContributorsViewHolder();

                viewHolder.mLabel = (TextView) convertView.findViewById(R.id.contributor_name);

                viewHolder.mLabel = convertView.findViewById(R.id.contributor_name);

                convertView.setTag(viewHolder);

            }
@@ -191,7 +191,7 @@ public class ContributorsCloudFragment extends Fragment implements SearchView.On 


        @Override

        protected void onPostExecute(Boolean result) {

            if (result == true) {

            if (result) {

                mImageView.setImageBitmap(mViewInfo.mBitmap);

                mViewController.update();

                if (mNotify) {
@@ -314,12 +314,12 @@ public class ContributorsCloudFragment extends Fragment implements SearchView.On 


        mLoadingView= v.findViewById(R.id.contributors_cloud_loading);

        mFailedView= v.findViewById(R.id.contributors_cloud_failed);

        mImageView = (ImageView) v.findViewById(R.id.contributors_cloud_image);

        mImageView = v.findViewById(R.id.contributors_cloud_image);

        mViewController = new ContributorsCloudViewController(mImageView);

        mViewController.setMaximumScale(20f);

        mViewController.setMediumScale(7f);



        mSearchResults = (ListView) v.findViewById(R.id.contributors_cloud_search_results);

        mSearchResults = v.findViewById(R.id.contributors_cloud_search_results);

        mSearchAdapter = new ContributorsAdapter(getActivity());

        mSearchResults.setAdapter(mSearchAdapter);

        mSearchResults.setOnItemClickListener(new OnItemClickListener() {
@@ -346,7 +346,7 @@ public class ContributorsCloudFragment extends Fragment implements SearchView.On 
        if (args != null) {

            String c = args.getString(PartsActivity.EXTRA_FRAGMENT_ARG_KEY);

            if (c != null && c.startsWith(KEY_PREFIX)) {

                onContributorSelected(Integer.valueOf(c.substring(KEY_PREFIX.length())));

                onContributorSelected(Integer.parseInt(c.substring(KEY_PREFIX.length())));

                args.remove(PartsActivity.EXTRA_FRAGMENT_ARG_KEY);

            }

        }
@@ -575,8 +575,8 @@ public class ContributorsCloudFragment extends Fragment implements SearchView.On 
                    int cy = ih / 2;

                    int cbx = bsize / 2;

                    int cby = bsize / 2;

                    float cw = 0f;

                    float ch = 0f;

                    float cw;

                    float ch;

                    if (r == 0) {

                        cw = translate(w, bsize, Math.min(iw, ih)) / 2;

                        ch = translate(h, bsize, Math.min(iw, ih)) / 2;
@@ -787,7 +787,7 @@ public class ContributorsCloudFragment extends Fragment implements SearchView.On 
    public static void extractContributorsCloudDatabase(Context context) {

        final int BUFFER = 1024;

        InputStream is = null;

        OutputStream os = null;

        OutputStream os;

        File databasePath = context.getDatabasePath(DB_NAME);

        try {

            databasePath.getParentFile().mkdir();
@@ -819,7 +819,7 @@ public class ContributorsCloudFragment extends Fragment implements SearchView.On 


                    // Index the top 100 contributors, for fun :)

                    File dbPath = context.getDatabasePath(DB_NAME);

                    SQLiteDatabase db = null;

                    SQLiteDatabase db;

                    try {

                        db = SQLiteDatabase.openDatabase(dbPath.getAbsolutePath(),

                                null, SQLiteDatabase.OPEN_READONLY);
@@ -829,9 +829,6 @@ public class ContributorsCloudFragment extends Fragment implements SearchView.On 
                        }

                    } catch (Exception e) {

                        Log.e(TAG, e.getMessage(), e);

                        if (db != null && db.isOpen()) {

                            db.close();

                        }

                        return null;

                    }