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 @@
-
+
-
+
@@ -25,7 +25,7 @@
-
+
@@ -41,12 +41,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -106,14 +106,10 @@
-
-
-
-
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 {
private final Activity activity;
@@ -57,7 +57,7 @@ public class AppGridAdapter extends GenericGridAdapter {
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 {
}
@Override
- public void notifyLoadComplete(Object object, Bitmap bitmap) {
+ public void notifyLoadComplete(Object object, final Bitmap bitmap) {
final WeakReference viewRef = (WeakReference) object;
loadingTuples.remove(viewRef);
@@ -141,13 +141,12 @@ public class AppGridAdapter extends GenericGridAdapter {
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());
private final ThreadPoolExecutor backgroundExecutor = new ThreadPoolExecutor(2, 2, Long.MAX_VALUE, TimeUnit.DAYS, new LinkedBlockingQueue());
@@ -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 @@
-
-
+
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'
}
}