Tighten up a bunch of declarations to make Lint happier

app/build.gradle

@@ -67,7 +67,7 @@ dependencies {
     compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.51'
     compile group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '1.51'
 
-    compile group: 'com.google.android', name: 'support-v4', version:'21.0.3'
+    compile group: 'com.google.android', name: 'support-v4', version:'r7'
     compile group: 'com.koushikdutta.ion', name: 'ion', version:'2.0.5'
     compile group: 'com.google.code.gson', name: 'gson', version:'2.3.1'
 

app/src/main/java/com/limelight/AppView.java

@@ -74,7 +74,7 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
 	public final static String UUID_EXTRA = "UUID";
 
     private ComputerManagerService.ComputerManagerBinder managerBinder;
-    private ServiceConnection serviceConnection = new ServiceConnection() {
+    private final ServiceConnection serviceConnection = new ServiceConnection() {
         public void onServiceConnected(ComponentName className, IBinder binder) {
             final ComputerManagerService.ComputerManagerBinder localBinder =
                     ((ComputerManagerService.ComputerManagerBinder)binder);
@@ -172,7 +172,7 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
                         blockingLoadSpinner.dismiss();
                         blockingLoadSpinner = null;
                     }
-                } catch (Exception e) {}
+                } catch (Exception ignored) {}
             }
         });
 
