Update the latency message strings to be more clear that this isn't end to end latency

This reverts commit 7b12fd1ad2.

app/app.iml

@@ -9,11 +9,12 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="nonRootDebug" />
+        <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" />
@@ -24,6 +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/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" />
@@ -39,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/r/androidTest/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/aidl/androidTest/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/buildConfig/androidTest/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/source/rs/androidTest/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/rs/androidTest/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/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" />
@@ -101,17 +103,13 @@
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 22 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" />

app/build.gradle

@@ -4,15 +4,15 @@ import org.apache.tools.ant.taskdefs.condition.Os
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 21
+    compileSdkVersion 22
     buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 21
+        targetSdkVersion 22
 
-        versionName "3.1-beta1"
+        versionName "3.1.3"
-        versionCode = 50
+        versionCode = 58
     }
 
     productFlavors {
@@ -62,17 +62,13 @@ android {
 }
 
 dependencies {
-    compile group: 'org.jcodec', name: 'jcodec', version: '+'
+    compile group: 'org.jcodec', name: 'jcodec', version: '0.1.9'
 
-    compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '+'
+    compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.51'
-    compile group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '+'
+    compile group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '1.51'
 
-    compile group: 'com.google.android', name: 'support-v4', version:'+'
+    compile group: 'com.squareup.okhttp', name: 'okhttp', version:'2.2.0'
-    compile group: 'com.koushikdutta.ion', name: 'ion', version:'+'
+    compile group: 'com.squareup.okio', name:'okio', version:'1.2.0'
-    compile group: 'com.google.code.gson', name: 'gson', version:'+'
-
-    compile group: 'com.squareup.okhttp', name: 'okhttp', version:'+'
-    compile group: 'com.squareup.okio', name:'okio', version:'+'
 
     compile files('libs/jmdns-fixed.jar')
     compile files('libs/limelight-common.jar')

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

@@ -1,9 +1,6 @@
 package com.limelight;
 
 import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
 import java.io.StringReader;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -11,10 +8,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.UUID;
 
-import org.xmlpull.v1.XmlPullParserException;
-
 import com.limelight.binding.PlatformBinding;
-import com.limelight.binding.crypto.AndroidCryptoProvider;
 import com.limelight.computers.ComputerManagerListener;
 import com.limelight.computers.ComputerManagerService;
 import com.limelight.grid.AppGridAdapter;
@@ -27,6 +21,7 @@ import com.limelight.ui.AdapterFragment;
 import com.limelight.ui.AdapterFragmentCallbacks;
 import com.limelight.utils.CacheHelper;
 import com.limelight.utils.Dialog;
+import com.limelight.utils.ServerHelper;
 import com.limelight.utils.SpinnerDialog;
 import com.limelight.utils.UiHelper;
 
@@ -48,7 +43,6 @@ import android.view.ContextMenu.ContextMenuInfo;
 import android.widget.AbsListView;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
-import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
 import android.widget.AdapterView.AdapterContextMenuInfo;
@@ -61,9 +55,8 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
     private ComputerManagerService.ApplistPoller poller;
     private SpinnerDialog blockingLoadSpinner;
     private String lastRawApplist;
-
+    private int lastRunningAppId;
-    private int consecutiveAppListFailures = 0;
+    private boolean suspendGridUpdates;
-    private final static int CONSECUTIVE_FAILURE_LIMIT = 3;
 
     private final static int START_OR_RESUME_ID = 1;
     private final static int QUIT_ID = 2;
@@ -74,7 +67,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);
@@ -121,11 +114,6 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
         }
     };
 
