Fix Lint warnings

app/src/main/AndroidManifest.xml

@@ -36,7 +36,7 @@
         android:banner="@drawable/atv_banner"
         android:appCategory="game"
         android:icon="@mipmap/ic_launcher"
-        android:roundIcon="@mipmap/ic_launcher_round"
+        android:roundIcon="@mipmap/ic_launcher"
         android:theme="@style/AppTheme">
 
         <!-- Samsung multi-window support -->

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

@@ -2,7 +2,6 @@ package com.limelight;
 
 import java.io.StringReader;
 import java.util.List;
-import java.util.Locale;
 import java.util.UUID;
 
 import com.limelight.computers.ComputerManagerListener;
@@ -27,7 +26,6 @@ import android.app.Service;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.content.ServiceConnection;
-import android.content.res.Configuration;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.view.ContextMenu;
@@ -250,7 +248,7 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
         String computerName = getIntent().getStringExtra(NAME_EXTRA);
 
         String labelText = getResources().getString(R.string.title_applist)+" "+computerName;
-        TextView label = (TextView) findViewById(R.id.appListText);
+        TextView label = findViewById(R.id.appListText);
         setTitle(labelText);
         label.setText(labelText);
 

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

@@ -167,7 +167,7 @@ public class Game extends Activity implements SurfaceHolder.Callback,
         prefConfig = PreferenceConfiguration.readPreferences(this);
 
         // Listen for events on the game surface
-        streamView = (StreamView) findViewById(R.id.surfaceView);
+        streamView = findViewById(R.id.surfaceView);
         streamView.setOnGenericMotionListener(this);
         streamView.setOnTouchListener(this);
 
@@ -274,7 +274,7 @@ public class Game extends Activity implements SurfaceHolder.Callback,
         if (prefConfig.onscreenController) {
             // create virtual onscreen controller
             virtualController = new VirtualController(conn,
-                    (FrameLayout)findViewById(R.id.surfaceView).getParent(),
+                    (FrameLayout)streamView.getParent(),
                     this);
             virtualController.refreshLayout();
         }
@@ -596,9 +596,8 @@ public class Game extends Activity implements SurfaceHolder.Callback,
 
         boolean handled = false;
 
-        boolean detectedGamepad = event.getDevice() == null ? false :
+        boolean detectedGamepad = event.getDevice() != null && ((event.getDevice().getSources() & InputDevice.SOURCE_JOYSTICK) == InputDevice.SOURCE_JOYSTICK ||
-                ((event.getDevice().getSources() & InputDevice.SOURCE_JOYSTICK) == InputDevice.SOURCE_JOYSTICK ||
+                (event.getDevice().getSources() & InputDevice.SOURCE_GAMEPAD) == InputDevice.SOURCE_GAMEPAD);
-                        (event.getDevice().getSources() & InputDevice.SOURCE_GAMEPAD) == InputDevice.SOURCE_GAMEPAD);
         if (detectedGamepad || (event.getDevice() == null ||
                 event.getDevice().getKeyboardType() != InputDevice.KEYBOARD_TYPE_ALPHABETIC
         )) {
@@ -638,9 +637,8 @@ public class Game extends Activity implements SurfaceHolder.Callback,
         }
 
         boolean handled = false;
-        boolean detectedGamepad = event.getDevice() == null ? false :
+        boolean detectedGamepad = event.getDevice() != null && ((event.getDevice().getSources() & InputDevice.SOURCE_JOYSTICK) == InputDevice.SOURCE_JOYSTICK ||
-                ((event.getDevice().getSources() & InputDevice.SOURCE_JOYSTICK) == InputDevice.SOURCE_JOYSTICK ||
+                (event.getDevice().getSources() & InputDevice.SOURCE_GAMEPAD) == InputDevice.SOURCE_GAMEPAD);
-                        (event.getDevice().getSources() & InputDevice.SOURCE_GAMEPAD) == InputDevice.SOURCE_GAMEPAD);
         if (detectedGamepad || (event.getDevice() == null ||
                 event.getDevice().getKeyboardType() != InputDevice.KEYBOARD_TYPE_ALPHABETIC
         )) {

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

@@ -51,14 +51,8 @@ public class HelpActivity extends Activity {
 
             @Override
             public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                if (url.toUpperCase().startsWith("https://github.com/moonlight-stream/moonlight-docs/wiki/".toUpperCase()) ||
+                return !(url.toUpperCase().startsWith("https://github.com/moonlight-stream/moonlight-docs/wiki/".toUpperCase()) ||
-                        url.toUpperCase().startsWith("http://github.com/moonlight-stream/moonlight-docs/wiki/".toUpperCase())) {
+                        url.toUpperCase().startsWith("http://github.com/moonlight-stream/moonlight-docs/wiki/".toUpperCase()));
-                    // Allow navigation to Moonlight docs
-                    return false;
-                }
-                else {
-                    return true;
-                }
             }
         });
 

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

