From e081ab5239c66f88dcda8ab4c2d7e1609c063573 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Fri, 27 Feb 2015 01:43:24 -0500
Subject: [PATCH] Code cleanup and Lint suggestions

---
 app/app.iml                                   | 22 +++++++----------
 .../video/AndroidCpuDecoderRenderer.java      |  1 -
 .../computers/ComputerManagerService.java     |  2 --
 .../com/limelight/grid/AppGridAdapter.java    |  9 ++++---
 .../grid/assets/CachedAppAssetLoader.java     | 24 ++-----------------
 .../grid/assets/NetworkAssetLoader.java       |  4 +---
 app/src/main/res/layout/activity_game.xml     |  4 ++--
 build.gradle                                  |  2 +-
 8 files changed, 19 insertions(+), 49 deletions(-)

diff --git a/app/app.iml b/app/app.iml
index 87814d7a..426a9c9e 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -12,9 +12,9 @@
         <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleNonRootDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileNonRootDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleNonRootDebugTest" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleNonRootDebugAndroidTest" />
         <option name="SOURCE_GEN_TASK_NAME" value="generateNonRootDebugSources" />
-        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateNonRootDebugTestSources" />
+        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateNonRootDebugAndroidTestSources" />
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -25,7 +25,7 @@
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/nonRoot/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/nonRoot/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/nonRoot/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/nonRoot/debug" isTestSource="false" generated="true" />
@@ -41,12 +41,12 @@
       <sourceFolder url="file://$MODULE_DIR$/src/nonRootDebug/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/nonRootDebug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/nonRootDebug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/nonRoot/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/nonRoot/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/nonRoot/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/nonRoot/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/nonRoot/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/nonRoot/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/nonRoot/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/nonRoot/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/nonRoot/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/nonRoot/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/nonRoot/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/nonRoot/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/nonRoot/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/nonRoot/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/nonRoot/assets" type="java-resource" />
@@ -106,14 +106,10 @@
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="bcprov-jdk15on-1.51" level="project" />
-    <orderEntry type="library" exported="" name="androidasync-2.0.5" level="project" />
-    <orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-r7" level="project" />
     <orderEntry type="library" exported="" name="jmdns-fixed" level="project" />
     <orderEntry type="library" exported="" name="bcpkix-jdk15on-1.51" level="project" />
     <orderEntry type="library" exported="" name="tinyrtsp" level="project" />
     <orderEntry type="library" exported="" name="limelight-common" level="project" />
-    <orderEntry type="library" exported="" name="ion-2.0.5" level="project" />
     <orderEntry type="library" exported="" name="okhttp-2.2.0" level="project" />
     <orderEntry type="library" exported="" name="jcodec-0.1.9" level="project" />
     <orderEntry type="library" exported="" name="okio-1.2.0" level="project" />
diff --git a/app/src/main/java/com/limelight/binding/video/AndroidCpuDecoderRenderer.java b/app/src/main/java/com/limelight/binding/video/AndroidCpuDecoderRenderer.java
index 7d93ebf5..1c35d8ec 100644
--- a/app/src/main/java/com/limelight/binding/video/AndroidCpuDecoderRenderer.java
+++ b/app/src/main/java/com/limelight/binding/video/AndroidCpuDecoderRenderer.java
@@ -178,7 +178,6 @@ public class AndroidCpuDecoderRenderer extends EnhancedDecoderRenderer {
             @Override
             public void run() {
                 long nextFrameTime = System.currentTimeMillis();
-                DecodeUnit du;
                 while (!isInterrupted())
                 {
                     long diff = nextFrameTime - System.currentTimeMillis();
diff --git a/app/src/main/java/com/limelight/computers/ComputerManagerService.java b/app/src/main/java/com/limelight/computers/ComputerManagerService.java
index 217976e7..26667028 100644
--- a/app/src/main/java/com/limelight/computers/ComputerManagerService.java
+++ b/app/src/main/java/com/limelight/computers/ComputerManagerService.java
@@ -1,9 +1,7 @@
 package com.limelight.computers;
 
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.io.OutputStreamWriter;
 import java.io.StringReader;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
diff --git a/app/src/main/java/com/limelight/grid/AppGridAdapter.java b/app/src/main/java/com/limelight/grid/AppGridAdapter.java
index 6a87fba6..e2fb87cc 100644
--- a/app/src/main/java/com/limelight/grid/AppGridAdapter.java
+++ b/app/src/main/java/com/limelight/grid/AppGridAdapter.java
@@ -2,7 +2,6 @@ package com.limelight.grid;
 
 import android.app.Activity;
 import android.graphics.Bitmap;
-import android.util.DisplayMetrics;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -25,6 +24,7 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+@SuppressWarnings("unchecked")
 public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
     private final Activity activity;
 
@@ -57,7 +57,7 @@ public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
         LimeLog.info("Art scaling divisor: " + scalingDivisor);
 
         this.activity = activity;
-        this.loader = new CachedAppAssetLoader(computer, uniqueId, scalingDivisor,
+        this.loader = new CachedAppAssetLoader(computer, scalingDivisor,
                 new NetworkAssetLoader(context, uniqueId),
                 new MemoryAssetLoader(), new DiskAssetLoader(context.getCacheDir()));
     }
@@ -126,7 +126,7 @@ public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
         }
 
         @Override
-        public void notifyLoadComplete(Object object, Bitmap bitmap) {
+        public void notifyLoadComplete(Object object, final Bitmap bitmap) {
             final WeakReference<ImageView> viewRef = (WeakReference<ImageView>) object;
 
             loadingTuples.remove(viewRef);
@@ -141,13 +141,12 @@ public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
                 return;
             }
 
-            final Bitmap viewBmp = bitmap;
             activity.runOnUiThread(new Runnable() {
                 @Override
                 public void run() {
                     ImageView view = viewRef.get();
                     if (view != null) {
-                        view.setImageBitmap(viewBmp);
+                        view.setImageBitmap(bitmap);
                         fadeInImage(view);
                     }
                 }
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 3635040c..7c813c32 100644
--- a/app/src/main/java/com/limelight/grid/assets/CachedAppAssetLoader.java
+++ b/app/src/main/java/com/limelight/grid/assets/CachedAppAssetLoader.java
@@ -1,7 +1,6 @@
 package com.limelight.grid.assets;
 
 import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 
 import com.limelight.nvstream.http.ComputerDetails;
 import com.limelight.nvstream.http.NvApp;
@@ -13,7 +12,6 @@ import java.util.concurrent.TimeUnit;
 
 public class CachedAppAssetLoader {
     private final ComputerDetails computer;
-    private final String uniqueId;
     private final double scalingDivider;
     private final ThreadPoolExecutor foregroundExecutor = new ThreadPoolExecutor(8, 8, Long.MAX_VALUE, TimeUnit.DAYS, new LinkedBlockingQueue<Runnable>());
     private final ThreadPoolExecutor backgroundExecutor = new ThreadPoolExecutor(2, 2, Long.MAX_VALUE, TimeUnit.DAYS, new LinkedBlockingQueue<Runnable>());
@@ -21,11 +19,10 @@ public class CachedAppAssetLoader {
     private final MemoryAssetLoader memoryLoader;
     private final DiskAssetLoader diskLoader;
 
-    public CachedAppAssetLoader(ComputerDetails computer, String uniqueId, double scalingDivider,
+    public CachedAppAssetLoader(ComputerDetails computer, double scalingDivider,
                                 NetworkAssetLoader networkLoader, MemoryAssetLoader memoryLoader,
                                 DiskAssetLoader diskLoader) {
         this.computer = computer;
-        this.uniqueId = uniqueId;
         this.scalingDivider = scalingDivider;
 
         this.networkLoader = networkLoader;
@@ -33,15 +30,6 @@ public class CachedAppAssetLoader {
         this.diskLoader = diskLoader;
     }
 
-    private static Bitmap scaleBitmapAndRecyle(Bitmap bmp, double scalingDivider) {
-        Bitmap newBmp = Bitmap.createScaledBitmap(bmp, (int)(bmp.getWidth() / scalingDivider),
-                (int)(bmp.getHeight() / scalingDivider), true);
-        if (newBmp != bmp) {
-            bmp.recycle();
-        }
-        return newBmp;
-    }
-
     private Runnable createLoaderRunnable(final LoaderTuple tuple, final Object context, final LoadListener listener) {
         return new Runnable() {
             @Override
@@ -119,15 +107,7 @@ public class CachedAppAssetLoader {
         // First, try the memory cache in the current context
         Bitmap bmp = memoryLoader.loadBitmapFromCache(tuple);
         if (bmp != null) {
-            synchronized (tuple) {
-                if (tuple.cancelled) {
-                    return null;
-                }
-                else {
-                    tuple.notified = true;
-                }
-            }
-
+            // The caller never sees our tuple in this case
             listener.notifyLoadComplete(context, bmp);
             return null;
         }
diff --git a/app/src/main/java/com/limelight/grid/assets/NetworkAssetLoader.java b/app/src/main/java/com/limelight/grid/assets/NetworkAssetLoader.java
index b80f09ee..f1d09d13 100644
--- a/app/src/main/java/com/limelight/grid/assets/NetworkAssetLoader.java
+++ b/app/src/main/java/com/limelight/grid/assets/NetworkAssetLoader.java
@@ -1,8 +1,6 @@
 package com.limelight.grid.assets;
 
 import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 
 import com.limelight.LimeLog;
 import com.limelight.binding.PlatformBinding;
@@ -19,7 +17,7 @@ public class NetworkAssetLoader {
     private final Context context;
     private final String uniqueId;
 
-    public NetworkAssetLoader(Context context, String uniqueId) throws NoSuchAlgorithmException, KeyManagementException {
+    public NetworkAssetLoader(Context context, String uniqueId) {
         this.context = context;
         this.uniqueId = uniqueId;
     }
diff --git a/app/src/main/res/layout/activity_game.xml b/app/src/main/res/layout/activity_game.xml
index 7f625494..42617a76 100644
--- a/app/src/main/res/layout/activity_game.xml
+++ b/app/src/main/res/layout/activity_game.xml
@@ -1,4 +1,4 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -10,4 +10,4 @@
         android:layout_height="match_parent"
         android:layout_gravity="center" />
 
-</FrameLayout>
+</merge>
diff --git a/build.gradle b/build.gradle
index c4477273..833eee9a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.1'
+        classpath 'com.android.tools.build:gradle:1.1.0'
     }
 }