-    private InetAddress getAddress() {
-        return computer.reachability == ComputerDetails.Reachability.LOCAL ?
-        computer.localIp : computer.remoteIp;
-    }
-
     private void startComputerUpdates() {
         if (managerBinder == null) {
             return;
@@ -134,15 +122,17 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
         managerBinder.startPolling(new ComputerManagerListener() {
             @Override
             public void notifyComputerUpdated(ComputerDetails details) {
-                // Don't care about other computers
+                // Do nothing if updates are suspended
-                if (details != computer) {
+                if (suspendGridUpdates) {
                     return;
                 }
 
-                if (details.state != ComputerDetails.State.ONLINE) {
+                // Don't care about other computers
-                    consecutiveAppListFailures++;
+                if (!details.uuid.toString().equalsIgnoreCase(uuidString)) {
+                    return;
+                }
 
-                    if (consecutiveAppListFailures >= CONSECUTIVE_FAILURE_LIMIT) {
+                if (details.state == ComputerDetails.State.OFFLINE) {
                     // The PC is unreachable now
                     AppView.this.runOnUiThread(new Runnable() {
                         @Override
@@ -152,27 +142,34 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
                             finish();
                         }
                     });
-                    }
 
                     return;
                 }
 
-                consecutiveAppListFailures = 0;
+                // App list is the same or empty
-
-                // App list is the same or empty; nothing to do
                 if (details.rawAppList == null || details.rawAppList.equals(lastRawApplist)) {
+
+                    // Let's check if the running app ID changed
+                    if (details.runningGameId != lastRunningAppId) {
+                        // Update the currently running game using the app ID
+                        lastRunningAppId = details.runningGameId;
+                        updateUiWithServerinfo(details);
+                    }
+
                     return;
                 }
 
+                lastRunningAppId = details.runningGameId;
+                lastRawApplist = details.rawAppList;
+
                 try {
-                    lastRawApplist = details.rawAppList;
                     updateUiWithAppList(NvHTTP.getAppListByReader(new StringReader(details.rawAppList)));
 
                     if (blockingLoadSpinner != null) {
                         blockingLoadSpinner.dismiss();
                         blockingLoadSpinner = null;
                     }
-                } catch (Exception e) {}
+                } catch (Exception ignored) {}
             }
         });
 
@@ -190,6 +187,10 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
         if (managerBinder != null) {
             managerBinder.stopPolling();
         }
+
+        if (appGridAdapter != null) {
+            appGridAdapter.cancelQueuedOperations();
+        }
     }
 
     @Override
@@ -272,10 +273,6 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
         int runningAppId = -1;
         for (int i = 0; i < appGridAdapter.getCount(); i++) {
             AppObject app = (AppObject) appGridAdapter.getItem(i);
-        	if (app.app == null) {
-        		continue;
-        	}
-        	
             if (app.app.getIsRunning()) {
                 runningAppId = app.app.getAppId();
                 break;
@@ -290,10 +287,6 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
         
         AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;
         AppObject selectedApp = (AppObject) appGridAdapter.getItem(info.position);
-        if (selectedApp == null || selectedApp.app == null) {
-        	return;
-        }
-        
         int runningAppId = getRunningAppId();
         if (runningAppId != -1) {
             if (runningAppId == selectedApp.app.getAppId()) {
@@ -311,33 +304,6 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
     public void onContextMenuClosed(Menu menu) {
     }
 
-    private void displayQuitConfirmationDialog(final Runnable onYes, final Runnable onNo) {
-        DialogInterface.OnClickListener dialogClickListener = new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                switch (which){
-                    case DialogInterface.BUTTON_POSITIVE:
-                        if (onYes != null) {
-                            onYes.run();
-                        }
-                        break;
-
-                    case DialogInterface.BUTTON_NEGATIVE:
-                        if (onNo != null) {
-                            onNo.run();
-                        }
-                        break;
-                }
-            }
-        };
-
-        AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        builder.setMessage(getResources().getString(R.string.applist_quit_confirmation))
-                .setPositiveButton(getResources().getString(R.string.yes), dialogClickListener)
-                .setNegativeButton(getResources().getString(R.string.no), dialogClickListener)
-                .show();
-    }
-
     @Override
     public boolean onContextItemSelected(MenuItem item) {
         AdapterContextMenuInfo info = (AdapterContextMenuInfo) item.getMenuInfo();
@@ -345,25 +311,37 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
         switch (item.getItemId()) {
             case START_WTIH_QUIT:
                 // Display a confirmation dialog first
-                displayQuitConfirmationDialog(new Runnable() {
+                UiHelper.displayQuitConfirmationDialog(this, new Runnable() {
                     @Override
                     public void run() {
-                        doStart(app.app);
+                        ServerHelper.doStart(AppView.this, app.app, computer, managerBinder);
                     }
                 }, null);
                 return true;
 
             case START_OR_RESUME_ID:
                 // Resume is the same as start for us
-                doStart(app.app);
+                ServerHelper.doStart(AppView.this, app.app, computer, managerBinder);
                 return true;
 
             case QUIT_ID:
                 // Display a confirmation dialog first
-                displayQuitConfirmationDialog(new Runnable() {
+                UiHelper.displayQuitConfirmationDialog(this, new Runnable() {
                     @Override
                     public void run() {
-                        doQuit(app.app);
+                        suspendGridUpdates = true;
+                        ServerHelper.doQuit(AppView.this,
+                                ServerHelper.getCurrentAddressFromComputer(computer),
+                                app.app, managerBinder, new Runnable() {
+                            @Override
+                            public void run() {
+                                // Trigger a poll immediately
+                                suspendGridUpdates = false;
+                                if (poller != null) {
+                                    poller.pollNow();
+                                }
+                            }
+                        });
                     }
                 }, null);
                 return true;
@@ -376,26 +354,61 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
         }
     }
 
+    private void updateUiWithServerinfo(final ComputerDetails details) {
+        AppView.this.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                boolean updated = false;
+
+                    // Look through our current app list to tag the running app
+                for (int i = 0; i < appGridAdapter.getCount(); i++) {
+                    AppObject existingApp = (AppObject) appGridAdapter.getItem(i);
+
+                    // There can only be one or zero apps running.
+                    if (existingApp.app.getIsRunning() &&
+                            existingApp.app.getAppId() == details.runningGameId) {
+                        // This app was running and still is, so we're done now
+                        return;
+                    }
+                    else if (existingApp.app.getAppId() == details.runningGameId) {
+                        // This app wasn't running but now is
+                        existingApp.app.setIsRunning(true);
+                        updated = true;
+                    }
+                    else if (existingApp.app.getIsRunning()) {
+                        // This app was running but now isn't
+                        existingApp.app.setIsRunning(false);
+                        updated = true;
+                    }
+                    else {
+                        // This app wasn't running and still isn't
+                    }
+                }
+
+                if (updated) {
+                    appGridAdapter.notifyDataSetChanged();
+                }
+            }
+        });
+    }
+
     private void updateUiWithAppList(final List<NvApp> appList) {
         AppView.this.runOnUiThread(new Runnable() {
             @Override
             public void run() {
                 boolean updated = false;
 
+                // First handle app updates and additions
                 for (NvApp app : appList) {
                     boolean foundExistingApp = false;
 
                     // Try to update an existing app in the list first
                     for (int i = 0; i < appGridAdapter.getCount(); i++) {
                         AppObject existingApp = (AppObject) appGridAdapter.getItem(i);
-                        if (existingApp.app == null) {
-                            continue;
-                        }
-
                         if (existingApp.app.getAppId() == app.getAppId()) {
                             // Found the app; update its properties
                             if (existingApp.app.getIsRunning() != app.getIsRunning()) {
-                                existingApp.app.setIsRunningBoolean(app.getIsRunning());
+                                existingApp.app.setIsRunning(app.getIsRunning());
                                 updated = true;
                             }
                             if (!existingApp.app.getAppName().equals(app.getAppName())) {
@@ -415,6 +428,34 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
                     }
                 }
 
+                // Next handle app removals
+                int i = 0;
+                while (i < appGridAdapter.getCount()) {
+                    boolean foundExistingApp = false;
+                    AppObject existingApp = (AppObject) appGridAdapter.getItem(i);
+
+                    // Check if this app is in the latest list
+                    for (NvApp app : appList) {
+                        if (existingApp.app.getAppId() == app.getAppId()) {
+                            foundExistingApp = true;
+                            break;
+                        }
+                    }
+
+                    // This app was removed in the latest app list
+                    if (!foundExistingApp) {
+                        appGridAdapter.removeApp(existingApp);
+                        updated = true;
+
+                        // Check this same index again because the item at i+1 is now at i after
+                        // the removal
+                        continue;
+                    }
+
+                    // Move on to the next item
+                    i++;
+                }
+
                 if (updated) {
                     appGridAdapter.notifyDataSetChanged();
                 }
@@ -422,58 +463,6 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
         });
     }
 
-	private void doStart(NvApp app) {
-		Intent intent = new Intent(this, Game.class);
-		intent.putExtra(Game.EXTRA_HOST,
-                computer.reachability == ComputerDetails.Reachability.LOCAL ?
-                computer.localIp.getHostAddress() : computer.remoteIp.getHostAddress());
-		intent.putExtra(Game.EXTRA_APP, app.getAppName());
-		intent.putExtra(Game.EXTRA_UNIQUEID, managerBinder.getUniqueId());
-		intent.putExtra(Game.EXTRA_STREAMING_REMOTE,
-                computer.reachability != ComputerDetails.Reachability.LOCAL);
-		startActivity(intent);
-	}
-	
-	private void doQuit(final NvApp app) {
-		Toast.makeText(AppView.this, getResources().getString(R.string.applist_quit_app)+" "+app.getAppName()+"...", Toast.LENGTH_SHORT).show();
-		new Thread(new Runnable() {
-			@Override
-			public void run() {
-				NvHTTP httpConn;
-				String message;
-				try {
-					httpConn = new NvHTTP(getAddress(),
-                            managerBinder.getUniqueId(), null, PlatformBinding.getCryptoProvider(AppView.this));
-					if (httpConn.quitApp()) {
-						message = getResources().getString(R.string.applist_quit_success)+" "+app.getAppName();
-					}
-					else {
-						message = getResources().getString(R.string.applist_quit_fail)+" "+app.getAppName();
-					}
-				} catch (UnknownHostException e) {
-					message = getResources().getString(R.string.error_unknown_host);
-				} catch (FileNotFoundException e) {
-					message = getResources().getString(R.string.error_404);
-				} catch (Exception e) {
-					message = e.getMessage();
-				} finally {
-                    // Trigger a poll immediately
-                    if (poller != null) {
-                        poller.pollNow();
-                    }
-                }
-				
-				final String toastMessage = message;
-				runOnUiThread(new Runnable() {
-					@Override
-					public void run() {
-						Toast.makeText(AppView.this, toastMessage, Toast.LENGTH_LONG).show();
-					}
-				});
-			}
-		}).start();
-	}
-
     @Override
     public int getAdapterFragmentLayoutId() {
         return PreferenceConfiguration.readPreferences(this).listMode ?
@@ -489,25 +478,26 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
             public void onItemClick(AdapterView<?> arg0, View arg1, int pos,
                                     long id) {
                 AppObject app = (AppObject) appGridAdapter.getItem(pos);
-                if (app == null || app.app == null) {
-                    return;
-                }
 
                 // Only open the context menu if something is running, otherwise start it
                 if (getRunningAppId() != -1) {
                     openContextMenu(arg1);
                 } else {
-                    doStart(app.app);
+                    ServerHelper.doStart(AppView.this, app.app, computer, managerBinder);
                 }
             }
         });
         registerForContextMenu(listView);
+        listView.requestFocus();
     }
 
     public class AppObject {
-		public NvApp app;
+        public final NvApp app;
 
         public AppObject(NvApp app) {
+            if (app == null) {
+                throw new IllegalArgumentException("app must not be null");
+            }
             this.app = app;
         }
 

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

@@ -13,6 +13,7 @@ import com.limelight.nvstream.NvConnection;
 import com.limelight.nvstream.NvConnectionListener;
 import com.limelight.nvstream.StreamConfiguration;
 import com.limelight.nvstream.av.video.VideoDecoderRenderer;
+import com.limelight.nvstream.http.NvApp;
 import com.limelight.nvstream.input.KeyboardPacket;
 import com.limelight.nvstream.input.MouseButtonPacket;
 import com.limelight.preferences.PreferenceConfiguration;
@@ -25,6 +26,7 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.res.Configuration;
 import android.graphics.Point;
+import android.hardware.input.InputManager;
 import android.media.AudioManager;
 import android.net.ConnectivityManager;
 import android.net.wifi.WifiManager;
@@ -59,7 +61,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;
@@ -68,7 +70,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;
@@ -88,7 +90,8 @@ public class Game extends Activity implements SurfaceHolder.Callback,
     private int drFlags = 0;
 
     public static final String EXTRA_HOST = "Host";
-	public static final String EXTRA_APP = "App";
+    public static final String EXTRA_APP_NAME = "AppName";
+    public static final String EXTRA_APP_ID = "AppId";
     public static final String EXTRA_UNIQUEID = "UniqueId";
     public static final String EXTRA_STREAMING_REMOTE = "Remote";
 
@@ -170,17 +173,23 @@ public class Game extends Activity implements SurfaceHolder.Callback,
         wifiLock.acquire();
 
         String host = Game.this.getIntent().getStringExtra(EXTRA_HOST);
-		String app = Game.this.getIntent().getStringExtra(EXTRA_APP);
+        String appName = Game.this.getIntent().getStringExtra(EXTRA_APP_NAME);
+        int appId = Game.this.getIntent().getIntExtra(EXTRA_APP_ID, StreamConfiguration.INVALID_APP_ID);
         String uniqueId = Game.this.getIntent().getStringExtra(EXTRA_UNIQUEID);
         boolean remote = Game.this.getIntent().getBooleanExtra(EXTRA_STREAMING_REMOTE, false);
 
+        if (appId == StreamConfiguration.INVALID_APP_ID) {
+            finish();
+            return;
+        }
+
         decoderRenderer = new ConfigurableDecoderRenderer();
         decoderRenderer.initializeWithFlags(drFlags);
         
         StreamConfiguration config = new StreamConfiguration.Builder()
                 .setResolution(prefConfig.width, prefConfig.height)
                 .setRefreshRate(prefConfig.fps)
-                .setApp(app)
+                .setApp(new NvApp(appName, appId))
                 .setBitrate(prefConfig.bitrate * 1000)
                 .setEnableSops(prefConfig.enableSops)
                 .enableAdaptiveResolution((decoderRenderer.getCapabilities() &
@@ -193,7 +202,10 @@ public class Game extends Activity implements SurfaceHolder.Callback,
         // Initialize the connection
         conn = new NvConnection(host, uniqueId, Game.this, config, PlatformBinding.getCryptoProvider(this));
         keybTranslator = new KeyboardTranslator(conn);
-		controllerHandler = new ControllerHandler(conn, this, prefConfig.deadzonePercentage);
+        controllerHandler = new ControllerHandler(conn, this, prefConfig.multiController, prefConfig.deadzonePercentage);
+
+        InputManager inputManager = (InputManager) getSystemService(Context.INPUT_SERVICE);
+        inputManager.registerInputDeviceListener(controllerHandler, null);
 
         SurfaceHolder sh = sv.getHolder();
         if (prefConfig.stretchVideo || !decoderRenderer.isHardwareAccelerated()) {
@@ -242,7 +254,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
@@ -278,6 +290,9 @@ public class Game extends Activity implements SurfaceHolder.Callback,
         SpinnerDialog.closeDialogs(this);
         Dialog.closeDialogs();
 
+        InputManager inputManager = (InputManager) getSystemService(Context.INPUT_SERVICE);
+        inputManager.unregisterInputDeviceListener(controllerHandler);
+
         displayedFailureDialog = true;
         stopConnection();
 
@@ -308,7 +323,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

@@ -12,6 +12,7 @@ import com.limelight.computers.ComputerManagerListener;
 import com.limelight.computers.ComputerManagerService;
 import com.limelight.grid.PcGridAdapter;
 import com.limelight.nvstream.http.ComputerDetails;
+import com.limelight.nvstream.http.NvApp;
 import com.limelight.nvstream.http.NvHTTP;
 import com.limelight.nvstream.http.PairingManager;
 import com.limelight.nvstream.http.PairingManager.PairState;
@@ -22,10 +23,10 @@ import com.limelight.preferences.StreamSettings;
 import com.limelight.ui.AdapterFragment;
 import com.limelight.ui.AdapterFragmentCallbacks;
 import com.limelight.utils.Dialog;
+import com.limelight.utils.ServerHelper;
 import com.limelight.utils.UiHelper;
 
 import android.app.Activity;
-import android.app.FragmentTransaction;
 import android.app.Service;
 import android.content.ComponentName;
 import android.content.Intent;
@@ -53,7 +54,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);
@@ -94,6 +95,8 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
     private final static int UNPAIR_ID = 3;
     private final static int WOL_ID = 4;
     private final static int DELETE_ID = 5;
+    private final static int RESUME_ID = 6;
+    private final static int QUIT_ID = 7;
 
     private void initializeViews() {
         setContentView(R.layout.activity_pc_view);
@@ -238,8 +241,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                 
         AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;
         ComputerObject computer = (ComputerObject) pcGridAdapter.getItem(info.position);
-        if (computer == null || computer.details == null ||
+        if (computer.details.reachability == ComputerDetails.Reachability.UNKNOWN) {
-                computer.details.reachability == ComputerDetails.Reachability.UNKNOWN) {
             startComputerUpdates();
             return;
         }
@@ -254,8 +256,16 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
             menu.add(Menu.NONE, DELETE_ID, 2, getResources().getString(R.string.pcview_menu_delete_pc));
         }
         else {
-            menu.add(Menu.NONE, APP_LIST_ID, 1, getResources().getString(R.string.pcview_menu_app_list));
+            if (computer.details.runningGameId != 0) {
-            menu.add(Menu.NONE, UNPAIR_ID, 2, getResources().getString(R.string.pcview_menu_unpair_pc));
+                menu.add(Menu.NONE, RESUME_ID, 1, getResources().getString(R.string.applist_menu_resume));
+                menu.add(Menu.NONE, QUIT_ID, 2, getResources().getString(R.string.applist_menu_quit));
+            }
+
+            menu.add(Menu.NONE, APP_LIST_ID, 3, getResources().getString(R.string.pcview_menu_app_list));
+
+            // FIXME: We used to be able to unpair here but it's been broken since GFE 2.1.x, so I've replaced
+            // it with delete which actually work
+            menu.add(Menu.NONE, DELETE_ID, 4, getResources().getString(R.string.pcview_menu_delete_pc));
         }
     }
 
@@ -476,9 +486,8 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
     @Override
     public boolean onContextItemSelected(MenuItem item) {
         AdapterContextMenuInfo info = (AdapterContextMenuInfo) item.getMenuInfo();
-        ComputerObject computer = (ComputerObject) pcGridAdapter.getItem(info.position);
+        final ComputerObject computer = (ComputerObject) pcGridAdapter.getItem(info.position);
-        switch (item.getItemId())
+        switch (item.getItemId()) {
-        {
             case PAIR_ID:
                 doPair(computer.details);
                 return true;
@@ -504,6 +513,32 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                 doAppList(computer.details);
                 return true;
 
+            case RESUME_ID:
+                if (managerBinder == null) {
+                    Toast.makeText(PcView.this, getResources().getString(R.string.error_manager_not_running), Toast.LENGTH_LONG).show();
+                    return true;
+                }
+
+                ServerHelper.doStart(this, new NvApp("app", computer.details.runningGameId), computer.details, managerBinder);
+                return true;
+
+            case QUIT_ID:
+                if (managerBinder == null) {
+                    Toast.makeText(PcView.this, getResources().getString(R.string.error_manager_not_running), Toast.LENGTH_LONG).show();
+                    return true;
+                }
+
+                // Display a confirmation dialog first
+                UiHelper.displayQuitConfirmationDialog(this, new Runnable() {
+                    @Override
+                    public void run() {
+                        ServerHelper.doQuit(PcView.this,
+                                ServerHelper.getCurrentAddressFromComputer(computer.details),
+                                new NvApp("app", 0), managerBinder, null);
+                    }
+                }, null);
+                return true;
+
             default:
                 return super.onContextItemSelected(item);
         }
@@ -516,6 +551,12 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
             if (details.equals(computer.details)) {
                 pcGridAdapter.removeComputer(computer);
                 pcGridAdapter.notifyDataSetChanged();
+
+                if (pcGridAdapter.getCount() == 0) {
+                    // Show the "Discovery in progress" view
+                    noPcFoundLayout.setVisibility(View.VISIBLE);
+                }
+
                 break;
             }
         }
@@ -528,7 +569,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
             ComputerObject computer = (ComputerObject) pcGridAdapter.getItem(i);
 
             // Check if this is the same computer
-			if (details.equals(computer.details)) {
+            if (details.uuid.equals(computer.details.uuid)) {
                 existingEntry = computer;
                 break;
             }
@@ -585,6 +626,9 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
         public ComputerDetails details;
 
         public ComputerObject(ComputerDetails details) {
+            if (details == null) {
+                throw new IllegalArgumentException("details must not be null");
+            }
             this.details = details;
         }
 

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

@@ -1,7 +1,9 @@
 package com.limelight.binding.input;
 
 import java.util.HashMap;
+import java.util.Map;
 
+import android.hardware.input.InputManager;
 import android.os.SystemClock;
 import android.view.InputDevice;
 import android.view.KeyEvent;
@@ -13,26 +15,10 @@ import com.limelight.nvstream.input.ControllerPacket;
 import com.limelight.ui.GameGestures;
 import com.limelight.utils.Vector2d;
 
-public class ControllerHandler {
+public class ControllerHandler implements InputManager.InputDeviceListener {
-	private short inputMap = 0x0000;
-	private byte leftTrigger = 0x00;
-	private byte rightTrigger = 0x00;
-	private short rightStickX = 0x0000;
-	private short rightStickY = 0x0000;
-	private short leftStickX = 0x0000;
-	private short leftStickY = 0x0000;
-	private int emulatingButtonFlags = 0;
 
-	// Used for OUYA bumper state tracking since they force all buttons
-	// up when the OUYA button goes down. We watch the last time we get
-	// a bumper up and compare that to our maximum delay when we receive
-	// a Start button press to see if we should activate one of our 
-	// emulated button combos.
-	private long lastLbUpTime = 0;
-	private long lastRbUpTime = 0;
     private static final int MAXIMUM_BUMPER_UP_DELAY_MS = 100;
 
-    private long startDownTime = 0;
     private static final int START_DOWN_TIME_KEYB_MS = 750;
 
     private static final int MINIMUM_BUTTON_DOWN_TIME_MS = 25;
@@ -43,19 +29,23 @@ public class ControllerHandler {
     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, ControllerMapping> mappings = new HashMap<String, ControllerMapping>();
+    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 ControllerMapping defaultMapping = new ControllerMapping();
+    private final ControllerContext defaultContext = new ControllerContext();
-    private GameGestures gestures;
+    private final GameGestures gestures;
     private boolean hasGameController;
 
-	public ControllerHandler(NvConnection conn, GameGestures gestures, int deadzonePercentage) {
+    private final boolean multiControllerEnabled;
+    private short currentControllers;
+
+    public ControllerHandler(NvConnection conn, GameGestures gestures, boolean multiControllerEnabled, int deadzonePercentage) {
         this.conn = conn;
         this.gestures = gestures;
+        this.multiControllerEnabled = multiControllerEnabled;
 
         // HACK: For now we're hardcoding a 10% deadzone. Some deadzone
         // is required for controller batching support to work.
@@ -82,15 +72,16 @@ public class ControllerHandler {
 
         this.stickDeadzone = (double)deadzonePercentage / 100.0;
 
-        // Initialize the default mapping for events with no device
+        // Initialize the default context for events with no device
-        defaultMapping.leftStickXAxis = MotionEvent.AXIS_X;
+        defaultContext.leftStickXAxis = MotionEvent.AXIS_X;
-        defaultMapping.leftStickYAxis = MotionEvent.AXIS_Y;
+        defaultContext.leftStickYAxis = MotionEvent.AXIS_Y;
-        defaultMapping.leftStickDeadzoneRadius = (float) stickDeadzone;
+        defaultContext.leftStickDeadzoneRadius = (float) stickDeadzone;
-        defaultMapping.rightStickXAxis = MotionEvent.AXIS_Z;
+        defaultContext.rightStickXAxis = MotionEvent.AXIS_Z;
-        defaultMapping.rightStickYAxis = MotionEvent.AXIS_RZ;
+        defaultContext.rightStickYAxis = MotionEvent.AXIS_RZ;
-        defaultMapping.rightStickDeadzoneRadius = (float) stickDeadzone;
+        defaultContext.rightStickDeadzoneRadius = (float) stickDeadzone;
-        defaultMapping.leftTriggerAxis = MotionEvent.AXIS_BRAKE;
+        defaultContext.leftTriggerAxis = MotionEvent.AXIS_BRAKE;
-        defaultMapping.rightTriggerAxis = MotionEvent.AXIS_GAS;
+        defaultContext.rightTriggerAxis = MotionEvent.AXIS_GAS;
+        defaultContext.controllerNumber = (short) 0;
     }
 
     private static InputDevice.MotionRange getMotionRangeForJoystickAxis(InputDevice dev, int axis) {
@@ -106,19 +97,63 @@ public class ControllerHandler {
         return range;
     }
 
-	private ControllerMapping createMappingForDevice(InputDevice dev) {
+    private short assignNewControllerNumber() {
-		ControllerMapping mapping = new ControllerMapping();
+        for (short i = 0; i < 4; i++) {
+            if ((currentControllers & (1 << i)) == 0) {
+                // Found an unused controller value
+                currentControllers |= (1 << i);
+                return i;
+            }
+        }
+
+        return 0;
+    }
+
+    @Override
+    public void onInputDeviceAdded(int deviceId) {
+        // Nothing happening here yet
+    }
+
+    @Override
+    public void onInputDeviceRemoved(int deviceId) {
+        for (Map.Entry<String, ControllerContext> device : contexts.entrySet()) {
+            if (device.getValue().id == deviceId) {
+                LimeLog.info("Removed controller: "+device.getValue().name);
+                releaseControllerNumber(device.getValue().controllerNumber);
+                contexts.remove(device.getKey());
+                return;
+            }
+        }
+    }
+
+    @Override
+    public void onInputDeviceChanged(int deviceId) {
+        // Remove and re-add 
+        onInputDeviceRemoved(deviceId);
+        onInputDeviceAdded(deviceId);
+    }
+
+    private void releaseControllerNumber(int controllerNumber) {
+        LimeLog.info("Controller number "+controllerNumber+" is now available");
+        currentControllers &= ~(1 << controllerNumber);
+    }
+
+    private ControllerContext createContextForDevice(InputDevice dev) {
+        ControllerContext context = new ControllerContext();
         String devName = dev.getName();
 
-        LimeLog.info("Creating controller mapping for device: "+devName);
+        LimeLog.info("Creating controller context for device: "+devName);
 
-        mapping.leftStickXAxis = MotionEvent.AXIS_X;
+        context.name = devName;
-		mapping.leftStickYAxis = MotionEvent.AXIS_Y;
+        context.id = dev.getId();
-        if (getMotionRangeForJoystickAxis(dev, mapping.leftStickXAxis) != null &&
+
-                getMotionRangeForJoystickAxis(dev, mapping.leftStickYAxis) != null) {
+        context.leftStickXAxis = MotionEvent.AXIS_X;
+        context.leftStickYAxis = MotionEvent.AXIS_Y;
+        if (getMotionRangeForJoystickAxis(dev, context.leftStickXAxis) != null &&
+                getMotionRangeForJoystickAxis(dev, context.leftStickYAxis) != null) {
             // This is a gamepad
             hasGameController = true;
-            mapping.hasJoystickAxes = true;
+            context.hasJoystickAxes = true;
         }
 
         InputDevice.MotionRange leftTriggerRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_LTRIGGER);
@@ -128,14 +163,14 @@ public class ControllerHandler {
         if (leftTriggerRange != null && rightTriggerRange != null)
         {
             // Some controllers use LTRIGGER and RTRIGGER (like Ouya)
-			mapping.leftTriggerAxis = MotionEvent.AXIS_LTRIGGER;
+            context.leftTriggerAxis = MotionEvent.AXIS_LTRIGGER;
-			mapping.rightTriggerAxis = MotionEvent.AXIS_RTRIGGER;
+            context.rightTriggerAxis = MotionEvent.AXIS_RTRIGGER;
         }
         else if (brakeRange != null && gasRange != null)
         {
             // Others use GAS and BRAKE (like Moga)
-			mapping.leftTriggerAxis = MotionEvent.AXIS_BRAKE;
+            context.leftTriggerAxis = MotionEvent.AXIS_BRAKE;
-			mapping.rightTriggerAxis = MotionEvent.AXIS_GAS;
+            context.rightTriggerAxis = MotionEvent.AXIS_GAS;
         }
         else
         {
@@ -144,34 +179,34 @@ public class ControllerHandler {
             if (rxRange != null && ryRange != null && devName != null) {
                 if (devName.contains("Xbox") || devName.contains("XBox") || devName.contains("X-Box")) {
                     // Xbox controllers use RX and RY for right stick
-					mapping.rightStickXAxis = MotionEvent.AXIS_RX;
+                    context.rightStickXAxis = MotionEvent.AXIS_RX;
-					mapping.rightStickYAxis = MotionEvent.AXIS_RY;
+                    context.rightStickYAxis = MotionEvent.AXIS_RY;
 
                     // Xbox controllers use Z and RZ for triggers
-					mapping.leftTriggerAxis = MotionEvent.AXIS_Z;
+                    context.leftTriggerAxis = MotionEvent.AXIS_Z;
-					mapping.rightTriggerAxis = MotionEvent.AXIS_RZ;
+                    context.rightTriggerAxis = MotionEvent.AXIS_RZ;
-					mapping.triggersIdleNegative = true;
+                    context.triggersIdleNegative = true;
-					mapping.isXboxController = true;
+                    context.isXboxController = true;
                 }
                 else {
                     // DS4 controller uses RX and RY for triggers
-					mapping.leftTriggerAxis = MotionEvent.AXIS_RX;
+                    context.leftTriggerAxis = MotionEvent.AXIS_RX;
-					mapping.rightTriggerAxis = MotionEvent.AXIS_RY;
+                    context.rightTriggerAxis = MotionEvent.AXIS_RY;
-					mapping.triggersIdleNegative = true;
+                    context.triggersIdleNegative = true;
 
-					mapping.isDualShock4 = true;
+                    context.isDualShock4 = true;
                 }
             }
         }
 
-		if (mapping.rightStickXAxis == -1 && mapping.rightStickYAxis == -1) {
+        if (context.rightStickXAxis == -1 && context.rightStickYAxis == -1) {
             InputDevice.MotionRange zRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_Z);
             InputDevice.MotionRange rzRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_RZ);
 
             // Most other controllers use Z and RZ for the right stick
             if (zRange != null && rzRange != null) {
-				mapping.rightStickXAxis = MotionEvent.AXIS_Z;
+                context.rightStickXAxis = MotionEvent.AXIS_Z;
-				mapping.rightStickYAxis = MotionEvent.AXIS_RZ;
+                context.rightStickYAxis = MotionEvent.AXIS_RZ;
             }
             else {
                 InputDevice.MotionRange rxRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_RX);
@@ -179,8 +214,8 @@ public class ControllerHandler {
 
                 // Try RX and RY now
                 if (rxRange != null && ryRange != null) {
-					mapping.rightStickXAxis = MotionEvent.AXIS_RX;
+                    context.rightStickXAxis = MotionEvent.AXIS_RX;
-					mapping.rightStickYAxis = MotionEvent.AXIS_RY;
+                    context.rightStickYAxis = MotionEvent.AXIS_RY;
                 }
             }
         }
@@ -189,30 +224,30 @@ public class ControllerHandler {
         InputDevice.MotionRange hatXRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_HAT_X);
         InputDevice.MotionRange hatYRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_HAT_Y);
         if (hatXRange != null && hatYRange != null) {
-			mapping.hatXAxis = MotionEvent.AXIS_HAT_X;
+            context.hatXAxis = MotionEvent.AXIS_HAT_X;
-			mapping.hatYAxis = MotionEvent.AXIS_HAT_Y;
+            context.hatYAxis = MotionEvent.AXIS_HAT_Y;
         }
 
-		if (mapping.leftStickXAxis != -1 && mapping.leftStickYAxis != -1) {
+        if (context.leftStickXAxis != -1 && context.leftStickYAxis != -1) {
-            mapping.leftStickDeadzoneRadius = (float) stickDeadzone;
+            context.leftStickDeadzoneRadius = (float) stickDeadzone;
         }
 
-		if (mapping.rightStickXAxis != -1 && mapping.rightStickYAxis != -1) {
+        if (context.rightStickXAxis != -1 && context.rightStickYAxis != -1) {
-            mapping.rightStickDeadzoneRadius = (float) stickDeadzone;
+            context.rightStickDeadzoneRadius = (float) stickDeadzone;
         }
 
-        if (mapping.leftTriggerAxis != -1 && mapping.rightTriggerAxis != -1) {
+        if (context.leftTriggerAxis != -1 && context.rightTriggerAxis != -1) {
-            InputDevice.MotionRange ltRange = getMotionRangeForJoystickAxis(dev, mapping.leftTriggerAxis);
+            InputDevice.MotionRange ltRange = getMotionRangeForJoystickAxis(dev, context.leftTriggerAxis);
-            InputDevice.MotionRange rtRange = getMotionRangeForJoystickAxis(dev, mapping.rightTriggerAxis);
+            InputDevice.MotionRange rtRange = getMotionRangeForJoystickAxis(dev, context.rightTriggerAxis);
 
             // It's important to have a valid deadzone so controller packet batching works properly
-            mapping.triggerDeadzone = Math.max(Math.abs(ltRange.getFlat()), Math.abs(rtRange.getFlat()));
+            context.triggerDeadzone = Math.max(Math.abs(ltRange.getFlat()), Math.abs(rtRange.getFlat()));
 
             // For triggers without (valid) deadzones, we'll use 13% (around XInput's default)
-            if (mapping.triggerDeadzone < 0.13f ||
+            if (context.triggerDeadzone < 0.13f ||
-                mapping.triggerDeadzone > 0.30f)
+                context.triggerDeadzone > 0.30f)
             {
-                mapping.triggerDeadzone = 0.13f;
+                context.triggerDeadzone = 0.13f;
             }
         }
 
@@ -226,71 +261,86 @@ public class ControllerHandler {
                 if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {
                     boolean[] hasStartKey = dev.hasKeys(KeyEvent.KEYCODE_BUTTON_START, KeyEvent.KEYCODE_MENU, 0);
                     if (!hasStartKey[0] && !hasStartKey[1]) {
-                        mapping.backIsStart = true;
+                        context.backIsStart = true;
+                        context.modeIsSelect = true;
                     }
                 }
 
                 // The ASUS Gamepad has triggers that sit far forward and are prone to false presses
                 // so we increase the deadzone on them to minimize this
-                mapping.triggerDeadzone = 0.30f;
+                context.triggerDeadzone = 0.30f;
             }
             // Classify this device as a remote by name
             else if (devName.contains("Fire TV Remote") || devName.contains("Nexus Remote")) {
                 // It's only a remote if it doesn't any sticks
-                if (!mapping.hasJoystickAxes) {
+                if (!context.hasJoystickAxes) {
-                    mapping.isRemote = true;
+                    context.isRemote = true;
                 }
             }
-            // NYKO Playpad has a fake hat that mimics the left stick for some reason
+            // SHIELD controllers will use small stick deadzones
-            else if (devName.contains("NYKO PLAYPAD")) {
+            else if (devName.contains("SHIELD")) {
-                mapping.hatXAxis = -1;
+                context.leftStickDeadzoneRadius = 0.07f;
-                mapping.hatYAxis = -1;
+                context.rightStickDeadzoneRadius = 0.07f;
             }
         }
 
-        LimeLog.info("Analog stick deadzone: "+mapping.leftStickDeadzoneRadius+" "+mapping.rightStickDeadzoneRadius);
+        LimeLog.info("Analog stick deadzone: "+context.leftStickDeadzoneRadius+" "+context.rightStickDeadzoneRadius);
-        LimeLog.info("Trigger deadzone: "+mapping.triggerDeadzone);
+        LimeLog.info("Trigger deadzone: "+context.triggerDeadzone);
 
-		return mapping;
+        if (devName != null && devName.equals("gpio-keys")) {
+            // This is the back button on Shield portable consoles
+            context.controllerNumber = 0;
+        }
+        else if (multiControllerEnabled && context.hasJoystickAxes) {
+            context.controllerNumber = assignNewControllerNumber();
+        }
+        else {
+            context.controllerNumber = 0;
+        }
+        LimeLog.info("Assigned as controller "+context.controllerNumber);
+
+        return context;
     }
 
-	private ControllerMapping getMappingForDevice(InputDevice dev) {
+    private ControllerContext getContextForDevice(InputDevice dev) {
-		// Unknown devices use the default mapping
+        // Unknown devices use the default context
         if (dev == null) {
-			return defaultMapping;
+            return defaultContext;
         }
 
         String descriptor = dev.getDescriptor();
 
-		// Return the existing mapping if it exists
+        // Return the existing context if it exists
-		ControllerMapping mapping = mappings.get(descriptor);
+        ControllerContext context = contexts.get(descriptor);
-		if (mapping != null) {
+        if (context != null) {
-			return mapping;
+            return context;
         }
 
-		// Otherwise create a new mapping
+        // Otherwise create a new context
-		mapping = createMappingForDevice(dev);
+        context = createContextForDevice(dev);
-		mappings.put(descriptor, mapping);
+        contexts.put(descriptor, context);
 
-		return mapping;
+        return context;
     }
 
-	private void sendControllerInputPacket() {
+    private void sendControllerInputPacket(ControllerContext context) {
-		conn.sendControllerInput(inputMap, leftTrigger, rightTrigger,
+        conn.sendControllerInput(context.controllerNumber, context.inputMap,
-				leftStickX, leftStickY, rightStickX, rightStickY);
+                context.leftTrigger, context.rightTrigger,
+                context.leftStickX, context.leftStickY,
+                context.rightStickX, context.rightStickY);
     }
 
     // Return a valid keycode, 0 to consume, or -1 to not consume the event
     // Device MAY BE NULL
-	private int handleRemapping(ControllerMapping mapping, KeyEvent event) {
+    private int handleRemapping(ControllerContext context, KeyEvent event) {
         // For remotes, don't capture the back button
-		if (mapping.isRemote) {
+        if (context.isRemote) {
             if (event.getKeyCode() == KeyEvent.KEYCODE_BACK) {
                 return -1;
             }
         }
 
-        if (mapping.isDualShock4) {
+        if (context.isDualShock4) {
             switch (event.getKeyCode()) {
             case KeyEvent.KEYCODE_BUTTON_Y:
                 return KeyEvent.KEYCODE_BUTTON_L1;
@@ -329,7 +379,7 @@ public class ControllerHandler {
             }
         }
 
-		if (mapping.hatXAxis != -1 && mapping.hatYAxis != -1) {
+        if (context.hatXAxis != -1 && context.hatYAxis != -1) {
             switch (event.getKeyCode()) {
             // These are duplicate dpad events for hat input
             case KeyEvent.KEYCODE_DPAD_LEFT:
@@ -340,9 +390,9 @@ public class ControllerHandler {
                 return 0;
             }
         }
-		else if (mapping.hatXAxis == -1 &&
+        else if (context.hatXAxis == -1 &&
-				 mapping.hatYAxis == -1 &&
+                 context.hatYAxis == -1 &&
-				 mapping.isXboxController &&
+                 context.isXboxController &&
                  event.getKeyCode() == KeyEvent.KEYCODE_UNKNOWN) {
             // If there's not a proper Xbox controller mapping, we'll translate the raw d-pad
             // scan codes into proper key codes
@@ -375,12 +425,20 @@ public class ControllerHandler {
         if (keyCode == KeyEvent.KEYCODE_BUTTON_START ||
                 keyCode == KeyEvent.KEYCODE_MENU) {
             // Ensure that we never use back as start if we have a real start
-            mapping.backIsStart = false;
+            context.backIsStart = false;
         }
-        else if (mapping.backIsStart && keyCode == KeyEvent.KEYCODE_BACK) {
+        else if (keyCode == KeyEvent.KEYCODE_BUTTON_SELECT) {
+            // Don't use mode as select if we have a select
+            context.modeIsSelect = false;
+        }
+        else if (context.backIsStart && keyCode == KeyEvent.KEYCODE_BACK) {
             // Emulate the start button with back
             return KeyEvent.KEYCODE_BUTTON_START;
         }
+        else if (context.modeIsSelect && keyCode == KeyEvent.KEYCODE_BUTTON_MODE) {
+            // Emulate the select button with mode
+            return KeyEvent.KEYCODE_BUTTON_SELECT;
+        }
 
         return keyCode;
     }
@@ -402,101 +460,101 @@ public class ControllerHandler {
         // evaluates the deadzone.
     }
 
-    private void handleAxisSet(ControllerMapping mapping, float lsX, float lsY, float rsX,
+    private void handleAxisSet(ControllerContext context, float lsX, float lsY, float rsX,
                                float rsY, float lt, float rt, float hatX, float hatY) {
 
-        if (mapping.leftStickXAxis != -1 && mapping.leftStickYAxis != -1) {
+        if (context.leftStickXAxis != -1 && context.leftStickYAxis != -1) {
             Vector2d leftStickVector = populateCachedVector(lsX, lsY);
 
-            handleDeadZone(leftStickVector, mapping.leftStickDeadzoneRadius);
+            handleDeadZone(leftStickVector, context.leftStickDeadzoneRadius);
 
-            leftStickX = (short) (leftStickVector.getX() * 0x7FFE);
+            context.leftStickX = (short) (leftStickVector.getX() * 0x7FFE);
-            leftStickY = (short) (-leftStickVector.getY() * 0x7FFE);
+            context.leftStickY = (short) (-leftStickVector.getY() * 0x7FFE);
         }
 
-        if (mapping.rightStickXAxis != -1 && mapping.rightStickYAxis != -1) {
+        if (context.rightStickXAxis != -1 && context.rightStickYAxis != -1) {
             Vector2d rightStickVector = populateCachedVector(rsX, rsY);
 
-            handleDeadZone(rightStickVector, mapping.rightStickDeadzoneRadius);
+            handleDeadZone(rightStickVector, context.rightStickDeadzoneRadius);
 
-            rightStickX = (short) (rightStickVector.getX() * 0x7FFE);
+            context.rightStickX = (short) (rightStickVector.getX() * 0x7FFE);
-            rightStickY = (short) (-rightStickVector.getY() * 0x7FFE);
+            context.rightStickY = (short) (-rightStickVector.getY() * 0x7FFE);
         }
 
-        if (mapping.leftTriggerAxis != -1 && mapping.rightTriggerAxis != -1) {
+        if (context.leftTriggerAxis != -1 && context.rightTriggerAxis != -1) {
-            if (mapping.triggersIdleNegative) {
+            if (context.triggersIdleNegative) {
                 lt = (lt + 1) / 2;
                 rt = (rt + 1) / 2;
             }
 
-            if (lt <= mapping.triggerDeadzone) {
+            if (lt <= context.triggerDeadzone) {
                 lt = 0;
             }
-            if (rt <= mapping.triggerDeadzone) {
+            if (rt <= context.triggerDeadzone) {
                 rt = 0;
             }
 
-            leftTrigger = (byte)(lt * 0xFF);
+            context.leftTrigger = (byte)(lt * 0xFF);
-            rightTrigger = (byte)(rt * 0xFF);
+            context.rightTrigger = (byte)(rt * 0xFF);
         }
 
-        if (mapping.hatXAxis != -1 && mapping.hatYAxis != -1) {
+        if (context.hatXAxis != -1 && context.hatYAxis != -1) {
-            inputMap &= ~(ControllerPacket.LEFT_FLAG | ControllerPacket.RIGHT_FLAG);
+            context.inputMap &= ~(ControllerPacket.LEFT_FLAG | ControllerPacket.RIGHT_FLAG);
             if (hatX < -0.5) {
-                inputMap |= ControllerPacket.LEFT_FLAG;
+                context.inputMap |= ControllerPacket.LEFT_FLAG;
             }
             else if (hatX > 0.5) {
-                inputMap |= ControllerPacket.RIGHT_FLAG;
+                context.inputMap |= ControllerPacket.RIGHT_FLAG;
             }
 
-            inputMap &= ~(ControllerPacket.UP_FLAG | ControllerPacket.DOWN_FLAG);
+            context.inputMap &= ~(ControllerPacket.UP_FLAG | ControllerPacket.DOWN_FLAG);
             if (hatY < -0.5) {
-                inputMap |= ControllerPacket.UP_FLAG;
+                context.inputMap |= ControllerPacket.UP_FLAG;
             }
             else if (hatY > 0.5) {
-                inputMap |= ControllerPacket.DOWN_FLAG;
+                context.inputMap |= ControllerPacket.DOWN_FLAG;
             }
         }
 
-        sendControllerInputPacket();
+        sendControllerInputPacket(context);
     }
 
     public boolean handleMotionEvent(MotionEvent event) {
-		ControllerMapping mapping = getMappingForDevice(event.getDevice());
+        ControllerContext context = getContextForDevice(event.getDevice());
         float lsX = 0, lsY = 0, rsX = 0, rsY = 0, rt = 0, lt = 0, hatX = 0, hatY = 0;
 
         // We purposefully ignore the historical values in the motion event as it makes
         // the controller feel sluggish for some users.
 
-        if (mapping.leftStickXAxis != -1 && mapping.leftStickYAxis != -1) {
+        if (context.leftStickXAxis != -1 && context.leftStickYAxis != -1) {
-            lsX = event.getAxisValue(mapping.leftStickXAxis);
+            lsX = event.getAxisValue(context.leftStickXAxis);
-            lsY = event.getAxisValue(mapping.leftStickYAxis);
+            lsY = event.getAxisValue(context.leftStickYAxis);
         }
 
-        if (mapping.rightStickXAxis != -1 && mapping.rightStickYAxis != -1) {
+        if (context.rightStickXAxis != -1 && context.rightStickYAxis != -1) {
-            rsX = event.getAxisValue(mapping.rightStickXAxis);
+            rsX = event.getAxisValue(context.rightStickXAxis);
-            rsY = event.getAxisValue(mapping.rightStickYAxis);
+            rsY = event.getAxisValue(context.rightStickYAxis);
         }
 
-        if (mapping.leftTriggerAxis != -1 && mapping.rightTriggerAxis != -1) {
+        if (context.leftTriggerAxis != -1 && context.rightTriggerAxis != -1) {
-            lt = event.getAxisValue(mapping.leftTriggerAxis);
+            lt = event.getAxisValue(context.leftTriggerAxis);
-            rt = event.getAxisValue(mapping.rightTriggerAxis);
+            rt = event.getAxisValue(context.rightTriggerAxis);
         }
 
-        if (mapping.hatXAxis != -1 && mapping.hatYAxis != -1) {
+        if (context.hatXAxis != -1 && context.hatYAxis != -1) {
             hatX = event.getAxisValue(MotionEvent.AXIS_HAT_X);
             hatY = event.getAxisValue(MotionEvent.AXIS_HAT_Y);
         }
 
-        handleAxisSet(mapping, lsX, lsY, rsX, rsY, lt, rt, hatX, hatY);
+        handleAxisSet(context, lsX, lsY, rsX, rsY, lt, rt, hatX, hatY);
 
         return true;
     }
 
     public boolean handleButtonUp(KeyEvent event) {
-		ControllerMapping mapping = getMappingForDevice(event.getDevice());
+        ControllerContext context = getContextForDevice(event.getDevice());
 
-        int keyCode = handleRemapping(mapping, event);
+        int keyCode = handleRemapping(context, event);
         if (keyCode == 0) {
             return true;
         }
@@ -515,78 +573,80 @@ public class ControllerHandler {
 
         switch (keyCode) {
         case KeyEvent.KEYCODE_BUTTON_MODE:
-			inputMap &= ~ControllerPacket.SPECIAL_BUTTON_FLAG;
+            context.inputMap &= ~ControllerPacket.SPECIAL_BUTTON_FLAG;
             break;
         case KeyEvent.KEYCODE_BUTTON_START:
         case KeyEvent.KEYCODE_MENU:
-            if (SystemClock.uptimeMillis() - startDownTime > ControllerHandler.START_DOWN_TIME_KEYB_MS) {
+            if (SystemClock.uptimeMillis() - context.startDownTime > ControllerHandler.START_DOWN_TIME_KEYB_MS) {
-                gestures.showKeyboard();
+                // FIXME: The stock keyboard doesn't have controller focus so isn't usable. I'm not enabling this shortcut
+                // until we have a custom keyboard or some other fix
+                //gestures.showKeyboard();
             }
-			inputMap &= ~ControllerPacket.PLAY_FLAG;
+            context.inputMap &= ~ControllerPacket.PLAY_FLAG;
             break;
         case KeyEvent.KEYCODE_BACK:
         case KeyEvent.KEYCODE_BUTTON_SELECT:
-			inputMap &= ~ControllerPacket.BACK_FLAG;
+            context.inputMap &= ~ControllerPacket.BACK_FLAG;
             break;
         case KeyEvent.KEYCODE_DPAD_LEFT:
-			inputMap &= ~ControllerPacket.LEFT_FLAG;
+            context.inputMap &= ~ControllerPacket.LEFT_FLAG;
             break;
         case KeyEvent.KEYCODE_DPAD_RIGHT:
-			inputMap &= ~ControllerPacket.RIGHT_FLAG;
+            context.inputMap &= ~ControllerPacket.RIGHT_FLAG;
             break;
         case KeyEvent.KEYCODE_DPAD_UP:
-			inputMap &= ~ControllerPacket.UP_FLAG;
+            context.inputMap &= ~ControllerPacket.UP_FLAG;
             break;
         case KeyEvent.KEYCODE_DPAD_DOWN:
-			inputMap &= ~ControllerPacket.DOWN_FLAG;
+            context.inputMap &= ~ControllerPacket.DOWN_FLAG;
             break;
         case KeyEvent.KEYCODE_BUTTON_B:
-			inputMap &= ~ControllerPacket.B_FLAG;
+            context.inputMap &= ~ControllerPacket.B_FLAG;
             break;
         case KeyEvent.KEYCODE_DPAD_CENTER:
         case KeyEvent.KEYCODE_BUTTON_A:
-			inputMap &= ~ControllerPacket.A_FLAG;
+            context.inputMap &= ~ControllerPacket.A_FLAG;
             break;
         case KeyEvent.KEYCODE_BUTTON_X:
-			inputMap &= ~ControllerPacket.X_FLAG;
+            context.inputMap &= ~ControllerPacket.X_FLAG;
             break;
         case KeyEvent.KEYCODE_BUTTON_Y:
-			inputMap &= ~ControllerPacket.Y_FLAG;
+            context.inputMap &= ~ControllerPacket.Y_FLAG;
             break;
         case KeyEvent.KEYCODE_BUTTON_L1:
-			inputMap &= ~ControllerPacket.LB_FLAG;
+            context.inputMap &= ~ControllerPacket.LB_FLAG;
-			lastLbUpTime = SystemClock.uptimeMillis();
+            context.lastLbUpTime = SystemClock.uptimeMillis();
             break;
         case KeyEvent.KEYCODE_BUTTON_R1:
-			inputMap &= ~ControllerPacket.RB_FLAG;
+            context.inputMap &= ~ControllerPacket.RB_FLAG;
-			lastRbUpTime = SystemClock.uptimeMillis();
+            context.lastRbUpTime = SystemClock.uptimeMillis();
             break;
         case KeyEvent.KEYCODE_BUTTON_THUMBL:
-			inputMap &= ~ControllerPacket.LS_CLK_FLAG;
+            context.inputMap &= ~ControllerPacket.LS_CLK_FLAG;
             break;
         case KeyEvent.KEYCODE_BUTTON_THUMBR:
-			inputMap &= ~ControllerPacket.RS_CLK_FLAG;
+            context.inputMap &= ~ControllerPacket.RS_CLK_FLAG;
             break;
         case KeyEvent.KEYCODE_BUTTON_L2:
-			leftTrigger = 0;
+            context.leftTrigger = 0;
             break;
         case KeyEvent.KEYCODE_BUTTON_R2:
-			rightTrigger = 0;
+            context.rightTrigger = 0;
             break;
         default:
             return false;
         }
 
         // Check if we're emulating the select button
-		if ((emulatingButtonFlags & ControllerHandler.EMULATING_SELECT) != 0)
+        if ((context.emulatingButtonFlags & ControllerHandler.EMULATING_SELECT) != 0)
         {
             // If either start or LB is up, select comes up too
-			if ((inputMap & ControllerPacket.PLAY_FLAG) == 0 ||
+            if ((context.inputMap & ControllerPacket.PLAY_FLAG) == 0 ||
-				(inputMap & ControllerPacket.LB_FLAG) == 0)
+                (context.inputMap & ControllerPacket.LB_FLAG) == 0)
             {
-				inputMap &= ~ControllerPacket.BACK_FLAG;
+                context.inputMap &= ~ControllerPacket.BACK_FLAG;
 
-				emulatingButtonFlags &= ~ControllerHandler.EMULATING_SELECT;
+                context.emulatingButtonFlags &= ~ControllerHandler.EMULATING_SELECT;
 
                 try {
                     Thread.sleep(EMULATED_SELECT_UP_DELAY_MS);
@@ -595,16 +655,16 @@ public class ControllerHandler {
         }
 
         // Check if we're emulating the special button
-		if ((emulatingButtonFlags & ControllerHandler.EMULATING_SPECIAL) != 0)
+        if ((context.emulatingButtonFlags & ControllerHandler.EMULATING_SPECIAL) != 0)
         {
             // If either start or select and RB is up, the special button comes up too
-			if ((inputMap & ControllerPacket.PLAY_FLAG) == 0 ||
+            if ((context.inputMap & ControllerPacket.PLAY_FLAG) == 0 ||
-				((inputMap & ControllerPacket.BACK_FLAG) == 0 &&
+                ((context.inputMap & ControllerPacket.BACK_FLAG) == 0 &&
-				 (inputMap & ControllerPacket.RB_FLAG) == 0))
+                 (context.inputMap & ControllerPacket.RB_FLAG) == 0))
             {
-				inputMap &= ~ControllerPacket.SPECIAL_BUTTON_FLAG;
+                context.inputMap &= ~ControllerPacket.SPECIAL_BUTTON_FLAG;
 
-				emulatingButtonFlags &= ~ControllerHandler.EMULATING_SPECIAL;
+                context.emulatingButtonFlags &= ~ControllerHandler.EMULATING_SPECIAL;
 
                 try {
                     Thread.sleep(EMULATED_SPECIAL_UP_DELAY_MS);
@@ -612,112 +672,115 @@ public class ControllerHandler {
             }
         }
 
-		sendControllerInputPacket();
+        sendControllerInputPacket(context);
         return true;
     }
 
     public boolean handleButtonDown(KeyEvent event) {
-		ControllerMapping mapping = getMappingForDevice(event.getDevice());
+        ControllerContext context = getContextForDevice(event.getDevice());
 
-        int keyCode = handleRemapping(mapping, event);
+        int keyCode = handleRemapping(context, event);
         if (keyCode == 0) {
             return true;
         }
 
         switch (keyCode) {
         case KeyEvent.KEYCODE_BUTTON_MODE:
-			inputMap |= ControllerPacket.SPECIAL_BUTTON_FLAG;
+            context.inputMap |= ControllerPacket.SPECIAL_BUTTON_FLAG;
             break;
         case KeyEvent.KEYCODE_BUTTON_START:
         case KeyEvent.KEYCODE_MENU:
             if (event.getRepeatCount() == 0) {
-                startDownTime = SystemClock.uptimeMillis();
+                context.startDownTime = SystemClock.uptimeMillis();
             }
-			inputMap |= ControllerPacket.PLAY_FLAG;
+            context.inputMap |= ControllerPacket.PLAY_FLAG;
             break;
         case KeyEvent.KEYCODE_BACK:
         case KeyEvent.KEYCODE_BUTTON_SELECT:
-			inputMap |= ControllerPacket.BACK_FLAG;
+            context.inputMap |= ControllerPacket.BACK_FLAG;
             break;
         case KeyEvent.KEYCODE_DPAD_LEFT:
-			inputMap |= ControllerPacket.LEFT_FLAG;
+            context.inputMap |= ControllerPacket.LEFT_FLAG;
             break;
         case KeyEvent.KEYCODE_DPAD_RIGHT:
-			inputMap |= ControllerPacket.RIGHT_FLAG;
+            context.inputMap |= ControllerPacket.RIGHT_FLAG;
             break;
         case KeyEvent.KEYCODE_DPAD_UP:
-			inputMap |= ControllerPacket.UP_FLAG;
+            context.inputMap |= ControllerPacket.UP_FLAG;
             break;
         case KeyEvent.KEYCODE_DPAD_DOWN:
-			inputMap |= ControllerPacket.DOWN_FLAG;
+            context.inputMap |= ControllerPacket.DOWN_FLAG;
             break;
         case KeyEvent.KEYCODE_BUTTON_B:
-			inputMap |= ControllerPacket.B_FLAG;
+            context.inputMap |= ControllerPacket.B_FLAG;
             break;
         case KeyEvent.KEYCODE_DPAD_CENTER:
         case KeyEvent.KEYCODE_BUTTON_A:
-			inputMap |= ControllerPacket.A_FLAG;
+            context.inputMap |= ControllerPacket.A_FLAG;
             break;
         case KeyEvent.KEYCODE_BUTTON_X:
-			inputMap |= ControllerPacket.X_FLAG;
+            context.inputMap |= ControllerPacket.X_FLAG;
             break;
         case KeyEvent.KEYCODE_BUTTON_Y:
-			inputMap |= ControllerPacket.Y_FLAG;
+            context.inputMap |= ControllerPacket.Y_FLAG;
             break;
         case KeyEvent.KEYCODE_BUTTON_L1:
-			inputMap |= ControllerPacket.LB_FLAG;
+            context.inputMap |= ControllerPacket.LB_FLAG;
             break;
         case KeyEvent.KEYCODE_BUTTON_R1:
-			inputMap |= ControllerPacket.RB_FLAG;
+            context.inputMap |= ControllerPacket.RB_FLAG;
             break;
         case KeyEvent.KEYCODE_BUTTON_THUMBL:
-			inputMap |= ControllerPacket.LS_CLK_FLAG;
+            context.inputMap |= ControllerPacket.LS_CLK_FLAG;
             break;
         case KeyEvent.KEYCODE_BUTTON_THUMBR:
-			inputMap |= ControllerPacket.RS_CLK_FLAG;
+            context.inputMap |= ControllerPacket.RS_CLK_FLAG;
             break;
         case KeyEvent.KEYCODE_BUTTON_L2:
-			leftTrigger = (byte)0xFF;
+            context.leftTrigger = (byte)0xFF;
             break;
         case KeyEvent.KEYCODE_BUTTON_R2:
-			rightTrigger = (byte)0xFF;
+            context.rightTrigger = (byte)0xFF;
             break;
         default:
             return false;
         }
 
         // Start+LB acts like select for controllers with one button
-		if ((inputMap & ControllerPacket.PLAY_FLAG) != 0 &&
+        if ((context.inputMap & ControllerPacket.PLAY_FLAG) != 0 &&
-			((inputMap & ControllerPacket.LB_FLAG) != 0 ||
+            ((context.inputMap & ControllerPacket.LB_FLAG) != 0 ||
-			  SystemClock.uptimeMillis() - lastLbUpTime <= MAXIMUM_BUMPER_UP_DELAY_MS))
+              SystemClock.uptimeMillis() - context.lastLbUpTime <= MAXIMUM_BUMPER_UP_DELAY_MS))
         {
-			inputMap &= ~(ControllerPacket.PLAY_FLAG | ControllerPacket.LB_FLAG);
+            context.inputMap &= ~(ControllerPacket.PLAY_FLAG | ControllerPacket.LB_FLAG);
-			inputMap |= ControllerPacket.BACK_FLAG;
+            context.inputMap |= ControllerPacket.BACK_FLAG;
 
-			emulatingButtonFlags |= ControllerHandler.EMULATING_SELECT;
+            context.emulatingButtonFlags |= ControllerHandler.EMULATING_SELECT;
         }
 
         // We detect select+start or start+RB as the special button combo
-		if (((inputMap & ControllerPacket.RB_FLAG) != 0 ||
+        if (((context.inputMap & ControllerPacket.RB_FLAG) != 0 ||
-			 (SystemClock.uptimeMillis() - lastRbUpTime <= MAXIMUM_BUMPER_UP_DELAY_MS) ||
+             (SystemClock.uptimeMillis() - context.lastRbUpTime <= MAXIMUM_BUMPER_UP_DELAY_MS) ||
-			 (inputMap & ControllerPacket.BACK_FLAG) != 0) &&
+             (context.inputMap & ControllerPacket.BACK_FLAG) != 0) &&
-			(inputMap & ControllerPacket.PLAY_FLAG) != 0)
+            (context.inputMap & ControllerPacket.PLAY_FLAG) != 0)
         {
-			inputMap &= ~(ControllerPacket.BACK_FLAG | ControllerPacket.PLAY_FLAG | ControllerPacket.RB_FLAG);
+            context.inputMap &= ~(ControllerPacket.BACK_FLAG | ControllerPacket.PLAY_FLAG | ControllerPacket.RB_FLAG);
-			inputMap |= ControllerPacket.SPECIAL_BUTTON_FLAG;
+            context.inputMap |= ControllerPacket.SPECIAL_BUTTON_FLAG;
 
-			emulatingButtonFlags |= ControllerHandler.EMULATING_SPECIAL;
+            context.emulatingButtonFlags |= ControllerHandler.EMULATING_SPECIAL;
         }
 
         // Send a new input packet if this is the first instance of a button down event
         // or anytime if we're emulating a button
-        if (event.getRepeatCount() == 0 || emulatingButtonFlags != 0) {
+        if (event.getRepeatCount() == 0 || context.emulatingButtonFlags != 0) {
-            sendControllerInputPacket();
+            sendControllerInputPacket(context);
         }
         return true;
     }
 
-	class ControllerMapping {
+    class ControllerContext {
+        public String name;
+        public int id;
+
         public int leftStickXAxis = -1;
         public int leftStickYAxis = -1;
         public float leftStickDeadzoneRadius;
@@ -737,7 +800,29 @@ public class ControllerHandler {
         public boolean isDualShock4;
         public boolean isXboxController;
         public boolean backIsStart;
+        public boolean modeIsSelect;
         public boolean isRemote;
         public boolean hasJoystickAxes;
+
+        public short controllerNumber;
+
+        public short inputMap = 0x0000;
+        public byte leftTrigger = 0x00;
+        public byte rightTrigger = 0x00;
+        public short rightStickX = 0x0000;
+        public short rightStickY = 0x0000;
+        public short leftStickX = 0x0000;
+        public short leftStickY = 0x0000;
+        public int emulatingButtonFlags = 0;
+
+        // Used for OUYA bumper state tracking since they force all buttons
+        // up when the OUYA button goes down. We watch the last time we get
+        // a bumper up and compare that to our maximum delay when we receive
+        // a Start button press to see if we should activate one of our
+        // emulated button combos.
+        public long lastLbUpTime = 0;
+        public long lastRbUpTime = 0;
+
+        public long startDownTime = 0;
     }
 }

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/EvdevReader.java

@@ -26,7 +26,7 @@ public class EvdevReader {
         // 4.4 and later to do live SELinux policy changes.
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
             EvdevShell shell = EvdevShell.getInstance();
-            shell.runCommand("supolicy --live \"allow untrusted_app input_device dir { getattr read search }\" " +
+            shell.runCommand("supolicy --live \"allow untrusted_app input_device dir { open getattr read search }\" " +
                     "\"allow untrusted_app input_device chr_file { open read write ioctl }\"");
         }
     }

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() {
@@ -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();
@@ -232,7 +231,8 @@ public class AndroidCpuDecoderRenderer extends EnhancedDecoderRenderer {
         if (decodeUnit.getDataLength() <= DECODER_BUFFER_SIZE) {
             decoderBuffer.clear();
 
-			for (ByteBufferDescriptor bbd : decodeUnit.getBufferList()) {
+            for (ByteBufferDescriptor bbd = decodeUnit.getBufferHead();
+                 bbd != null; bbd = bbd.nextDescriptor) {
                 decoderBuffer.put(bbd.data, bbd.offset, bbd.length);
             }
 
@@ -242,7 +242,8 @@ public class AndroidCpuDecoderRenderer extends EnhancedDecoderRenderer {
             data = new byte[decodeUnit.getDataLength()+AvcDecoder.getInputPaddingSize()];
 
             int offset = 0;
-			for (ByteBufferDescriptor bbd : decodeUnit.getBufferList()) {
+            for (ByteBufferDescriptor bbd = decodeUnit.getBufferHead();
+                 bbd != null; bbd = bbd.nextDescriptor) {
                 System.arraycopy(bbd.data, bbd.offset, data, offset, bbd.length);
                 offset += bbd.length;
             }

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

@@ -1,5 +1,6 @@
 package com.limelight.binding.video;
 
+import com.limelight.nvstream.av.DecodeUnit;
 import com.limelight.nvstream.av.video.VideoDecoderRenderer;
 import com.limelight.nvstream.av.video.VideoDepacketizer;
 
@@ -55,6 +56,11 @@ public class ConfigurableDecoderRenderer extends EnhancedDecoderRenderer {
         return decoderRenderer.getCapabilities();
     }
 
+    @Override
+    public void directSubmitDecodeUnit(DecodeUnit du) {
+        decoderRenderer.directSubmitDecodeUnit(du);
+    }
+
     @Override
     public int getAverageDecoderLatency() {
         if (decoderRenderer != null) {

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

@@ -2,6 +2,6 @@ package com.limelight.binding.video;
 
 import com.limelight.nvstream.av.video.VideoDecoderRenderer;
 
-public abstract class EnhancedDecoderRenderer implements VideoDecoderRenderer {
+public abstract class EnhancedDecoderRenderer extends VideoDecoderRenderer {
     public abstract String getDecoderName();
 }

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

@@ -28,9 +28,9 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
     private ByteBuffer[] videoDecoderInputBuffers;
     private MediaCodec videoDecoder;
     private Thread rendererThread;
-	private boolean needsSpsBitstreamFixup, isExynos4;
+    private final boolean needsSpsBitstreamFixup, isExynos4;
     private VideoDepacketizer depacketizer;
-	private boolean adaptivePlayback;
+    private final boolean adaptivePlayback, directSubmit;
     private int initialWidth, initialHeight;
 
     private boolean needsBaselineSpsHack;
@@ -46,8 +46,6 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
     private int numPpsIn;
     private int numIframeIn;
 
-	private static final boolean ENABLE_ASYNC_RENDERER = false;
-	
     @TargetApi(Build.VERSION_CODES.KITKAT)
     public MediaCodecDecoderRenderer() {
         //dumpDecoders();
@@ -58,12 +56,15 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
         }
         if (decoder == null) {
             // This case is handled later in setup()
+            needsSpsBitstreamFixup = isExynos4 =
+            adaptivePlayback = directSubmit = false;
             return;
         }
 
         decoderName = decoder.getName();
 
         // Set decoder-specific attributes
+        directSubmit = MediaCodecHelper.decoderCanDirectSubmit(decoderName, decoder);
         adaptivePlayback = MediaCodecHelper.decoderSupportsAdaptivePlayback(decoderName, decoder);
         needsSpsBitstreamFixup = MediaCodecHelper.decoderNeedsSpsBitstreamRestrictions(decoderName, decoder);
         needsBaselineSpsHack = MediaCodecHelper.decoderNeedsBaselineSpsHack(decoderName, decoder);
@@ -77,9 +78,11 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
         if (isExynos4) {
             LimeLog.info("Decoder "+decoderName+" is on Exynos 4");
         }
+        if (directSubmit) {
+            LimeLog.info("Decoder "+decoderName+" will use direct submit");
+        }
     }
 
-	@TargetApi(Build.VERSION_CODES.LOLLIPOP)
     @Override
     public boolean setup(int width, int height, int redrawRate, Object renderTarget, int drFlags) {
         this.initialWidth = width;
@@ -107,52 +110,6 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
             videoFormat.setInteger(MediaFormat.KEY_MAX_HEIGHT, height);
         }
 
-		// On Lollipop, we use asynchronous mode to avoid having a busy looping renderer thread
-		if (ENABLE_ASYNC_RENDERER && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-			videoDecoder.setCallback(new MediaCodec.Callback() {
-				@Override
-				public void onOutputFormatChanged(MediaCodec codec, MediaFormat format) {
-			    	LimeLog.info("Output format changed");
-			    	LimeLog.info("New output Format: " + format);
-				}
-				
-				@Override
-				public void onOutputBufferAvailable(MediaCodec codec, int index,
-						BufferInfo info) {
-					try {
-						// FIXME: It looks like we can't frameskip here
-						codec.releaseOutputBuffer(index, true);
-					} catch (Exception e) {
-						handleDecoderException(MediaCodecDecoderRenderer.this, e, null, 0);
-					}
-				}
-				
-				@Override
-				public void onInputBufferAvailable(MediaCodec codec, int index) {
-					try {
-						submitDecodeUnit(depacketizer.takeNextDecodeUnit(), codec.getInputBuffer(index), index);
-					} catch (InterruptedException e) {
-						// What do we do here?
-						e.printStackTrace();
-					} catch (Exception e) {
-						handleDecoderException(MediaCodecDecoderRenderer.this, e, null, 0);
-					}
-				}
-				
-				@Override
-				public void onError(MediaCodec codec, CodecException e) {
-					if (e.isTransient()) {
-						LimeLog.warning(e.getDiagnosticInfo());
-						e.printStackTrace();
-					}
-					else {
-						LimeLog.severe(e.getDiagnosticInfo());
-						e.printStackTrace();
-					}
-				}
-			});
-		}
-		
         videoDecoder.configure(videoFormat, ((SurfaceHolder)renderTarget).getSurface(), null, 0);
         videoDecoder.setVideoScalingMode(MediaCodec.VIDEO_SCALING_MODE_SCALE_TO_FIT);
 
@@ -162,7 +119,7 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
     }
 
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
-	private void handleDecoderException(MediaCodecDecoderRenderer dr, Exception e, ByteBuffer buf, int codecFlags) {
+    private void handleDecoderException(Exception e, ByteBuffer buf, int codecFlags) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             if (e instanceof CodecException) {
                 CodecException codecExc = (CodecException) e;
@@ -178,14 +135,92 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
         }
 
         if (buf != null || codecFlags != 0) {
-			throw new RendererException(dr, e, buf, codecFlags);
+            throw new RendererException(this, e, buf, codecFlags);
         }
         else {
-			throw new RendererException(dr, e);
+            throw new RendererException(this, e);
         }
     }
 
-	private void startRendererThread()
+    private void startDirectSubmitRendererThread()
+    {
+        rendererThread = new Thread() {
+            @SuppressWarnings("deprecation")
+            @Override
+            public void run() {
+                BufferInfo info = new BufferInfo();
+                while (!isInterrupted()) {
+                    try {
+                        // Try to output a frame
+                        int outIndex = videoDecoder.dequeueOutputBuffer(info, 50000);
+                        if (outIndex >= 0) {
+                            long presentationTimeUs = info.presentationTimeUs;
+                            int lastIndex = outIndex;
+
+                            // Get the last output buffer in the queue
+                            while ((outIndex = videoDecoder.dequeueOutputBuffer(info, 0)) >= 0) {
+                                videoDecoder.releaseOutputBuffer(lastIndex, false);
+
+                                lastIndex = outIndex;
+                                presentationTimeUs = info.presentationTimeUs;
+                            }
+
+                            // Render the last buffer
+                            videoDecoder.releaseOutputBuffer(lastIndex, true);
+
+                            // Add delta time to the totals (excluding probable outliers)
+                            long delta = System.currentTimeMillis() - (presentationTimeUs / 1000);
+                            if (delta >= 0 && delta < 1000) {
+                                decoderTimeMs += delta;
+                                totalTimeMs += delta;
+                            }
+                        } else {
+                            switch (outIndex) {
+                                case MediaCodec.INFO_TRY_AGAIN_LATER:
+                                    break;
+                                case MediaCodec.INFO_OUTPUT_BUFFERS_CHANGED:
+                                    LimeLog.info("Output buffers changed");
+                                    break;
+                                case MediaCodec.INFO_OUTPUT_FORMAT_CHANGED:
+                                    LimeLog.info("Output format changed");
+                                    LimeLog.info("New output Format: " + videoDecoder.getOutputFormat());
+                                    break;
+                                default:
+                                    break;
+                            }
+                        }
+                    } catch (Exception e) {
+                        handleDecoderException(e, null, 0);
+                    }
+                }
+            }
+        };
+        rendererThread.setName("Video - Renderer (MediaCodec)");
+        rendererThread.setPriority(Thread.NORM_PRIORITY + 2);
+        rendererThread.start();
+    }
+
+    private int dequeueInputBuffer(boolean wait, boolean infiniteWait) {
+        int index;
+        long startTime, queueTime;
+
+        startTime = System.currentTimeMillis();
+
+        index = videoDecoder.dequeueInputBuffer(wait ? (infiniteWait ? -1 : 3000) : 0);
+        if (index < 0) {
+            return index;
+        }
+
+        queueTime = System.currentTimeMillis();
+
+        if (queueTime - startTime >= 20) {
+            LimeLog.warning("Queue input buffer ran long: "+(queueTime - startTime)+" ms");
+        }
+
+        return index;
+    }
+
+    private void startLegacyRendererThread()
     {
         rendererThread = new Thread() {
             @SuppressWarnings("deprecation")
@@ -194,6 +229,7 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
                 BufferInfo info = new BufferInfo();
                 DecodeUnit du = null;
                 int inputIndex = -1;
+                long lastDuDequeueTime = 0;
                 while (!isInterrupted())
                 {
                     // In order to get as much data to the decoder as early as possible,
@@ -201,8 +237,12 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
                     if (inputIndex == -1 && du == null) {
                         try {
                             for (int i = 0; i < 5; i++) {
-								inputIndex = videoDecoder.dequeueInputBuffer(0);
+                                inputIndex = dequeueInputBuffer(false, false);
                                 du = depacketizer.pollNextDecodeUnit();
+                                if (du != null) {
+                                    lastDuDequeueTime = System.currentTimeMillis();
+                                    notifyDuReceived(du);
+                                }
 
                                 // Stop if we can't get a DU or input buffer
                                 if (du == null || inputIndex == -1) {
@@ -216,7 +256,7 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
                             }
                         } catch (Exception e) {
                             inputIndex = -1;
-							handleDecoderException(MediaCodecDecoderRenderer.this, e, null, 0);
+                            handleDecoderException(e, null, 0);
                         }
                     }
 
@@ -231,21 +271,30 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
                             // If we've got a DU waiting to be given to the decoder,
                             // wait a full 3 ms for an input buffer. Otherwise
                             // just see if we can get one immediately.
-							inputIndex = videoDecoder.dequeueInputBuffer(du != null ? 3000 : 0);
+                            inputIndex = dequeueInputBuffer(du != null, false);
                         } catch (Exception e) {
                             inputIndex = -1;
-							handleDecoderException(MediaCodecDecoderRenderer.this, e, null, 0);
+                            handleDecoderException(e, null, 0);
                         }
                     }
 
                     // Grab a decode unit if we don't have one already
                     if (du == null) {
                         du = depacketizer.pollNextDecodeUnit();
+                        if (du != null) {
+                            lastDuDequeueTime = System.currentTimeMillis();
+                            notifyDuReceived(du);
+                        }
                     }
 
                     // If we've got both a decode unit and an input buffer, we'll
                     // submit now. Otherwise, we wait until we have one.
                     if (du != null && inputIndex >= 0) {
+                        long submissionTime = System.currentTimeMillis();
+                        if (submissionTime - lastDuDequeueTime >= 20) {
+                            LimeLog.warning("Receiving an input buffer took too long: "+(submissionTime - lastDuDequeueTime)+" ms");
+                        }
+
                         submitDecodeUnit(du, videoDecoderInputBuffers[inputIndex], inputIndex);
 
                         // DU and input buffer have both been consumed
@@ -298,7 +347,7 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
                             }
                         }
                     } catch (Exception e) {
-						handleDecoderException(MediaCodecDecoderRenderer.this, e, null, 0);
+                        handleDecoderException(e, null, 0);
                     }
                 }
             }
@@ -316,11 +365,15 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
         // Start the decoder
         videoDecoder.start();
 
-		// On devices pre-Lollipop, we'll use a rendering thread
-		if (!ENABLE_ASYNC_RENDERER || Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
         videoDecoderInputBuffers = videoDecoder.getInputBuffers();
-			startRendererThread();
+
+        if (directSubmit) {
+            startDirectSubmitRendererThread();
         }
+        else {
+            startLegacyRendererThread();
+        }
+
         return true;
     }
 
@@ -357,7 +410,7 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
                         timestampUs, codecFlags);
                 break;
             } catch (Exception e) {
-				handleDecoderException(this, e, null, codecFlags);
+                handleDecoderException(e, null, codecFlags);
                 lastException = e;
             }
         }
@@ -369,14 +422,7 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
 
     @SuppressWarnings("deprecation")
     private void submitDecodeUnit(DecodeUnit decodeUnit, ByteBuffer buf, int inputBufferIndex) {
-		long currentTime = System.currentTimeMillis();
+        long timestampUs = System.currentTimeMillis() * 1000;
-		long delta = currentTime-decodeUnit.getReceiveTimestamp();
-		if (delta >= 0 && delta < 1000) {
-		    totalTimeMs += currentTime-decodeUnit.getReceiveTimestamp();
-		    totalFrames++;
-		}
-		
-		long timestampUs = currentTime * 1000;
         if (timestampUs <= lastTimestampUs) {
             // We can't submit multiple buffers with the same timestamp
             // so bump it up by one before queuing
@@ -400,7 +446,7 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
         boolean needsSpsReplay = false;
 
         if ((decodeUnitFlags & DecodeUnit.DU_FLAG_CODEC_CONFIG) != 0) {
-			ByteBufferDescriptor header = decodeUnit.getBufferList().get(0);
+            ByteBufferDescriptor header = decodeUnit.getBufferHead();
             if (header.data[header.offset+4] == 0x67) {
                 numSpsIn++;
 
@@ -485,8 +531,8 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
         }
 
         // Copy data from our buffer list into the input buffer
-		for (ByteBufferDescriptor desc : decodeUnit.getBufferList())
+        for (ByteBufferDescriptor desc = decodeUnit.getBufferHead();
-		{
+             desc != null; desc = desc.nextDescriptor) {
             buf.put(desc.data, desc.offset, desc.length);
         }
 
@@ -502,7 +548,7 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
     }
 
     private void replaySps() {
-        int inputIndex = videoDecoder.dequeueInputBuffer(-1);
+        int inputIndex = dequeueInputBuffer(true, true);
         ByteBuffer inputBuffer = videoDecoderInputBuffers[inputIndex];
 
         inputBuffer.clear();
@@ -530,8 +576,15 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
 
     @Override
     public int getCapabilities() {
-		return adaptivePlayback ?
+        int caps = 0;
+
+        caps |= adaptivePlayback ?
                 VideoDecoderRenderer.CAPABILITY_ADAPTIVE_RESOLUTION : 0;
+
+        caps |= directSubmit ?
+                VideoDecoderRenderer.CAPABILITY_DIRECT_SUBMIT : 0;
+
+        return caps;
     }
 
     @Override
@@ -555,11 +608,40 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
         return decoderName;
     }
 
+    private void notifyDuReceived(DecodeUnit du) {
+        long currentTime = System.currentTimeMillis();
+        long delta = currentTime-du.getReceiveTimestamp();
+        if (delta >= 0 && delta < 1000) {
+            totalTimeMs += currentTime-du.getReceiveTimestamp();
+            totalFrames++;
+        }
+    }
+
+    @Override
+    public void directSubmitDecodeUnit(DecodeUnit du) {
+        int inputIndex;
+
+        notifyDuReceived(du);
+
+        for (;;) {
+            try {
+                inputIndex = dequeueInputBuffer(true, true);
+                break;
+            } catch (Exception e) {
+                handleDecoderException(e, null, 0);
+            }
+        }
+
+        if (inputIndex >= 0) {
+            submitDecodeUnit(du, videoDecoderInputBuffers[inputIndex], inputIndex);
+        }
+    }
+
     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,26 @@ 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;
+    private static final List<String> directSubmitPrefixes;
+
+    static {
+        directSubmitPrefixes = new LinkedList<String>();
+
+        // These decoders have low enough input buffer latency that they
+        // can be directly invoked from the receive thread
+        directSubmitPrefixes.add("omx.qcom");
+        directSubmitPrefixes.add("omx.sec");
+        directSubmitPrefixes.add("omx.exynos");
+        directSubmitPrefixes.add("omx.intel");
+        directSubmitPrefixes.add("omx.brcm");
+        directSubmitPrefixes.add("omx.TI");
+    }
 
 	static {
 		preferredDecoders = new LinkedList<String>();
@@ -98,6 +112,10 @@ public class MediaCodecHelper {
 		return false;
 	}
 
+    public static boolean decoderCanDirectSubmit(String decoderName, MediaCodecInfo decoderInfo) {
+        return isDecoderInList(directSubmitPrefixes, decoderName) && !isExynos4Device();
+    }
+	
 	public static boolean decoderNeedsSpsBitstreamRestrictions(String decoderName, MediaCodecInfo decoderInfo) {
 		return isDecoderInList(spsFixupBitstreamFixupDecoderPrefixes, decoderName);
 	}
@@ -146,7 +164,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 +235,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

@@ -1,10 +1,11 @@
 package com.limelight.computers;
 
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 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;
 import java.util.List;
 import java.util.UUID;
@@ -30,18 +31,21 @@ import android.os.IBinder;
 import org.xmlpull.v1.XmlPullParserException;
 
 public class ComputerManagerService extends Service {
-	private static final int POLLING_PERIOD_MS = 3000;
+    private static final int SERVERINFO_POLLING_PERIOD_MS = 3000;
+    private static final int APPLIST_POLLING_PERIOD_MS = 30000;
     private static final int MDNS_QUERY_PERIOD_MS = 1000;
+    private static final int FAST_POLL_TIMEOUT = 500;
+    private static final int OFFLINE_POLL_TRIES = 3;
 
-	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;
@@ -65,10 +69,7 @@ public class ComputerManagerService extends Service {
     };
 
     // Returns true if the details object was modified
-    private boolean runPoll(ComputerDetails details)
+    private boolean runPoll(ComputerDetails details, boolean newPc, int offlineCount) throws InterruptedException {
-    {
-        boolean newPc = details.name.isEmpty();
-
         if (!getLocalDatabaseReference()) {
             return false;
         }
@@ -76,12 +77,22 @@ public class ComputerManagerService extends Service {
         activePolls.incrementAndGet();
 
         // Poll the machine
-        if (!doPollMachine(details)) {
+        try {
+            if (!pollComputer(details)) {
+                if (!newPc && offlineCount < OFFLINE_POLL_TRIES) {
+                    // Return without calling the listener
+                    return false;
+                }
+
                 details.state = ComputerDetails.State.OFFLINE;
                 details.reachability = ComputerDetails.Reachability.OFFLINE;
             }
-
+        } catch (InterruptedException e) {
+            releaseLocalDatabaseReference();
+            throw e;
+        } finally {
             activePolls.decrementAndGet();
+        }
 
         // If it's online, update our persistent state
         if (details.state == ComputerDetails.State.ONLINE) {
@@ -91,7 +102,7 @@ public class ComputerManagerService extends Service {
                 if (dbManager.getComputerByName(details.name) == null) {
                     // It's gone
                     releaseLocalDatabaseReference();
-                    return true;
+                    return false;
                 }
             }
 
@@ -111,13 +122,21 @@ public class ComputerManagerService extends Service {
         Thread t = new Thread() {
             @Override
             public void run() {
+
+                int offlineCount = 0;
                 while (!isInterrupted() && pollingActive) {
+                    try {
                         // Check if this poll has modified the details
-                    runPoll(details);
+                        if (!runPoll(details, false, offlineCount)) {
+                            LimeLog.warning(details.name + " is offline (try " + offlineCount + ")");
+                            offlineCount++;
+                        }
+                        else {
+                            offlineCount = 0;
+                        }
 
                         // Wait until the next polling interval
-                    try {
+                        Thread.sleep(SERVERINFO_POLLING_PERIOD_MS / ((offlineCount > 0) ? 2 : 1));
-                        Thread.sleep(POLLING_PERIOD_MS);
                     } catch (InterruptedException e) {
                         break;
                     }
@@ -177,10 +196,6 @@ public class ComputerManagerService extends Service {
             return ComputerManagerService.this.addComputerBlocking(addr);
         }
 
-		public void addComputer(InetAddress addr) {
-			ComputerManagerService.this.addComputer(addr);
-		}
-		
         public void removeComputer(String name) {
             ComputerManagerService.this.removeComputer(name);
         }
@@ -239,7 +254,7 @@ public class ComputerManagerService extends Service {
             @Override
             public void notifyComputerAdded(MdnsComputer computer) {
                 // Kick off a serverinfo poll on this machine
-				addComputer(computer.getAddress());
+                addComputerBlocking(computer.getAddress());
             }
 
             @Override
@@ -255,28 +270,11 @@ public class ComputerManagerService extends Service {
         };
     }
 
-	public void addComputer(InetAddress addr) {
-		// Setup a placeholder
-		ComputerDetails fakeDetails = new ComputerDetails();
-		fakeDetails.localIp = addr;
-		fakeDetails.remoteIp = addr;
-        fakeDetails.name = "";
-
-        addTuple(fakeDetails);
-	}
-
     private void addTuple(ComputerDetails details) {
         synchronized (pollingTuples) {
             for (PollingTuple tuple : pollingTuples) {
                 // Check if this is the same computer
-                if (tuple.computer == details ||
+                if (tuple.computer.uuid.equals(details.uuid)) {
-                        // If there's no name on one of these computers, compare with the local IP
-                        ((details.name.isEmpty() || tuple.computer.name.isEmpty()) &&
-                                tuple.computer.localIp.equals(details.localIp)) ||
-                        // If there is a name on both computers, compare with name
-                        ((!details.name.isEmpty() && !tuple.computer.name.isEmpty()) &&
-                                tuple.computer.name.equals(details.name))) {
-
                     // Update details anyway in case this machine has been re-added by IP
                     // after not being reachable by our existing information
                     tuple.computer.localIp = details.localIp;
@@ -307,13 +305,18 @@ public class ComputerManagerService extends Service {
         ComputerDetails fakeDetails = new ComputerDetails();
         fakeDetails.localIp = addr;
         fakeDetails.remoteIp = addr;
-        fakeDetails.name = "";
 
         // Block while we try to fill the details
-        runPoll(fakeDetails);
+        try {
+            runPoll(fakeDetails, true, 0);
+        } catch (InterruptedException e) {
+            return false;
+        }
 
         // If the machine is reachable, it was successful
         if (fakeDetails.state == ComputerDetails.State.ONLINE) {
+            LimeLog.info("New PC ("+fakeDetails.name+") is UUID "+fakeDetails.uuid);
+
             // Start a polling thread for this machine
             addTuple(fakeDetails);
             return true;
@@ -384,14 +387,91 @@ public class ComputerManagerService extends Service {
         }
     }
 
-	private boolean pollComputer(ComputerDetails details, boolean localFirst) {
+    // Just try to establish a TCP connection to speculatively detect a running
+    // GFE server
+    private boolean fastPollIp(InetAddress addr) {
+        Socket s = new Socket();
+        try {
+            s.connect(new InetSocketAddress(addr, NvHTTP.PORT), FAST_POLL_TIMEOUT);
+            s.close();
+            return true;
+        } catch (IOException e) {
+            return false;
+        }
+    }
+
+    private void startFastPollThread(final InetAddress addr, final boolean[] info) {
+        Thread t = new Thread() {
+            @Override
+            public void run() {
+                boolean pollRes = fastPollIp(addr);
+
+                synchronized (info) {
+                    info[0] = true; // Done
+                    info[1] = pollRes; // Polling result
+
+                    info.notify();
+                }
+            }
+        };
+        t.setName("Fast Poll - "+addr.getHostAddress());
+        t.start();
+    }
+
+    private ComputerDetails.Reachability fastPollPc(final InetAddress local, final InetAddress remote) throws InterruptedException {
+        final boolean[] remoteInfo = new boolean[2];
+        final boolean[] localInfo = new boolean[2];
+
+        startFastPollThread(local, localInfo);
+        startFastPollThread(remote, remoteInfo);
+
+        // Check local first
+        synchronized (localInfo) {
+            while (!localInfo[0]) {
+                localInfo.wait(500);
+            }
+
+            if (localInfo[1]) {
+                return ComputerDetails.Reachability.LOCAL;
+            }
+        }
+
+        // Now remote
+        synchronized (remoteInfo) {
+            while (!remoteInfo[0]) {
+                remoteInfo.wait(500);
+            }
+
+            if (remoteInfo[1]) {
+                return ComputerDetails.Reachability.REMOTE;
+            }
+        }
+
+        return ComputerDetails.Reachability.OFFLINE;
+    }
+
+    private boolean pollComputer(ComputerDetails details) throws InterruptedException {
         ComputerDetails polledDetails;
+        ComputerDetails.Reachability reachability;
 
         // If the local address is routable across the Internet,
         // always consider this PC remote to be conservative
         if (details.localIp.equals(details.remoteIp)) {
-            localFirst = false;
+            reachability = ComputerDetails.Reachability.REMOTE;
         }
+        else {
+            // Do a TCP-level connection to the HTTP server to see if it's listening
+            LimeLog.info("Starting fast poll for "+details.name+" ("+details.localIp+", "+details.remoteIp+")");
+            reachability = fastPollPc(details.localIp, details.remoteIp);
+            LimeLog.info("Fast poll for "+details.name+" returned "+reachability.toString());
+        }
+
+        // If no connection could be established to either IP address, there's nothing we can do
+        if (reachability == ComputerDetails.Reachability.OFFLINE) {
+            return false;
+        }
+
+        boolean localFirst = (reachability == ComputerDetails.Reachability.LOCAL);
 
         if (localFirst) {
             polledDetails = tryPollIp(details, details.localIp);
@@ -425,24 +505,19 @@ public class ComputerManagerService extends Service {
             return false;
         }
 
+        // Save the old MAC address
+        String savedMacAddress = details.macAddress;
+
         // If we got here, it's reachable
         details.update(polledDetails);
-		return true;
+
+        // If the new MAC address is empty, restore the old one (workaround for GFE bug)
+        if (details.macAddress.equals("00:00:00:00:00:00") && savedMacAddress != null) {
+            LimeLog.info("MAC address was empty; using existing value: "+savedMacAddress);
+            details.macAddress = savedMacAddress;
         }
 
-	private boolean doPollMachine(ComputerDetails details) {
+        return true;
-        if (details.reachability == ComputerDetails.Reachability.UNKNOWN ||
-            details.reachability == ComputerDetails.Reachability.OFFLINE) {
-            // Always try local first to avoid potential UDP issues when
-            // attempting to stream via the router's external IP address
-            // behind its NAT
-            return pollComputer(details, true);
-        }
-        else {
-            // If we're already reached a machine via a particular IP address,
-            // always try that one first
-            return pollComputer(details, details.reachability == ComputerDetails.Reachability.LOCAL);
-        }
     }
 
     @Override
@@ -491,8 +566,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;
@@ -507,7 +582,7 @@ public class ComputerManagerService extends Service {
         private boolean waitPollingDelay() {
             try {
                 synchronized (pollEvent) {
-                    pollEvent.wait(POLLING_PERIOD_MS);
+                    pollEvent.wait(APPLIST_POLLING_PERIOD_MS);
                 }
             } catch (InterruptedException e) {
                 return false;
@@ -552,9 +627,19 @@ public class ComputerManagerService extends Service {
                             List<NvApp> list = NvHTTP.getAppListByReader(new StringReader(appList));
                             if (appList != null && !appList.isEmpty() && !list.isEmpty()) {
                                 // Open the cache file
-                                FileOutputStream cacheOut = CacheHelper.openCacheFileForOutput(getCacheDir(), "applist", computer.uuid.toString());
+                                OutputStream cacheOut = null;
+                                try {
+                                    cacheOut = CacheHelper.openCacheFileForOutput(getCacheDir(), "applist", computer.uuid.toString());
                                     CacheHelper.writeStringToOutputStream(cacheOut, appList);
+                                } catch (IOException e) {
+                                    e.printStackTrace();
+                                } finally {
+                                    try {
+                                        if (cacheOut != null) {
                                             cacheOut.close();
+                                        }
+                                    } catch (IOException e) {}
+                                }
 
                                 // Update the computer
                                 computer.rawAppList = appList;
@@ -593,7 +678,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

@@ -1,118 +1,69 @@
 package com.limelight.grid;
 
-import android.content.Context;
+import android.app.Activity;
-import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.os.AsyncTask;
-import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.koushikdutta.async.future.FutureCallback;
-import com.koushikdutta.ion.ImageViewBitmapInfo;
-import com.koushikdutta.ion.Ion;
 import com.limelight.AppView;
 import com.limelight.LimeLog;
 import com.limelight.R;
-import com.limelight.binding.PlatformBinding;
+import com.limelight.grid.assets.CachedAppAssetLoader;
+import com.limelight.grid.assets.DiskAssetLoader;
+import com.limelight.grid.assets.MemoryAssetLoader;
+import com.limelight.grid.assets.NetworkAssetLoader;
 import com.limelight.nvstream.http.ComputerDetails;
-import com.limelight.nvstream.http.LimelightCryptoProvider;
-import com.limelight.utils.CacheHelper;
 
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.InetAddress;
-import java.net.Socket;
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
-import java.security.Principal;
-import java.security.PrivateKey;
-import java.security.SecureRandom;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.Future;
-
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.KeyManager;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSession;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509KeyManager;
-import javax.net.ssl.X509TrustManager;
-import java.security.cert.X509Certificate;
 
+@SuppressWarnings("unchecked")
 public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
+    private static final int ART_WIDTH_PX = 300;
+    private static final int SMALL_WIDTH_DP = 100;
+    private static final int LARGE_WIDTH_DP = 150;
 
-    private ComputerDetails computer;
+    private final CachedAppAssetLoader loader;
-    private String uniqueId;
-    private LimelightCryptoProvider cryptoProvider;
-    private 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 {
+    public AppGridAdapter(Activity activity, boolean listMode, boolean small, ComputerDetails computer, String uniqueId) throws KeyManagementException, NoSuchAlgorithmException {
-        super(context, listMode ? R.layout.simple_row : (small ? R.layout.app_grid_item_small : R.layout.app_grid_item), R.drawable.image_loading);
+        super(activity, listMode ? R.layout.simple_row : (small ? R.layout.app_grid_item_small : R.layout.app_grid_item), R.drawable.image_loading);
 
-        this.computer = computer;
+        int dpi = activity.getResources().getDisplayMetrics().densityDpi;
-        this.uniqueId = uniqueId;
+        int dp;
 
-        cryptoProvider = PlatformBinding.getCryptoProvider(context);
+        if (small) {
-
+            dp = SMALL_WIDTH_DP;
-        sslContext = SSLContext.getInstance("SSL");
+        }
-        sslContext.init(ourKeyman, trustAllCerts, new SecureRandom());
+        else {
+            dp = LARGE_WIDTH_DP;
         }
 
-    TrustManager[] trustAllCerts = new TrustManager[] {
+        double scalingDivisor = ART_WIDTH_PX / (dp * (dpi / 160));
-            new X509TrustManager() {
+        if (scalingDivisor < 1.0) {
-                public X509Certificate[] getAcceptedIssuers() {
+            // We don't want to make them bigger before draw-time
-                    return new X509Certificate[0];
+            scalingDivisor = 1.0;
         }
-                public void checkClientTrusted(X509Certificate[] certs, String authType) {}
+        LimeLog.info("Art scaling divisor: " + scalingDivisor);
-                public void checkServerTrusted(X509Certificate[] certs, String authType) {}
-            }};
 
-    KeyManager[] ourKeyman = new KeyManager[] {
+        BitmapFactory.Options options = new BitmapFactory.Options();
-            new X509KeyManager() {
+        options.inSampleSize = (int) scalingDivisor;
-                public String chooseClientAlias(String[] keyTypes,
+
-                                                Principal[] issuers, Socket socket) {
+        this.loader = new CachedAppAssetLoader(computer, scalingDivisor,
-                    return "Limelight-RSA";
+                new NetworkAssetLoader(context, uniqueId),
+                new MemoryAssetLoader(),
+                new DiskAssetLoader(context.getCacheDir()),
+                BitmapFactory.decodeResource(activity.getResources(),
+                        R.drawable.image_loading, options));
     }
 
-                public String chooseServerAlias(String keyType, Principal[] issuers,
+    public void cancelQueuedOperations() {
-                                                Socket socket) {
+        loader.cancelForegroundLoads();
-                    return null;
+        loader.cancelBackgroundLoads();
+        loader.freeCacheMemory();
     }
 
-                public X509Certificate[] getCertificateChain(String alias) {
-                    return new X509Certificate[] {cryptoProvider.getClientCertificate()};
-                }
-
-                public String[] getClientAliases(String keyType, Principal[] issuers) {
-                    return null;
-                }
-
-                public PrivateKey getPrivateKey(String alias) {
-                    return cryptoProvider.getClientPrivateKey();
-                }
-
-                public String[] getServerAliases(String keyType, Principal[] issuers) {
-                    return null;
-                }
-            }
-    };
-
-    // Ignore differences between given hostname and certificate hostname
-    HostnameVerifier hv = new HostnameVerifier() {
-        public boolean verify(String hostname, SSLSession session) { return true; }
-    };
-
     private void sortList() {
         Collections.sort(itemList, new Comparator<AppView.AppObject>() {
             @Override
@@ -122,62 +73,22 @@ public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
         });
     }
 
-    private InetAddress getCurrentAddress() {
-        if (computer.reachability == ComputerDetails.Reachability.LOCAL) {
-            return computer.localIp;
-        }
-        else {
-            return computer.remoteIp;
-        }
-    }
-
     public void addApp(AppView.AppObject app) {
+        // Queue a request to fetch this bitmap into cache
+        loader.queueCacheLoad(app.app);
+
+        // Add the app to our sorted list
         itemList.add(app);
         sortList();
     }
 
-    public void abortPendingRequests() {
+    public void removeApp(AppView.AppObject app) {
-        HashMap<ImageView, Future> tempMap;
+        itemList.remove(app);
-
-        synchronized (pendingRequests) {
-            // Copy the pending requests under a lock
-            tempMap = new HashMap<ImageView, Future>(pendingRequests);
     }
 
-        for (Future f : tempMap.values()) {
+    public boolean populateImageView(ImageView imgView, AppView.AppObject obj) {
-            if (!f.isCancelled() && !f.isDone()) {
+        // Let the cached asset loader handle it
-                f.cancel(true);
+        loader.populateImageView(obj.app, imgView);
-            }
-        }
-
-        synchronized (pendingRequests) {
-            // Remove cancelled requests
-            for (ImageView v : tempMap.keySet()) {
-                pendingRequests.remove(v);
-            }
-        }
-    }
-
-    // TODO: Handle pruning of bitmap cache
-    private void populateBitmapCache(UUID uuid, int appId, Bitmap bitmap) {
-        try {
-            // PNG ignores quality setting
-            FileOutputStream out = CacheHelper.openCacheFileForOutput(context.getCacheDir(), "boxart", uuid.toString(), appId+".png");
-            bitmap.compress(Bitmap.CompressFormat.PNG, 0, out);
-            out.close();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Override
-    public boolean populateImageView(final ImageView imgView, final AppView.AppObject obj) {
-        // Hide the image view while we're loading the image from disk cache
-        imgView.setVisibility(View.INVISIBLE);
-
-        // Check the on-disk cache
-        new ImageCacheRequest(imgView, obj.app.getAppId()).execute();
-
         return true;
     }
 
@@ -201,84 +112,4 @@ public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
         // No overlay
         return false;
     }
-
-    private class ImageCacheRequest extends AsyncTask<Void, Void, Bitmap> {
-        private ImageView view;
-        private int appId;
-
-        public ImageCacheRequest(ImageView view, int appId) {
-            this.view = view;
-            this.appId = appId;
-        }
-
-        @Override
-        protected Bitmap doInBackground(Void... v) {
-            InputStream in = null;
-            try {
-                in = CacheHelper.openCacheFileForInput(context.getCacheDir(), "boxart", computer.uuid.toString(), appId + ".png");
-                return BitmapFactory.decodeStream(in);
-            } catch (IOException e) {
-                e.printStackTrace();
-            } finally {
-                if (in != null) {
-                    try {
-                        in.close();
-                    } catch (IOException e) {}
-                }
-            }
-            return null;
-        }
-
-        @Override
-        protected void onPostExecute(Bitmap result) {
-            if (result != null) {
-                // Disk cache was read successfully
-                LimeLog.info("Image disk cache hit for ("+computer.uuid+", "+appId+")");
-                view.setImageBitmap(result);
-                view.setVisibility(View.VISIBLE);
-            }
-            else {
-                LimeLog.info("Image disk cache miss for ("+computer.uuid+", "+appId+")");
-                LimeLog.info("Requesting: "+"https://" + getCurrentAddress().getHostAddress() + ":47984/appasset?uniqueid=" + uniqueId + "&appid=" +
-                        appId + "&AssetType=2&AssetIdx=0");
-
-                // Load the placeholder image
-                view.setImageResource(defaultImageRes);
-                view.setVisibility(View.VISIBLE);
-
-                // Set SSL contexts correctly to allow us to authenticate
-                Ion.getDefault(context).getHttpClient().getSSLSocketMiddleware().setTrustManagers(trustAllCerts);
-                Ion.getDefault(context).getHttpClient().getSSLSocketMiddleware().setSSLContext(sslContext);
-
-                // Kick off the deferred image load
-                synchronized (pendingRequests) {
-                    Future<Bitmap> f = Ion.with(context)
-                            .load("https://" + getCurrentAddress().getHostAddress() + ":47984/appasset?uniqueid=" + uniqueId + "&appid=" +
-                                    appId + "&AssetType=2&AssetIdx=0")
-                            .asBitmap()
-                            .setCallback(new FutureCallback<Bitmap>() {
-                                @Override
-                                public void onCompleted(Exception e, Bitmap result) {
-                                    synchronized (pendingRequests) {
-                                        pendingRequests.remove(view);
-                                    }
-
-                                    if (result != null) {
-                                        // Make the view visible now
-                                        view.setImageBitmap(result);
-                                        view.setVisibility(View.VISIBLE);
-
-                                        // Populate the disk cache if we got an image back
-                                        populateBitmapCache(computer.uuid, appId, result);
-                                    }
-                                    else {
-                                        // Leave the loading icon as is (probably should change this eventually...)
-                                    }
-                                }
-                            });
-                    pendingRequests.put(view, f);
-            }
-            }
-        }
-    };
 }

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/grid/assets/CachedAppAssetLoader.java

@@ -0,0 +1,327 @@
+package com.limelight.grid.assets;
+
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.os.AsyncTask;
+import android.widget.ImageView;
+
+import com.limelight.nvstream.http.ComputerDetails;
+import com.limelight.nvstream.http.NvApp;
+
+import java.io.InputStream;
+import java.lang.ref.WeakReference;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+public class CachedAppAssetLoader {
+    private static final int MAX_CONCURRENT_DISK_LOADS = 3;
+    private static final int MAX_CONCURRENT_NETWORK_LOADS = 3;
+    private static final int MAX_CONCURRENT_CACHE_LOADS = 1;
+
+    private static final int MAX_PENDING_CACHE_LOADS = 100;
+    private static final int MAX_PENDING_NETWORK_LOADS = 40;
+    private static final int MAX_PENDING_DISK_LOADS = 40;
+
+    private final ThreadPoolExecutor cacheExecutor = new ThreadPoolExecutor(
+            MAX_CONCURRENT_CACHE_LOADS, MAX_CONCURRENT_CACHE_LOADS,
+            Long.MAX_VALUE, TimeUnit.DAYS,
+            new LinkedBlockingQueue<Runnable>(MAX_PENDING_CACHE_LOADS),
+            new ThreadPoolExecutor.DiscardOldestPolicy());
+
+    private final ThreadPoolExecutor foregroundExecutor = new ThreadPoolExecutor(
+            MAX_CONCURRENT_DISK_LOADS, MAX_CONCURRENT_DISK_LOADS,
+            Long.MAX_VALUE, TimeUnit.DAYS,
+            new LinkedBlockingQueue<Runnable>(MAX_PENDING_DISK_LOADS),
+            new ThreadPoolExecutor.DiscardOldestPolicy());
+
+    private final ThreadPoolExecutor networkExecutor = new ThreadPoolExecutor(
+            MAX_CONCURRENT_NETWORK_LOADS, MAX_CONCURRENT_NETWORK_LOADS,
+            Long.MAX_VALUE, TimeUnit.DAYS,
+            new LinkedBlockingQueue<Runnable>(MAX_PENDING_NETWORK_LOADS),
+            new ThreadPoolExecutor.DiscardOldestPolicy());
+
+    private final ComputerDetails computer;
+    private final double scalingDivider;
+    private final NetworkAssetLoader networkLoader;
+    private final MemoryAssetLoader memoryLoader;
+    private final DiskAssetLoader diskLoader;
+    private final Bitmap placeholderBitmap;
+
+    public CachedAppAssetLoader(ComputerDetails computer, double scalingDivider,
+                                NetworkAssetLoader networkLoader, MemoryAssetLoader memoryLoader,
+                                DiskAssetLoader diskLoader, Bitmap placeholderBitmap) {
+        this.computer = computer;
+        this.scalingDivider = scalingDivider;
+        this.networkLoader = networkLoader;
+        this.memoryLoader = memoryLoader;
+        this.diskLoader = diskLoader;
+        this.placeholderBitmap = placeholderBitmap;
+    }
+
+    public void cancelBackgroundLoads() {
+        Runnable r;
+        while ((r = cacheExecutor.getQueue().poll()) != null) {
+            cacheExecutor.remove(r);
+        }
+    }
+
+    public void cancelForegroundLoads() {
+        Runnable r;
+
+        while ((r = foregroundExecutor.getQueue().poll()) != null) {
+            foregroundExecutor.remove(r);
+        }
+
+        while ((r = networkExecutor.getQueue().poll()) != null) {
+            networkExecutor.remove(r);
+        }
+    }
+
+    public void freeCacheMemory() {
+        memoryLoader.clearCache();
+    }
+
+    private Bitmap doNetworkAssetLoad(LoaderTuple tuple, LoaderTask task) {
+        // Try 3 times
+        for (int i = 0; i < 3; i++) {
+            // Check again whether we've been cancelled or the image view is gone
+            if (task != null && (task.isCancelled() || task.imageViewRef.get() == null)) {
+                return null;
+            }
+
+            InputStream in = networkLoader.getBitmapStream(tuple);
+            if (in != null) {
+                // Write the stream straight to disk
+                diskLoader.populateCacheWithStream(tuple, in);
+
+                // If there's a task associated with this load, we should return the bitmap
+                if (task != null) {
+                    return diskLoader.loadBitmapFromCache(tuple, (int) scalingDivider);
+                }
+                else {
+                    // Otherwise it's a background load and we return nothing
+                    return null;
+                }
+            }
+
+            // Wait 1 second with a bit of fuzz
+            try {
+                Thread.sleep((int) (1000 + (Math.random() * 500)));
+            } catch (InterruptedException e) {
+                return null;
+            }
+        }
+
+        return null;
+    }
+
+    private class LoaderTask extends AsyncTask<LoaderTuple, Void, Bitmap> {
+        private final WeakReference<ImageView> imageViewRef;
+        private final boolean diskOnly;
+
+        private LoaderTuple tuple;
+
+        public LoaderTask(ImageView imageView, boolean diskOnly) {
+            this.imageViewRef = new WeakReference<ImageView>(imageView);
+            this.diskOnly = diskOnly;
+        }
+
+        @Override
+        protected Bitmap doInBackground(LoaderTuple... params) {
+            tuple = params[0];
+
+            // Check whether it has been cancelled or the image view is gone
+            if (isCancelled() || imageViewRef.get() == null) {
+                return null;
+            }
+
+            Bitmap bmp = diskLoader.loadBitmapFromCache(tuple, (int) scalingDivider);
+            if (bmp == null) {
+                if (!diskOnly) {
+                    // Try to load the asset from the network
+                    bmp = doNetworkAssetLoad(tuple, this);
+                } else {
+                    // Report progress to display the placeholder and spin
+                    // off the network-capable task
+                    publishProgress();
+                }
+            }
+
+            // Cache the bitmap
+            if (bmp != null) {
+                memoryLoader.populateCache(tuple, bmp);
+            }
+
+            return bmp;
+        }
+
+        @Override
+        protected void onProgressUpdate(Void... nothing) {
+            // Do nothing if cancelled
+            if (isCancelled()) {
+                return;
+            }
+
+            // If the current loader task for this view isn't us, do nothing
+            final ImageView imageView = imageViewRef.get();
+            if (getLoaderTask(imageView) == this) {
+                // Set off another loader task on the network executor
+                LoaderTask task = new LoaderTask(imageView, false);
+                AsyncDrawable asyncDrawable = new AsyncDrawable(imageView.getResources(), placeholderBitmap, task);
+                imageView.setAlpha(1.0f);
+                imageView.setImageDrawable(asyncDrawable);
+                task.executeOnExecutor(networkExecutor, tuple);
+            }
+        }
+
+        @Override
+        protected void onPostExecute(Bitmap bitmap) {
+            // Do nothing if cancelled
+            if (isCancelled()) {
+                return;
+            }
+
+            final ImageView imageView = imageViewRef.get();
+            if (getLoaderTask(imageView) == this) {
+                // Set the bitmap
+                if (bitmap != null) {
+                    imageView.setImageBitmap(bitmap);
+                }
+
+                // Show the view
+                imageView.setAlpha(1.0f);
+            }
+        }
+    }
+
+    static class AsyncDrawable extends BitmapDrawable {
+        private final WeakReference<LoaderTask> loaderTaskReference;
+
+        public AsyncDrawable(Resources res, Bitmap bitmap,
+                             LoaderTask loaderTask) {
+            super(res, bitmap);
+            loaderTaskReference = new WeakReference<LoaderTask>(loaderTask);
+        }
+
+        public LoaderTask getLoaderTask() {
+            return loaderTaskReference.get();
+        }
+    }
+
+    private static LoaderTask getLoaderTask(ImageView imageView) {
+        if (imageView == null) {
+            return null;
+        }
+
+        final Drawable drawable = imageView.getDrawable();
+
+        // If our drawable is in play, get the loader task
+        if (drawable instanceof AsyncDrawable) {
+            final AsyncDrawable asyncDrawable = (AsyncDrawable) drawable;
+            return asyncDrawable.getLoaderTask();
+        }
+
+        return null;
+    }
+
+    private static boolean cancelPendingLoad(LoaderTuple tuple, ImageView imageView) {
+        final LoaderTask loaderTask = getLoaderTask(imageView);
+
+        // Check if any task was pending for this image view
+        if (loaderTask != null && !loaderTask.isCancelled()) {
+            final LoaderTuple taskTuple = loaderTask.tuple;
+
+            // Cancel the task if it's not already loading the same data
+            if (taskTuple == null || !taskTuple.equals(tuple)) {
+                loaderTask.cancel(true);
+            } else {
+                // It's already loading what we want
+                return false;
+            }
+        }
+
+        // Allow the load to proceed
+        return true;
+    }
+
+    public void queueCacheLoad(NvApp app) {
+        final LoaderTuple tuple = new LoaderTuple(computer, app);
+
+        if (memoryLoader.loadBitmapFromCache(tuple) != null) {
+            // It's in memory which means it must also be on disk
+            return;
+        }
+
+        // Queue a fetch in the cache executor
+        cacheExecutor.execute(new Runnable() {
+            @Override
+            public void run() {
+                // Check if the image is cached on disk
+                if (diskLoader.checkCacheExists(tuple)) {
+                    return;
+                }
+
+                // Try to load the asset from the network and cache result on disk
+                doNetworkAssetLoad(tuple, null);
+            }
+        });
+    }
+
+    public void populateImageView(NvApp app, ImageView view) {
+        LoaderTuple tuple = new LoaderTuple(computer, app);
+
+        // If there's already a task in progress for this view,
+        // cancel it. If the task is already loading the same image,
+        // we return and let that load finish.
+        if (!cancelPendingLoad(tuple, view)) {
+            return;
+        }
+
+        // First, try the memory cache in the current context
+        Bitmap bmp = memoryLoader.loadBitmapFromCache(tuple);
+        if (bmp != null) {
+            // Show the bitmap immediately
+            view.setAlpha(1.0f);
+            view.setImageBitmap(bmp);
+            return;
+        }
+
+        // If it's not in memory, create an async task to load it. This task will be attached
+        // via AsyncDrawable to this view.
+        final LoaderTask task = new LoaderTask(view, true);
+        final AsyncDrawable asyncDrawable = new AsyncDrawable(view.getResources(), placeholderBitmap, task);
+        view.setAlpha(0.0f);
+        view.setImageDrawable(asyncDrawable);
+
+        // Run the task on our foreground executor
+        task.executeOnExecutor(foregroundExecutor, tuple);
+    }
+
+    public class LoaderTuple {
+        public final ComputerDetails computer;
+        public final NvApp app;
+
+        public LoaderTuple(ComputerDetails computer, NvApp app) {
+            this.computer = computer;
+            this.app = app;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (!(o instanceof LoaderTuple)) {
+                return false;
+            }
+
+            LoaderTuple other = (LoaderTuple) o;
+            return computer.uuid.equals(other.computer.uuid) && app.getAppId() == other.app.getAppId();
+        }
+
+        @Override
+        public String toString() {
+            return "("+computer.uuid+", "+app.getAppId()+")";
+        }
+    }
+}

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

@@ -0,0 +1,67 @@
+package com.limelight.grid.assets;
+
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+
+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;
+
+public class DiskAssetLoader {
+    private final File cacheDir;
+
+    public DiskAssetLoader(File cacheDir) {
+        this.cacheDir = cacheDir;
+    }
+
+    public boolean checkCacheExists(CachedAppAssetLoader.LoaderTuple tuple) {
+        return CacheHelper.cacheFileExists(cacheDir, "boxart", tuple.computer.uuid.toString(), tuple.app.getAppId() + ".png");
+    }
+
+    public Bitmap loadBitmapFromCache(CachedAppAssetLoader.LoaderTuple tuple, int sampleSize) {
+        InputStream in = null;
+        Bitmap bmp = null;
+        try {
+            in = CacheHelper.openCacheFileForInput(cacheDir, "boxart", tuple.computer.uuid.toString(), tuple.app.getAppId() + ".png");
+            BitmapFactory.Options options = new BitmapFactory.Options();
+            options.inSampleSize = sampleSize;
+            bmp = BitmapFactory.decodeStream(in, null, options);
+        } catch (FileNotFoundException ignored) {
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            if (in != null) {
+                try {
+                    in.close();
+                } catch (IOException ignored) {}
+            }
+        }
+
+        if (bmp != null) {
+            LimeLog.info("Disk cache hit for tuple: "+tuple);
+        }
+
+        return bmp;
+    }
+
+    public void populateCacheWithStream(CachedAppAssetLoader.LoaderTuple tuple, InputStream input) {
+        OutputStream out = null;
+        try {
+            out = CacheHelper.openCacheFileForOutput(cacheDir, "boxart", tuple.computer.uuid.toString(), tuple.app.getAppId() + ".png");
+            CacheHelper.writeInputStreamToOutputStream(input, out);
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            if (out != null) {
+                try {
+                    out.close();
+                } catch (IOException ignored) {}
+            }
+        }
+    }
+}

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

@@ -0,0 +1,37 @@
+package com.limelight.grid.assets;
+
+import android.graphics.Bitmap;
+import android.util.LruCache;
+
+import com.limelight.LimeLog;
+
+public class MemoryAssetLoader {
+    private static final int maxMemory = (int) (Runtime.getRuntime().maxMemory() / 1024);
+    private static final LruCache<String, Bitmap> memoryCache = new LruCache<String, Bitmap>(maxMemory / 16) {
+        @Override
+        protected int sizeOf(String key, Bitmap bitmap) {
+            // Sizeof returns kilobytes
+            return bitmap.getByteCount() / 1024;
+        }
+    };
+
+    private static String constructKey(CachedAppAssetLoader.LoaderTuple tuple) {
+        return tuple.computer.uuid.toString()+"-"+tuple.app.getAppId();
+    }
+
+    public Bitmap loadBitmapFromCache(CachedAppAssetLoader.LoaderTuple tuple) {
+        Bitmap bmp = memoryCache.get(constructKey(tuple));
+        if (bmp != null) {
+            LimeLog.info("Memory cache hit for tuple: "+tuple);
+        }
+        return bmp;
+    }
+
+    public void populateCache(CachedAppAssetLoader.LoaderTuple tuple, Bitmap bitmap) {
+        memoryCache.put(constructKey(tuple), bitmap);
+    }
+
+    public void clearCache() {
+        memoryCache.evictAll();
+    }
+}

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

@@ -0,0 +1,49 @@
+package com.limelight.grid.assets;
+
+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 java.io.IOException;
+import java.io.InputStream;
+import java.net.InetAddress;
+
+public class NetworkAssetLoader {
+    private final Context context;
+    private final String uniqueId;
+
+    public NetworkAssetLoader(Context context, String uniqueId) {
+        this.context = context;
+        this.uniqueId = uniqueId;
+    }
+
+    public InputStream getBitmapStream(CachedAppAssetLoader.LoaderTuple tuple) {
+        NvHTTP http = new NvHTTP(getCurrentAddress(tuple.computer), uniqueId, null, PlatformBinding.getCryptoProvider(context));
+
+        InputStream in = null;
+        try {
+            in = http.getBoxArt(tuple.app);
+        } catch (IOException e) {}
+
+        if (in != null) {
+            LimeLog.info("Network asset load complete: " + tuple);
+        }
+        else {
+            LimeLog.info("Network asset load failed: " + tuple);
+        }
+
+        return in;
+    }
+
+    private static InetAddress getCurrentAddress(ComputerDetails computer) {
+        if (computer.reachability == ComputerDetails.Reachability.LOCAL) {
+            return computer.localIp;
+        }
+        else {
+            return computer.remoteIp;
+        }
+    }
+}

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

@@ -14,6 +14,7 @@ import com.limelight.utils.UiHelper;
 import android.app.Activity;
 import android.app.Service;
 import android.content.ComponentName;
+import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.content.res.Configuration;
@@ -21,15 +22,16 @@ import android.os.Bundle;
 import android.os.IBinder;
 import android.view.KeyEvent;
 import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.TextView;
 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();
@@ -161,6 +163,12 @@ public class AddComputerManually extends Activity {
 
                     computersToAdd.add(hostText.getText().toString().trim());
                 }
+                else if (actionId == EditorInfo.IME_ACTION_PREVIOUS) {
+                    // This is how the Fire TV dismisses the keyboard
+                    InputMethodManager imm = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE);
+                    imm.hideSoftInputFromWindow(hostText.getWindowToken(), 0);
+                    return false;
+                }
 
                 return false;
             }

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

@@ -2,6 +2,7 @@ package com.limelight.preferences;
 
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
 import android.preference.PreferenceManager;
 
 public class PreferenceConfiguration {
@@ -16,6 +17,7 @@ public class PreferenceConfiguration {
     private static final String LANGUAGE_PREF_STRING = "list_languages";
     private static final String LIST_MODE_PREF_STRING = "checkbox_list_mode";
     private static final String SMALL_ICONS_PREF_STRING = "checkbox_small_icon_mode";
+    private static final String MULTI_CONTROLLER_PREF_STRING = "checkbox_multi_controller";
 
     private static final int BITRATE_DEFAULT_720_30 = 5;
     private static final int BITRATE_DEFAULT_720_60 = 10;
@@ -32,6 +34,7 @@ public class PreferenceConfiguration {
     private static final int DEFAULT_DEADZONE = 15;
     public static final String DEFAULT_LANGUAGE = "default";
     private static final boolean DEFAULT_LIST_MODE = false;
+    private static final boolean DEFAULT_MULTI_CONTROLLER = true;
 
     public static final int FORCE_HARDWARE_DECODER = -1;
     public static final int AUTOSELECT_DECODER = 0;
@@ -43,7 +46,7 @@ public class PreferenceConfiguration {
     public int deadzonePercentage;
     public boolean stretchVideo, enableSops, playHostAudio, disableWarnings;
     public String language;
-    public boolean listMode, smallIconMode;
+    public boolean listMode, smallIconMode, multiController;
 
     public static int getDefaultBitrate(String resFpsString) {
         if (resFpsString.equals("720p30")) {
@@ -65,6 +68,12 @@ public class PreferenceConfiguration {
     }
 
     public static boolean getDefaultSmallMode(Context context) {
+        PackageManager manager = context.getPackageManager();
+        if (manager != null && manager.hasSystemFeature(PackageManager.FEATURE_TELEVISION)) {
+            // TVs shouldn't use small mode by default
+            return false;
+        }
+
         // Use small mode on anything smaller than a 7" tablet
         return context.getResources().getConfiguration().smallestScreenWidthDp < 600;
     }
@@ -156,6 +165,7 @@ public class PreferenceConfiguration {
         config.playHostAudio = prefs.getBoolean(HOST_AUDIO_PREF_STRING, DEFAULT_HOST_AUDIO);
         config.listMode = prefs.getBoolean(LIST_MODE_PREF_STRING, DEFAULT_LIST_MODE);
         config.smallIconMode = prefs.getBoolean(SMALL_ICONS_PREF_STRING, getDefaultSmallMode(context));
+        config.multiController = prefs.getBoolean(MULTI_CONTROLLER_PREF_STRING, DEFAULT_MULTI_CONTROLLER);
 
         return config;
     }

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/CacheHelper.java

@@ -1,5 +1,7 @@
 package com.limelight.utils;
 
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -9,8 +11,6 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.Reader;
-import java.io.UnsupportedEncodingException;
-import java.util.Scanner;
 
 public class CacheHelper {
     private static File openPath(boolean createPath, File root, String... path) {
@@ -30,12 +30,25 @@ public class CacheHelper {
         return f;
     }
 
-    public static FileInputStream openCacheFileForInput(File root, String... path) throws FileNotFoundException {
+    public static boolean cacheFileExists(File root, String... path) {
-        return new FileInputStream(openPath(false, root, path));
+        return openPath(false, root, path).exists();
     }
 
-    public static FileOutputStream openCacheFileForOutput(File root, String... path) throws FileNotFoundException {
+    public static InputStream openCacheFileForInput(File root, String... path) throws FileNotFoundException {
-        return new FileOutputStream(openPath(true, root, path));
+        return new BufferedInputStream(new FileInputStream(openPath(false, root, path)));
+    }
+
+    public static OutputStream openCacheFileForOutput(File root, String... path) throws FileNotFoundException {
+        return new BufferedOutputStream(new FileOutputStream(openPath(true, root, path)));
+    }
+
+    public static void writeInputStreamToOutputStream(InputStream in, OutputStream out) throws IOException {
+        byte[] buf = new byte[4096];
+        int bytesRead;
+
+        while ((bytesRead = in.read(buf)) != -1) {
+            out.write(buf, 0, bytesRead);
+        }
     }
 
     public static String readInputStreamToString(InputStream in) throws IOException {

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/ServerHelper.java

@@ -0,0 +1,90 @@
+package com.limelight.utils;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.widget.Toast;
+
+import com.limelight.Game;
+import com.limelight.R;
+import com.limelight.binding.PlatformBinding;
+import com.limelight.computers.ComputerManagerService;
+import com.limelight.nvstream.http.ComputerDetails;
+import com.limelight.nvstream.http.GfeHttpResponseException;
+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 {
+    public static InetAddress getCurrentAddressFromComputer(ComputerDetails computer) {
+        return computer.reachability == ComputerDetails.Reachability.LOCAL ?
+                computer.localIp : computer.remoteIp;
+    }
+
+    public static void doStart(Activity parent, NvApp app, ComputerDetails computer,
+                               ComputerManagerService.ComputerManagerBinder managerBinder) {
+        Intent intent = new Intent(parent, Game.class);
+        intent.putExtra(Game.EXTRA_HOST,
+                computer.reachability == ComputerDetails.Reachability.LOCAL ?
+                        computer.localIp.getHostAddress() : computer.remoteIp.getHostAddress());
+        intent.putExtra(Game.EXTRA_APP_NAME, app.getAppName());
+        intent.putExtra(Game.EXTRA_APP_ID, app.getAppId());
+        intent.putExtra(Game.EXTRA_UNIQUEID, managerBinder.getUniqueId());
+        intent.putExtra(Game.EXTRA_STREAMING_REMOTE,
+                computer.reachability != ComputerDetails.Reachability.LOCAL);
+        parent.startActivity(intent);
+    }
+
+    public static void doQuit(final Activity parent,
+                              final InetAddress address,
+                              final NvApp app,
+                              final ComputerManagerService.ComputerManagerBinder managerBinder,
+                              final Runnable onComplete) {
+        Toast.makeText(parent, parent.getResources().getString(R.string.applist_quit_app) + " " + app.getAppName() + "...", Toast.LENGTH_SHORT).show();
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                NvHTTP httpConn;
+                String message;
+                try {
+                    httpConn = new NvHTTP(address,
+                            managerBinder.getUniqueId(), null, PlatformBinding.getCryptoProvider(parent));
+                    if (httpConn.quitApp()) {
+                        message = parent.getResources().getString(R.string.applist_quit_success) + " " + app.getAppName();
+                    } else {
+                        message = parent.getResources().getString(R.string.applist_quit_fail) + " " + app.getAppName();
+                    }
+                } catch (GfeHttpResponseException e) {
+                    if (e.getErrorCode() == 599) {
+                        message = "This session wasn't started by this device," +
+                                " so it cannot be quit. End streaming on the original " +
+                                "device or the PC itself. (Error code: "+e.getErrorCode()+")";
+                    }
+                    else {
+                        message = e.getMessage();
+                    }
+                } catch (UnknownHostException e) {
+                    message = parent.getResources().getString(R.string.error_unknown_host);
+                } catch (FileNotFoundException e) {
+                    message = parent.getResources().getString(R.string.error_404);
+                } catch (Exception e) {
+                    message = e.getMessage();
+                } finally {
+                    if (onComplete != null) {
+                        onComplete.run();
+                    }
+                }
+
+                final String toastMessage = message;
+                parent.runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        Toast.makeText(parent, toastMessage, Toast.LENGTH_LONG).show();
+                    }
+                });
+            }
+        }).start();
+    }
+}

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;

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

@@ -1,11 +1,15 @@
 package com.limelight.utils;
 
 import android.app.Activity;
+import android.app.AlertDialog;
 import android.app.UiModeManager;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.res.Configuration;
 import android.view.View;
 
+import com.limelight.R;
+
 public class UiHelper {
 
     // Values from https://developer.android.com/training/tv/start/layouts.html
@@ -28,4 +32,31 @@ public class UiHelper {
                     horizontalPaddingPixels, verticalPaddingPixels);
         }
     }
+
+    public static void displayQuitConfirmationDialog(Activity parent, final Runnable onYes, final Runnable onNo) {
+        DialogInterface.OnClickListener dialogClickListener = new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                switch (which){
+                    case DialogInterface.BUTTON_POSITIVE:
+                        if (onYes != null) {
+                            onYes.run();
+                        }
+                        break;
+
+                    case DialogInterface.BUTTON_NEGATIVE:
+                        if (onNo != null) {
+                            onNo.run();
+                        }
+                        break;
+                }
+            }
+        };
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(parent);
+        builder.setMessage(parent.getResources().getString(R.string.applist_quit_confirmation))
+                .setPositiveButton(parent.getResources().getString(R.string.yes), dialogClickListener)
+                .setNegativeButton(parent.getResources().getString(R.string.no), dialogClickListener)
+                .show();
+    }
 }

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>

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

@@ -9,5 +9,7 @@
         android:numColumns="auto_fit"
         android:columnWidth="160dp"
         android:stretchMode="spacingWidth"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
         android:gravity="center"/>
 </LinearLayout>

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

@@ -9,5 +9,7 @@
         android:numColumns="auto_fit"
         android:columnWidth="105dp"
         android:stretchMode="spacingWidth"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
         android:gravity="center"/>
 </LinearLayout>

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

@@ -6,10 +6,12 @@
     <ListView
         android:id="@+id/fragmentView"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:background="@drawable/list_view_unselected"
         android:fastScrollEnabled="true"
         android:longClickable="false"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
         android:stackFromBottom="false" >
 
     </ListView>

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

@@ -8,5 +8,7 @@
         android:layout_height="fill_parent"
         android:numColumns="auto_fit"
         android:columnWidth="160dp"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
         android:gravity="center"/>
 </LinearLayout>

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

@@ -8,5 +8,7 @@
         android:layout_height="fill_parent"
         android:numColumns="auto_fit"
         android:columnWidth="105dp"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
         android:gravity="center"/>
 </LinearLayout>

app/src/main/res/values-it/strings.xml

@@ -95,6 +95,8 @@
     <string name="summary_checkbox_disable_warnings">Disabilita i messaggi di warning sullo schermo durante lo streaming</string>
 
     <string name="category_gamepad_settings">Impostazioni Gamepad</string>
+    <string name="title_checkbox_multi_controller">Supporto controller multipli</string>
+    <string name="summary_checkbox_multi_controller">Quando disabilitato, tutti i controllers appaiono come uno solo</string>
     <string name="title_seekbar_deadzone">Aggiusta deadzone degli stick analogici</string>
     <string name="suffix_seekbar_deadzone">%</string>
 

app/src/main/res/values/strings.xml

@@ -44,9 +44,9 @@
     <string name="conn_establishing_title">Establishing Connection</string>
     <string name="conn_establishing_msg">Starting connection</string>
     <string name="conn_metered">Warning: Your active network connection is metered!</string>
-    <string name="conn_client_latency">Average client-side frame latency:</string>
+    <string name="conn_client_latency">Average frame decoding latency:</string>
     <string name="conn_client_latency_hw">hardware decoder latency:</string>
-    <string name="conn_hardware_latency">Average hardware decoder latency:</string>
+    <string name="conn_hardware_latency">Average hardware decoding latency:</string>
     <string name="conn_starting">Starting</string>
     <string name="conn_error_title">Connection Error</string>
     <string name="conn_error_msg">Failed to start</string>
@@ -95,6 +95,8 @@
     <string name="summary_checkbox_disable_warnings">Disable on-screen connection warning messages while streaming</string>
 
     <string name="category_gamepad_settings">Gamepad Settings</string>
+    <string name="title_checkbox_multi_controller">Multiple controller support</string>
+    <string name="summary_checkbox_multi_controller">When unchecked, all controllers appear as one</string>
     <string name="title_seekbar_deadzone">Adjust analog stick deadzone</string>
     <string name="suffix_seekbar_deadzone">%</string>
 

app/src/main/res/xml/preferences.xml

@@ -26,14 +26,19 @@
             android:summary="@string/summary_checkbox_disable_warnings"
             android:defaultValue="false" />
     </PreferenceCategory>
-    <!--PreferenceCategory android:title="@string/category_gamepad_settings">
+    <PreferenceCategory android:title="@string/category_gamepad_settings">
-        <com.limelight.preferences.SeekBarPreference
+        <!--com.limelight.preferences.SeekBarPreference
             android:key="seekbar_deadzone"
             android:defaultValue="15"
             android:max="50"
             android:text="@string/suffix_seekbar_deadzone"
-            android:title="@string/title_seekbar_deadzone"/>
+            android:title="@string/title_seekbar_deadzone"/-->
-    </PreferenceCategory-->
+        <CheckBoxPreference
+            android:key="checkbox_multi_controller"
+            android:title="@string/title_checkbox_multi_controller"
+            android:summary="@string/summary_checkbox_multi_controller"
+            android:defaultValue="true" />
+    </PreferenceCategory>
     <PreferenceCategory android:title="@string/category_host_settings">
         <CheckBoxPreference
             android:key="checkbox_enable_sops"

build.gradle

@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.0'
+        classpath 'com.android.tools.build:gradle:1.1.0'
     }
 }
 

limelight-android.iml

@@ -7,9 +7,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />