From 55b9645651f614a0815c8bbe6cb93a10c600cd2b Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Sat, 18 Jun 2016 12:38:43 -0700 Subject: [PATCH] Fix minor Lint issues --- app/src/main/java/com/limelight/Game.java | 2 -- app/src/main/java/com/limelight/PcView.java | 4 ++-- .../input/capture/ShieldCaptureProvider.java | 2 -- .../input/driver/AbstractController.java | 8 -------- .../binding/input/driver/UsbDriverService.java | 4 ++-- .../input/driver/XboxOneController.java | 4 ---- .../virtual_controller/DigitalButton.java | 2 +- .../input/virtual_controller/DigitalPad.java | 2 +- .../virtual_controller/VirtualController.java | 2 +- .../binding/video/MediaCodecHelper.java | 18 +++++++++--------- .../computers/ComputerDatabaseManager.java | 2 +- .../computers/ComputerManagerService.java | 2 +- .../com/limelight/grid/AppGridAdapter.java | 2 -- .../com/limelight/grid/GenericGridAdapter.java | 2 +- .../grid/assets/CachedAppAssetLoader.java | 4 ++-- .../limelight/grid/assets/DiskAssetLoader.java | 1 - .../preferences/AddComputerManually.java | 2 +- .../limelight/preferences/StreamSettings.java | 1 - .../main/java/com/limelight/utils/Dialog.java | 2 +- .../com/limelight/utils/SpinnerDialog.java | 2 +- 20 files changed, 24 insertions(+), 44 deletions(-) diff --git a/app/src/main/java/com/limelight/Game.java b/app/src/main/java/com/limelight/Game.java index 596e0ce1..c40d8f47 100644 --- a/app/src/main/java/com/limelight/Game.java +++ b/app/src/main/java/com/limelight/Game.java @@ -6,10 +6,8 @@ import com.limelight.binding.input.ControllerHandler; import com.limelight.binding.input.KeyboardTranslator; import com.limelight.binding.input.capture.InputCaptureManager; import com.limelight.binding.input.capture.InputCaptureProvider; -import com.limelight.binding.input.capture.ShieldCaptureProvider; import com.limelight.binding.input.TouchContext; import com.limelight.binding.input.driver.UsbDriverService; -import com.limelight.binding.input.evdev.EvdevCaptureProvider; import com.limelight.binding.input.evdev.EvdevListener; import com.limelight.binding.input.virtual_controller.VirtualController; import com.limelight.binding.video.EnhancedDecoderRenderer; diff --git a/app/src/main/java/com/limelight/PcView.java b/app/src/main/java/com/limelight/PcView.java index 1d7eb09c..f8c2f858 100644 --- a/app/src/main/java/com/limelight/PcView.java +++ b/app/src/main/java/com/limelight/PcView.java @@ -299,7 +299,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks { // Stop updates and wait while pairing stopComputerUpdates(true); - InetAddress addr = null; + InetAddress addr; if (computer.reachability == ComputerDetails.Reachability.LOCAL) { addr = computer.localIp; } @@ -429,7 +429,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks { NvHTTP httpConn; String message; try { - InetAddress addr = null; + InetAddress addr; if (computer.reachability == ComputerDetails.Reachability.LOCAL) { addr = computer.localIp; } diff --git a/app/src/main/java/com/limelight/binding/input/capture/ShieldCaptureProvider.java b/app/src/main/java/com/limelight/binding/input/capture/ShieldCaptureProvider.java index ae8ea046..98bbf7da 100644 --- a/app/src/main/java/com/limelight/binding/input/capture/ShieldCaptureProvider.java +++ b/app/src/main/java/com/limelight/binding/input/capture/ShieldCaptureProvider.java @@ -5,8 +5,6 @@ import android.content.Context; import android.hardware.input.InputManager; import android.view.MotionEvent; -import com.limelight.LimeLog; - import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/app/src/main/java/com/limelight/binding/input/driver/AbstractController.java b/app/src/main/java/com/limelight/binding/input/driver/AbstractController.java index 12fffdc3..99842cb2 100644 --- a/app/src/main/java/com/limelight/binding/input/driver/AbstractController.java +++ b/app/src/main/java/com/limelight/binding/input/driver/AbstractController.java @@ -1,13 +1,5 @@ package com.limelight.binding.input.driver; -import android.hardware.usb.UsbEndpoint; - -import com.limelight.LimeLog; -import com.limelight.binding.video.MediaCodecHelper; - -import java.nio.ByteBuffer; -import java.nio.ByteOrder; - public abstract class AbstractController { private final int deviceId; diff --git a/app/src/main/java/com/limelight/binding/input/driver/UsbDriverService.java b/app/src/main/java/com/limelight/binding/input/driver/UsbDriverService.java index f89500c8..992d5106 100644 --- a/app/src/main/java/com/limelight/binding/input/driver/UsbDriverService.java +++ b/app/src/main/java/com/limelight/binding/input/driver/UsbDriverService.java @@ -72,14 +72,14 @@ public class UsbDriverService extends Service implements UsbDriverListener { // Initial attachment broadcast if (action.equals(UsbManager.ACTION_USB_DEVICE_ATTACHED)) { - UsbDevice device = (UsbDevice) intent.getParcelableExtra(UsbManager.EXTRA_DEVICE); + UsbDevice device = intent.getParcelableExtra(UsbManager.EXTRA_DEVICE); // Continue the state machine handleUsbDeviceState(device); } // Subsequent permission dialog completion intent else if (action.equals(ACTION_USB_PERMISSION)) { - UsbDevice device = (UsbDevice) intent.getParcelableExtra(UsbManager.EXTRA_DEVICE); + UsbDevice device = intent.getParcelableExtra(UsbManager.EXTRA_DEVICE); // If we got this far, we've already found we're able to handle this device if (intent.getBooleanExtra(UsbManager.EXTRA_PERMISSION_GRANTED, false)) { diff --git a/app/src/main/java/com/limelight/binding/input/driver/XboxOneController.java b/app/src/main/java/com/limelight/binding/input/driver/XboxOneController.java index 58582e9c..2cd9cc8c 100644 --- a/app/src/main/java/com/limelight/binding/input/driver/XboxOneController.java +++ b/app/src/main/java/com/limelight/binding/input/driver/XboxOneController.java @@ -3,15 +3,11 @@ package com.limelight.binding.input.driver; import android.hardware.usb.UsbConstants; import android.hardware.usb.UsbDevice; import android.hardware.usb.UsbDeviceConnection; -import android.hardware.usb.UsbEndpoint; -import android.hardware.usb.UsbInterface; import com.limelight.LimeLog; -import com.limelight.binding.video.MediaCodecHelper; import com.limelight.nvstream.input.ControllerPacket; import java.nio.ByteBuffer; -import java.nio.ByteOrder; public class XboxOneController extends AbstractXboxController { diff --git a/app/src/main/java/com/limelight/binding/input/virtual_controller/DigitalButton.java b/app/src/main/java/com/limelight/binding/input/virtual_controller/DigitalButton.java index 2f6e8116..bccc97ad 100644 --- a/app/src/main/java/com/limelight/binding/input/virtual_controller/DigitalButton.java +++ b/app/src/main/java/com/limelight/binding/input/virtual_controller/DigitalButton.java @@ -52,7 +52,7 @@ public class DigitalButton extends VirtualControllerElement { } } - private List listeners = new ArrayList(); + private List listeners = new ArrayList<>(); private String text = ""; private int icon = -1; private long timerLongClickTimeout = 3000; diff --git a/app/src/main/java/com/limelight/binding/input/virtual_controller/DigitalPad.java b/app/src/main/java/com/limelight/binding/input/virtual_controller/DigitalPad.java index d5aa25b2..1cd0c300 100644 --- a/app/src/main/java/com/limelight/binding/input/virtual_controller/DigitalPad.java +++ b/app/src/main/java/com/limelight/binding/input/virtual_controller/DigitalPad.java @@ -20,7 +20,7 @@ public class DigitalPad extends VirtualControllerElement { public final static int DIGITAL_PAD_DIRECTION_UP = 2; public final static int DIGITAL_PAD_DIRECTION_RIGHT = 4; public final static int DIGITAL_PAD_DIRECTION_DOWN = 8; - List listeners = new ArrayList(); + List listeners = new ArrayList<>(); private static final int DPAD_MARGIN = 5; diff --git a/app/src/main/java/com/limelight/binding/input/virtual_controller/VirtualController.java b/app/src/main/java/com/limelight/binding/input/virtual_controller/VirtualController.java index 2f1bbd3b..34d207e2 100644 --- a/app/src/main/java/com/limelight/binding/input/virtual_controller/VirtualController.java +++ b/app/src/main/java/com/limelight/binding/input/virtual_controller/VirtualController.java @@ -48,7 +48,7 @@ public class VirtualController { private RelativeLayout.LayoutParams layoutParamsButtonConfigure = null; private Button buttonConfigure = null; - private List elements = new ArrayList(); + private List elements = new ArrayList<>(); public VirtualController(final NvConnection conn, FrameLayout layout, final Context context) { this.connection = conn; diff --git a/app/src/main/java/com/limelight/binding/video/MediaCodecHelper.java b/app/src/main/java/com/limelight/binding/video/MediaCodecHelper.java index 2c972ef9..91c7e3a8 100644 --- a/app/src/main/java/com/limelight/binding/video/MediaCodecHelper.java +++ b/app/src/main/java/com/limelight/binding/video/MediaCodecHelper.java @@ -34,7 +34,7 @@ public class MediaCodecHelper { private static final List whitelistedHevcDecoders; static { - directSubmitPrefixes = new LinkedList(); + directSubmitPrefixes = new LinkedList<>(); // These decoders have low enough input buffer latency that they // can be directly invoked from the receive thread @@ -48,11 +48,11 @@ public class MediaCodecHelper { } static { - preferredDecoders = new LinkedList(); + preferredDecoders = new LinkedList<>(); } static { - blacklistedDecoderPrefixes = new LinkedList(); + blacklistedDecoderPrefixes = new LinkedList<>(); // Software decoders that don't support H264 high profile blacklistedDecoderPrefixes.add("omx.google"); @@ -65,21 +65,21 @@ public class MediaCodecHelper { } static { - spsFixupBitstreamFixupDecoderPrefixes = new LinkedList(); + spsFixupBitstreamFixupDecoderPrefixes = new LinkedList<>(); spsFixupBitstreamFixupDecoderPrefixes.add("omx.nvidia"); spsFixupBitstreamFixupDecoderPrefixes.add("omx.qcom"); spsFixupBitstreamFixupDecoderPrefixes.add("omx.brcm"); - baselineProfileHackPrefixes = new LinkedList(); + baselineProfileHackPrefixes = new LinkedList<>(); baselineProfileHackPrefixes.add("omx.intel"); - whitelistedAdaptiveResolutionPrefixes = new LinkedList(); + whitelistedAdaptiveResolutionPrefixes = new LinkedList<>(); whitelistedAdaptiveResolutionPrefixes.add("omx.nvidia"); whitelistedAdaptiveResolutionPrefixes.add("omx.qcom"); whitelistedAdaptiveResolutionPrefixes.add("omx.sec"); whitelistedAdaptiveResolutionPrefixes.add("omx.TI"); - constrainedHighProfilePrefixes = new LinkedList(); + constrainedHighProfilePrefixes = new LinkedList<>(); constrainedHighProfilePrefixes.add("omx.intel"); } @@ -218,7 +218,7 @@ public class MediaCodecHelper { @SuppressWarnings("deprecation") @SuppressLint("NewApi") private static LinkedList getMediaCodecList() { - LinkedList infoList = new LinkedList(); + LinkedList infoList = new LinkedList<>(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { MediaCodecList mcl = new MediaCodecList(MediaCodecList.REGULAR_CODECS); @@ -376,7 +376,7 @@ public class MediaCodecHelper { break; cpuInfo.append((char)ch); } - + return cpuInfo.toString(); } finally { br.close(); diff --git a/app/src/main/java/com/limelight/computers/ComputerDatabaseManager.java b/app/src/main/java/com/limelight/computers/ComputerDatabaseManager.java index d3d19867..1caeae07 100644 --- a/app/src/main/java/com/limelight/computers/ComputerDatabaseManager.java +++ b/app/src/main/java/com/limelight/computers/ComputerDatabaseManager.java @@ -68,7 +68,7 @@ public class ComputerDatabaseManager { public List getAllComputers() { Cursor c = computerDb.rawQuery("SELECT * FROM "+COMPUTER_TABLE_NAME, null); - LinkedList computerList = new LinkedList(); + LinkedList computerList = new LinkedList<>(); while (c.moveToNext()) { ComputerDetails details = new ComputerDetails(); diff --git a/app/src/main/java/com/limelight/computers/ComputerManagerService.java b/app/src/main/java/com/limelight/computers/ComputerManagerService.java index 1f4964ce..1970dd2d 100644 --- a/app/src/main/java/com/limelight/computers/ComputerManagerService.java +++ b/app/src/main/java/com/limelight/computers/ComputerManagerService.java @@ -45,7 +45,7 @@ public class ComputerManagerService extends Service { private final AtomicInteger dbRefCount = new AtomicInteger(0); private IdentityManager idManager; - private final LinkedList pollingTuples = new LinkedList(); + private final LinkedList pollingTuples = new LinkedList<>(); private ComputerManagerListener listener = null; private final AtomicInteger activePolls = new AtomicInteger(0); private boolean pollingActive = false; diff --git a/app/src/main/java/com/limelight/grid/AppGridAdapter.java b/app/src/main/java/com/limelight/grid/AppGridAdapter.java index d2635c63..c7f31ed6 100644 --- a/app/src/main/java/com/limelight/grid/AppGridAdapter.java +++ b/app/src/main/java/com/limelight/grid/AppGridAdapter.java @@ -14,8 +14,6 @@ import com.limelight.grid.assets.MemoryAssetLoader; import com.limelight.grid.assets.NetworkAssetLoader; import com.limelight.nvstream.http.ComputerDetails; -import java.security.KeyManagementException; -import java.security.NoSuchAlgorithmException; import java.util.Collections; import java.util.Comparator; diff --git a/app/src/main/java/com/limelight/grid/GenericGridAdapter.java b/app/src/main/java/com/limelight/grid/GenericGridAdapter.java index 439a22b3..19da13c5 100644 --- a/app/src/main/java/com/limelight/grid/GenericGridAdapter.java +++ b/app/src/main/java/com/limelight/grid/GenericGridAdapter.java @@ -16,7 +16,7 @@ public abstract class GenericGridAdapter extends BaseAdapter { protected final Context context; protected final int defaultImageRes; protected final int layoutId; - protected final ArrayList itemList = new ArrayList(); + protected final ArrayList itemList = new ArrayList<>(); protected final LayoutInflater inflater; public GenericGridAdapter(Context context, int layoutId, int defaultImageRes) { diff --git a/app/src/main/java/com/limelight/grid/assets/CachedAppAssetLoader.java b/app/src/main/java/com/limelight/grid/assets/CachedAppAssetLoader.java index fd991b77..8627841d 100644 --- a/app/src/main/java/com/limelight/grid/assets/CachedAppAssetLoader.java +++ b/app/src/main/java/com/limelight/grid/assets/CachedAppAssetLoader.java @@ -135,7 +135,7 @@ public class CachedAppAssetLoader { private LoaderTuple tuple; public LoaderTask(ImageView imageView, boolean diskOnly) { - this.imageViewRef = new WeakReference(imageView); + this.imageViewRef = new WeakReference<>(imageView); this.diskOnly = diskOnly; } @@ -213,7 +213,7 @@ public class CachedAppAssetLoader { public AsyncDrawable(Resources res, Bitmap bitmap, LoaderTask loaderTask) { super(res, bitmap); - loaderTaskReference = new WeakReference(loaderTask); + loaderTaskReference = new WeakReference<>(loaderTask); } public LoaderTask getLoaderTask() { diff --git a/app/src/main/java/com/limelight/grid/assets/DiskAssetLoader.java b/app/src/main/java/com/limelight/grid/assets/DiskAssetLoader.java index 82ce46a3..b22ca2eb 100644 --- a/app/src/main/java/com/limelight/grid/assets/DiskAssetLoader.java +++ b/app/src/main/java/com/limelight/grid/assets/DiskAssetLoader.java @@ -7,7 +7,6 @@ import com.limelight.LimeLog; import com.limelight.utils.CacheHelper; import java.io.File; -import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; diff --git a/app/src/main/java/com/limelight/preferences/AddComputerManually.java b/app/src/main/java/com/limelight/preferences/AddComputerManually.java index cbbc8786..8f22aed9 100644 --- a/app/src/main/java/com/limelight/preferences/AddComputerManually.java +++ b/app/src/main/java/com/limelight/preferences/AddComputerManually.java @@ -29,7 +29,7 @@ import android.widget.Toast; public class AddComputerManually extends Activity { private TextView hostText; private ComputerManagerService.ComputerManagerBinder managerBinder; - private final LinkedBlockingQueue computersToAdd = new LinkedBlockingQueue(); + private final LinkedBlockingQueue computersToAdd = new LinkedBlockingQueue<>(); private Thread addThread; private final ServiceConnection serviceConnection = new ServiceConnection() { public void onServiceConnected(ComponentName className, final IBinder binder) { diff --git a/app/src/main/java/com/limelight/preferences/StreamSettings.java b/app/src/main/java/com/limelight/preferences/StreamSettings.java index 5184d824..73bf9070 100644 --- a/app/src/main/java/com/limelight/preferences/StreamSettings.java +++ b/app/src/main/java/com/limelight/preferences/StreamSettings.java @@ -2,7 +2,6 @@ package com.limelight.preferences; import android.content.Intent; import android.content.SharedPreferences; -import android.content.pm.PackageManager; import android.content.res.Configuration; import android.os.Bundle; import android.app.Activity; diff --git a/app/src/main/java/com/limelight/utils/Dialog.java b/app/src/main/java/com/limelight/utils/Dialog.java index 0621ba7f..4f132dea 100644 --- a/app/src/main/java/com/limelight/utils/Dialog.java +++ b/app/src/main/java/com/limelight/utils/Dialog.java @@ -14,7 +14,7 @@ public class Dialog implements Runnable { private AlertDialog alert; - private static final ArrayList rundownDialogs = new ArrayList(); + private static final ArrayList rundownDialogs = new ArrayList<>(); private Dialog(Activity activity, String title, String message, boolean endAfterDismiss) { diff --git a/app/src/main/java/com/limelight/utils/SpinnerDialog.java b/app/src/main/java/com/limelight/utils/SpinnerDialog.java index 7b65435b..01fe2699 100644 --- a/app/src/main/java/com/limelight/utils/SpinnerDialog.java +++ b/app/src/main/java/com/limelight/utils/SpinnerDialog.java @@ -15,7 +15,7 @@ public class SpinnerDialog implements Runnable,OnCancelListener { private ProgressDialog progress; private final boolean finish; - private static final ArrayList rundownDialogs = new ArrayList(); + private static final ArrayList rundownDialogs = new ArrayList<>(); private SpinnerDialog(Activity activity, String title, String message, boolean finish) {