@@ -2,9 +2,7 @@ package com.limelight;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.net.InetAddress;
 import java.net.UnknownHostException;
-import java.util.Locale;
 
 import com.limelight.binding.PlatformBinding;
 import com.limelight.binding.crypto.AndroidCryptoProvider;
@@ -110,9 +108,9 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
         PreferenceManager.setDefaultValues(this, R.xml.preferences, false);
 
         // Setup the list view
-        ImageButton settingsButton = (ImageButton) findViewById(R.id.settingsButton);
+        ImageButton settingsButton = findViewById(R.id.settingsButton);
-        ImageButton addComputerButton = (ImageButton) findViewById(R.id.manuallyAddPc);
+        ImageButton addComputerButton = findViewById(R.id.manuallyAddPc);
-        ImageButton helpButton = (ImageButton) findViewById(R.id.helpButton);
+        ImageButton helpButton = findViewById(R.id.helpButton);
 
         settingsButton.setOnClickListener(new OnClickListener() {
             @Override
@@ -138,7 +136,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
             .replace(R.id.pcFragmentContainer, new AdapterFragment())
             .commitAllowingStateLoss();
 
-        noPcFoundLayout = (RelativeLayout) findViewById(R.id.no_pc_found_layout);
+        noPcFoundLayout = findViewById(R.id.no_pc_found_layout);
         if (pcGridAdapter.getCount() == 0) {
             noPcFoundLayout.setVisibility(View.VISIBLE);
         }

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

@@ -2,8 +2,6 @@ package com.limelight.binding.input;
 
 import android.view.KeyEvent;
 
-import com.limelight.nvstream.NvConnection;
-
 /**
  * Class to translate a Android key code into the codes GFE is expecting
  * @author Diego Waxemberg

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

@@ -1,12 +1,12 @@
 package com.limelight.binding.input.evdev;
 
 public interface EvdevListener {
-    public static final int BUTTON_LEFT = 1;
+    int BUTTON_LEFT = 1;
-    public static final int BUTTON_MIDDLE = 2;
+    int BUTTON_MIDDLE = 2;
-    public static final int BUTTON_RIGHT = 3;
+    int BUTTON_RIGHT = 3;
 
-    public void mouseMove(int deltaX, int deltaY);
+    void mouseMove(int deltaX, int deltaY);
-    public void mouseButtonEvent(int buttonId, boolean down);
+    void mouseButtonEvent(int buttonId, boolean down);
-    public void mouseScroll(byte amount);
+    void mouseScroll(byte amount);
-    public void keyboardEvent(boolean buttonDown, short keyCode);
+    void keyboardEvent(boolean buttonDown, short keyCode);
 }

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

@@ -3,5 +3,5 @@ package com.limelight.computers;
 import com.limelight.nvstream.http.ComputerDetails;
 
 public interface ComputerManagerListener {
-    public void notifyComputerUpdated(ComputerDetails details);
+    void notifyComputerUpdated(ComputerDetails details);
 }

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

@@ -3,7 +3,6 @@ package com.limelight.computers;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.StringReader;
-import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.util.LinkedList;

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

@@ -55,10 +55,10 @@ public abstract class GenericGridAdapter<T> extends BaseAdapter {
             convertView = inflater.inflate(layoutId, viewGroup, false);
         }
 
-        ImageView imgView = (ImageView) convertView.findViewById(R.id.grid_image);
+        ImageView imgView = convertView.findViewById(R.id.grid_image);
-        ImageView overlayView = (ImageView) convertView.findViewById(R.id.grid_overlay);
+        ImageView overlayView = convertView.findViewById(R.id.grid_overlay);
-        TextView txtView = (TextView) convertView.findViewById(R.id.grid_text);
+        TextView txtView = convertView.findViewById(R.id.grid_text);
-        ProgressBar prgView = (ProgressBar) convertView.findViewById(R.id.grid_spinner);
+        ProgressBar prgView = convertView.findViewById(R.id.grid_spinner);
 
         if (imgView != null) {
             if (!populateImageView(imgView, prgView, itemList.get(i))) {

app/src/main/java/com/limelight/grid/assets/NetworkAssetLoader.java

@@ -4,13 +4,11 @@ import android.content.Context;
 
 import com.limelight.LimeLog;
 import com.limelight.binding.PlatformBinding;
-import com.limelight.nvstream.http.ComputerDetails;
 import com.limelight.nvstream.http.NvHTTP;
 import com.limelight.utils.ServerHelper;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.InetAddress;
 
 public class NetworkAssetLoader {
     private final Context context;

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

@@ -1,8 +1,5 @@
 package com.limelight.preferences;
 
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.Locale;
 import java.util.concurrent.LinkedBlockingQueue;
 
 import com.limelight.computers.ComputerManagerService;
@@ -17,7 +14,6 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
-import android.content.res.Configuration;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.view.KeyEvent;
@@ -136,7 +132,7 @@ public class AddComputerManually extends Activity {
 
         UiHelper.notifyNewRootView(this);
 
-        this.hostText = (TextView) findViewById(R.id.hostTextView);
+        this.hostText = findViewById(R.id.hostTextView);
         hostText.setImeOptions(EditorInfo.IME_ACTION_DONE);
         hostText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override

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

@@ -3,7 +3,6 @@ package com.limelight.preferences;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
-import android.content.res.Configuration;
 import android.os.Build;
 import android.preference.PreferenceManager;
 

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.res.Configuration;
 import android.os.Bundle;
 import android.app.Activity;
 import android.preference.Preference;
@@ -15,8 +14,6 @@ import com.limelight.PcView;
 import com.limelight.R;
 import com.limelight.utils.UiHelper;
 
-import java.util.Locale;
-
 public class StreamSettings extends Activity {
     private PreferenceConfiguration previousPrefs;
 

app/src/main/java/com/limelight/ui/AdapterFragmentCallbacks.java

@@ -3,6 +3,6 @@ package com.limelight.ui;
 import android.widget.AbsListView;
 
 public interface AdapterFragmentCallbacks {
-    public int getAdapterFragmentLayoutId();
+    int getAdapterFragmentLayoutId();
-    public void receiveAbsListView(AbsListView gridView);
+    void receiveAbsListView(AbsListView gridView);
 }

app/src/main/java/com/limelight/ui/GameGestures.java

@@ -1,5 +1,5 @@
 package com.limelight.ui;
 
 public interface GameGestures {
-    public void showKeyboard();
+    void showKeyboard();
 }

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

@@ -1,6 +1,5 @@
 package com.limelight.utils;
 
-import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;

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

@@ -14,7 +14,6 @@ import com.limelight.nvstream.http.NvApp;
 import com.limelight.nvstream.http.NvHTTP;
 
 import java.io.FileNotFoundException;
-import java.net.InetAddress;
 import java.net.UnknownHostException;
 
 public class ServerHelper {

app/src/main/res/layout/activity_add_computer_manually.xml

@@ -6,7 +6,7 @@
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context=".AddComputerManually" >
+    tools:context=".preferences.AddComputerManually" >
 
     <TextView
         android:id="@+id/manuallyAddPcText"

app/src/main/res/layout/activity_help.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/activity_help"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context="com.limelight.HelpActivity">
-
-    <WebView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true" />
-</RelativeLayout>

app/src/main/res/layout/activity_stream_settings.xml

@@ -7,6 +7,6 @@
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
     android:id="@+id/stream_settings"
-    tools:context=".StreamSettings">
+    tools:context=".preferences.StreamSettings">
 
 </RelativeLayout>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_pc_scut_round.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_pc_scut_background"/>
-    <foreground android:drawable="@mipmap/ic_pc_scut_foreground"/>
-</adaptive-icon>

moonlight-common

@@ -1 +1 @@
-Subproject commit 2c4319196f62bac1d12d498914b0f4b6f1086e99
+Subproject commit 4fe228c719c34e7b22067991f656f86b4249055a