@@ -505,7 +505,7 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
     }
 
     public class AppObject {
-		public NvApp app;
+		public final NvApp app;
 		
 		public AppObject(NvApp app) {
 			this.app = app;

app/src/main/java/com/limelight/Game.java

@@ -60,7 +60,7 @@ public class Game extends Activity implements SurfaceHolder.Callback,
 	private int lastButtonState = 0;
 	
 	// Only 2 touches are supported
-	private TouchContext[] touchContextMap = new TouchContext[2];
+	private final TouchContext[] touchContextMap = new TouchContext[2];
     private long threeFingerDownTime = 0;
 
     private static final int THREE_FINGER_TAP_THRESHOLD = 300;
@@ -69,7 +69,7 @@ public class Game extends Activity implements SurfaceHolder.Callback,
 	private KeyboardTranslator keybTranslator;
 	
 	private PreferenceConfiguration prefConfig;
-	private Point screenSize = new Point(0, 0);
+	private final Point screenSize = new Point(0, 0);
 	
 	private NvConnection conn;
 	private SpinnerDialog spinner;
@@ -246,7 +246,7 @@ public class Game extends Activity implements SurfaceHolder.Callback,
 	}
 
 	@SuppressLint("InlinedApi")
-	private Runnable hideSystemUi = new Runnable() {
+	private final Runnable hideSystemUi = new Runnable() {
 			@Override
 			public void run() {
 				// Use immersive mode on 4.4+ or standard low profile on previous builds
@@ -315,7 +315,7 @@ public class Game extends Activity implements SurfaceHolder.Callback,
 		wifiLock.release();
 	}
 	
-	private Runnable toggleGrab = new Runnable() {
+	private final Runnable toggleGrab = new Runnable() {
 		@Override
 		public void run() {
 			

app/src/main/java/com/limelight/PcView.java

@@ -53,7 +53,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
     private PcGridAdapter pcGridAdapter;
 	private ComputerManagerService.ComputerManagerBinder managerBinder;
 	private boolean freezeUpdates, runningPolling;
-	private ServiceConnection serviceConnection = new ServiceConnection() {
+	private final ServiceConnection serviceConnection = new ServiceConnection() {
 		public void onServiceConnected(ComponentName className, IBinder binder) {
 			final ComputerManagerService.ComputerManagerBinder localBinder =
 					((ComputerManagerService.ComputerManagerBinder)binder);

app/src/main/java/com/limelight/binding/audio/AndroidAudioRenderer.java

@@ -9,7 +9,7 @@ import com.limelight.nvstream.av.audio.AudioRenderer;
 
 public class AndroidAudioRenderer implements AudioRenderer {
 
-	public static final int FRAME_SIZE = 960;
+	private static final int FRAME_SIZE = 960;
 	
 	private AudioTrack track;
 

app/src/main/java/com/limelight/binding/crypto/AndroidCryptoProvider.java

@@ -45,8 +45,8 @@ import com.limelight.nvstream.http.LimelightCryptoProvider;
 
 public class AndroidCryptoProvider implements LimelightCryptoProvider {
 
-	private File certFile;
+	private final File certFile;
-	private File keyFile;
+	private final File keyFile;
 	
 	private X509Certificate cert;
 	private RSAPrivateKey key;

app/src/main/java/com/limelight/binding/input/ControllerHandler.java

@@ -30,17 +30,17 @@ public class ControllerHandler implements InputManager.InputDeviceListener {
 	private static final int EMULATED_SPECIAL_UP_DELAY_MS = 100;
 	private static final int EMULATED_SELECT_UP_DELAY_MS = 30;
 	
-	private Vector2d inputVector = new Vector2d();
+	private final Vector2d inputVector = new Vector2d();
 	
-	private HashMap<String, ControllerContext> contexts = new HashMap<String, ControllerContext>();
+	private final HashMap<String, ControllerContext> contexts = new HashMap<String, ControllerContext>();
 	
-	private NvConnection conn;
+	private final NvConnection conn;
-    private double stickDeadzone;
+    private final double stickDeadzone;
     private final ControllerContext defaultContext = new ControllerContext();
-    private GameGestures gestures;
+    private final GameGestures gestures;
     private boolean hasGameController;
 
-    private boolean multiControllerEnabled;
+    private final boolean multiControllerEnabled;
     private short currentControllers;
 	
 	public ControllerHandler(NvConnection conn, GameGestures gestures, boolean multiControllerEnabled, int deadzonePercentage) {

app/src/main/java/com/limelight/binding/input/KeyboardTranslator.java

@@ -15,7 +15,7 @@ public class KeyboardTranslator extends KeycodeTranslator {
 	/**
 	 * GFE's prefix for every key code
 	 */
-	public static final short KEY_PREFIX = (short) 0x80;
+	private static final short KEY_PREFIX = (short) 0x80;
 	
 	public static final int VK_0 = 48;
 	public static final int VK_9 = 57;

app/src/main/java/com/limelight/binding/input/TouchContext.java

@@ -11,9 +11,10 @@ public class TouchContext {
 	private long originalTouchTime = 0;
     private boolean cancelled;
 	
-	private NvConnection conn;
+	private final NvConnection conn;
-	private int actionIndex;
+	private final int actionIndex;
-    private double xFactor, yFactor;
+    private final double xFactor;
+    private final double yFactor;
 	
 	private static final int TAP_MOVEMENT_THRESHOLD = 10;
 	private static final int TAP_TIME_THRESHOLD = 250;

app/src/main/java/com/limelight/binding/input/evdev/EvdevEvent.java

@@ -29,9 +29,9 @@ public class EvdevEvent {
 	/* Keys */
 	public static final short KEY_Q = 16;
 	
-	public short type;
+	public final short type;
-	public short code;
+	public final short code;
-	public int value;
+	public final int value;
 	
 	public EvdevEvent(short type, short code, int value) {
 		this.type = type;

app/src/main/java/com/limelight/binding/input/evdev/EvdevHandler.java

@@ -7,12 +7,12 @@ import com.limelight.LimeLog;
 
 public class EvdevHandler {
 
-	private String absolutePath;
+	private final String absolutePath;
-	private EvdevListener listener;
+	private final EvdevListener listener;
 	private boolean shutdown = false;
 	private int fd = -1;
 	
-	private Thread handlerThread = new Thread() {
+	private final Thread handlerThread = new Thread() {
 		@Override
 		public void run() {
 			// All the finally blocks here make this code look like a mess

app/src/main/java/com/limelight/binding/input/evdev/EvdevTranslator.java

@@ -4,7 +4,7 @@ import android.view.KeyEvent;
 
 public class EvdevTranslator {
 
-	public static final short EVDEV_KEY_CODES[] = {
+	private static final short[] EVDEV_KEY_CODES = {
 		0, //KeyEvent.VK_RESERVED
 		KeyEvent.KEYCODE_ESCAPE,
 		KeyEvent.KEYCODE_1,

app/src/main/java/com/limelight/binding/video/AndroidCpuDecoderRenderer.java

@@ -36,7 +36,7 @@ public class AndroidCpuDecoderRenderer extends EnhancedDecoderRenderer {
 	private int totalFrames;
 	private long totalTimeMs;
 	
-	private int cpuCount = Runtime.getRuntime().availableProcessors();
+	private final int cpuCount = Runtime.getRuntime().availableProcessors();
 	
 	@SuppressWarnings("unused")
 	private int findOptimalPerformanceLevel() {

app/src/main/java/com/limelight/binding/video/MediaCodecDecoderRenderer.java

@@ -558,8 +558,8 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
     public class RendererException extends RuntimeException {
 		private static final long serialVersionUID = 8985937536997012406L;
 		
-		private Exception originalException;
+		private final Exception originalException;
-		private MediaCodecDecoderRenderer renderer;
+		private final MediaCodecDecoderRenderer renderer;
 		private ByteBuffer currentBuffer;
 		private int currentCodecFlags;
 		

app/src/main/java/com/limelight/binding/video/MediaCodecHelper.java

@@ -20,12 +20,12 @@ import com.limelight.LimeLog;
 
 public class MediaCodecHelper {
 	
-	public static final List<String> preferredDecoders;
+	private static final List<String> preferredDecoders;
 
-	public static final List<String> blacklistedDecoderPrefixes;
+	private static final List<String> blacklistedDecoderPrefixes;
-	public static final List<String> spsFixupBitstreamFixupDecoderPrefixes;
+	private static final List<String> spsFixupBitstreamFixupDecoderPrefixes;
-	public static final List<String> whitelistedAdaptiveResolutionPrefixes;
+	private static final List<String> whitelistedAdaptiveResolutionPrefixes;
-    public static final List<String> baselineProfileHackPrefixes;
+    private static final List<String> baselineProfileHackPrefixes;
 	
 	static {
 		preferredDecoders = new LinkedList<String>();
@@ -146,7 +146,7 @@ public class MediaCodecHelper {
 		return str;
 	}
 	
-	public static MediaCodecInfo findPreferredDecoder() {
+	private static MediaCodecInfo findPreferredDecoder() {
 		// This is a different algorithm than the other findXXXDecoder functions,
 		// because we want to evaluate the decoders in our list's order
 		// rather than MediaCodecList's order
@@ -217,7 +217,7 @@ public class MediaCodecHelper {
 	// since some bad decoders can throw IllegalArgumentExceptions unexpectedly
 	// and we want to be sure all callers are handling this possibility
 	@SuppressWarnings("RedundantThrows")
-    public static MediaCodecInfo findKnownSafeDecoder() throws Exception {
+    private static MediaCodecInfo findKnownSafeDecoder() throws Exception {
 		for (MediaCodecInfo codecInfo : getMediaCodecList()) {		
 			// Skip encoders
 			if (codecInfo.isEncoder()) {

app/src/main/java/com/limelight/computers/ComputerManagerService.java

@@ -33,15 +33,15 @@ public class ComputerManagerService extends Service {
 	private static final int POLLING_PERIOD_MS = 3000;
 	private static final int MDNS_QUERY_PERIOD_MS = 1000;
 	
-	private ComputerManagerBinder binder = new ComputerManagerBinder();
+	private final ComputerManagerBinder binder = new ComputerManagerBinder();
 	
 	private ComputerDatabaseManager dbManager;
-	private AtomicInteger dbRefCount = new AtomicInteger(0);
+	private final AtomicInteger dbRefCount = new AtomicInteger(0);
 	
 	private IdentityManager idManager;
 	private final LinkedList<PollingTuple> pollingTuples = new LinkedList<PollingTuple>();
 	private ComputerManagerListener listener = null;
-	private AtomicInteger activePolls = new AtomicInteger(0);
+	private final AtomicInteger activePolls = new AtomicInteger(0);
     private boolean pollingActive = false;
 
 	private DiscoveryService.DiscoveryBinder discoveryBinder;
@@ -491,8 +491,8 @@ public class ComputerManagerService extends Service {
 
     public class ApplistPoller {
         private Thread thread;
-        private ComputerDetails computer;
+        private final ComputerDetails computer;
-        private Object pollEvent = new Object();
+        private final Object pollEvent = new Object();
 
         public ApplistPoller(ComputerDetails computer) {
             this.computer = computer;
@@ -593,7 +593,7 @@ public class ComputerManagerService extends Service {
 
 class PollingTuple {
     public Thread thread;
-    public ComputerDetails computer;
+    public final ComputerDetails computer;
 
     public PollingTuple(ComputerDetails computer, Thread thread) {
         this.computer = computer;

app/src/main/java/com/limelight/discovery/DiscoveryService.java

@@ -70,7 +70,7 @@ public class DiscoveryService extends Service {
 		});
 	}
 	
-	private DiscoveryBinder binder = new DiscoveryBinder();
+	private final DiscoveryBinder binder = new DiscoveryBinder();
 	
 	@Override
 	public IBinder onBind(Intent intent) {

app/src/main/java/com/limelight/grid/AppGridAdapter.java

@@ -51,10 +51,10 @@ import java.security.cert.X509Certificate;
 
 public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
 
-    private ComputerDetails computer;
+    private final ComputerDetails computer;
-    private String uniqueId;
+    private final String uniqueId;
-    private LimelightCryptoProvider cryptoProvider;
+    private final LimelightCryptoProvider cryptoProvider;
-    private SSLContext sslContext;
+    private final SSLContext sslContext;
     private final HashMap<ImageView, Future> pendingRequests = new HashMap<ImageView, Future>();
 
     public AppGridAdapter(Context context, boolean listMode, boolean small, ComputerDetails computer, String uniqueId) throws NoSuchAlgorithmException, KeyManagementException {
@@ -69,7 +69,7 @@ public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
         sslContext.init(ourKeyman, trustAllCerts, new SecureRandom());
     }
 
-    TrustManager[] trustAllCerts = new TrustManager[] {
+    private final TrustManager[] trustAllCerts = new TrustManager[] {
             new X509TrustManager() {
                 public X509Certificate[] getAcceptedIssuers() {
                     return new X509Certificate[0];
@@ -78,7 +78,7 @@ public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
                 public void checkServerTrusted(X509Certificate[] certs, String authType) {}
             }};
 
-    KeyManager[] ourKeyman = new KeyManager[] {
+    private final KeyManager[] ourKeyman = new KeyManager[] {
             new X509KeyManager() {
                 public String chooseClientAlias(String[] keyTypes,
                                                 Principal[] issuers, Socket socket) {
@@ -203,8 +203,8 @@ public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
     }
 
     private class ImageCacheRequest extends AsyncTask<Void, Void, Bitmap> {
-        private ImageView view;
+        private final ImageView view;
-        private int appId;
+        private final int appId;
 
         public ImageCacheRequest(ImageView view, int appId) {
             this.view = view;
@@ -223,7 +223,7 @@ public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
                 if (in != null) {
                     try {
                         in.close();
-                    } catch (IOException e) {}
+                    } catch (IOException ignored) {}
                 }
             }
             return null;
@@ -249,6 +249,7 @@ public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
                 // Set SSL contexts correctly to allow us to authenticate
                 Ion.getDefault(context).getHttpClient().getSSLSocketMiddleware().setTrustManagers(trustAllCerts);
                 Ion.getDefault(context).getHttpClient().getSSLSocketMiddleware().setSSLContext(sslContext);
+                Ion.getDefault(context).getHttpClient().getSSLSocketMiddleware().setHostnameVerifier(hv);
 
                 // Kick off the deferred image load
                 synchronized (pendingRequests) {

app/src/main/java/com/limelight/grid/GenericGridAdapter.java

@@ -13,11 +13,11 @@ import com.limelight.R;
 import java.util.ArrayList;
 
 public abstract class GenericGridAdapter<T> extends BaseAdapter {
-    protected Context context;
+    protected final Context context;
-    protected int defaultImageRes;
+    protected final int defaultImageRes;
-    protected int layoutId;
+    protected final int layoutId;
-    protected ArrayList<T> itemList = new ArrayList<T>();
+    protected final ArrayList<T> itemList = new ArrayList<T>();
-    protected LayoutInflater inflater;
+    protected final LayoutInflater inflater;
 
     public GenericGridAdapter(Context context, int layoutId, int defaultImageRes) {
         this.context = context;

app/src/main/java/com/limelight/preferences/AddComputerManually.java

@@ -27,9 +27,9 @@ import android.widget.Toast;
 public class AddComputerManually extends Activity {
 	private TextView hostText;
 	private ComputerManagerService.ComputerManagerBinder managerBinder;
-	private LinkedBlockingQueue<String> computersToAdd = new LinkedBlockingQueue<String>();
+	private final LinkedBlockingQueue<String> computersToAdd = new LinkedBlockingQueue<String>();
 	private Thread addThread;
-	private ServiceConnection serviceConnection = new ServiceConnection() {
+	private final ServiceConnection serviceConnection = new ServiceConnection() {
 		public void onServiceConnected(ComponentName className, final IBinder binder) {
 			managerBinder = ((ComputerManagerService.ComputerManagerBinder)binder);
 			startAddThread();

app/src/main/java/com/limelight/preferences/SeekBarPreference.java

@@ -20,10 +20,14 @@ public class SeekBarPreference extends DialogPreference
 
     private SeekBar seekBar;
     private TextView valueText;
-    private Context context;
+    private final Context context;
 
-    private String dialogMessage, suffix;
+    private final String dialogMessage;
-    private int defaultValue, maxValue, minValue, currentValue;
+    private final String suffix;
+    private final int defaultValue;
+    private final int maxValue;
+    private final int minValue;
+    private int currentValue;
 
     public SeekBarPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
@@ -127,13 +131,6 @@ public class SeekBarPreference extends DialogPreference
         }
     }
 
-    public void setMax(int max) {
-        this.maxValue = max;
-    }
-    public int getMax() {
-        return this.maxValue;
-    }
-
     public void setProgress(int progress) {
         this.currentValue = progress;
         if (seekBar != null) {

app/src/main/java/com/limelight/utils/Dialog.java

@@ -7,15 +7,16 @@ import android.app.AlertDialog;
 import android.content.DialogInterface;
 
 public class Dialog implements Runnable {
-	private String title, message;
+	private final String title;
-	private Activity activity;
+    private final String message;
-	private boolean endAfterDismiss;
+	private final Activity activity;
+	private final boolean endAfterDismiss;
 	
 	private AlertDialog alert;
 	
 	private static final ArrayList<Dialog> rundownDialogs = new ArrayList<Dialog>();
 	
-	public Dialog(Activity activity, String title, String message, boolean endAfterDismiss)
+	private Dialog(Activity activity, String title, String message, boolean endAfterDismiss)
 	{
 		this.activity = activity;
 		this.title = title;

app/src/main/java/com/limelight/utils/SpinnerDialog.java

@@ -9,14 +9,15 @@ import android.content.DialogInterface;
 import android.content.DialogInterface.OnCancelListener;
 
 public class SpinnerDialog implements Runnable,OnCancelListener {
-	private String title, message;
+	private final String title;
-	private Activity activity;
+    private final String message;
+	private final Activity activity;
 	private ProgressDialog progress;
-	private boolean finish;
+	private final boolean finish;
 	
 	private static final ArrayList<SpinnerDialog> rundownDialogs = new ArrayList<SpinnerDialog>();
 	
-	public SpinnerDialog(Activity activity, String title, String message, boolean finish)
+	private SpinnerDialog(Activity activity, String title, String message, boolean finish)
 	{
 		this.activity = activity;
 		this.title = title;