Total Eclipse of the Lime

This reverts commit 7b12fd1ad2.

README.md

@@ -1,14 +1,14 @@
-#Limelight
+#Moonlight
 
-Limelight is an open source implementation of NVIDIA's GameStream, as used by the NVIDIA Shield.
+Moonlight is an open source implementation of NVIDIA's GameStream, as used by the NVIDIA Shield.
 We reverse engineered the Shield streaming software and created a version that can be run on any Android device.
 
-Limelight will allow you to stream your full collection of games from your Windows PC to your Android device,
+Moonlight will allow you to stream your full collection of games from your Windows PC to your Android device,
 whether in your own home or over the internet.
 
-[Limelight-pc](https://github.com/limelight-stream/limelight-pc) is also currently in development for Windows, OS X and Linux. Versions for [iOS](https://github.com/limelight-stream/limelight-ios) and [Windows and Windows Phone](https://github.com/limelight-stream/limelight-windows) are also in development.
+[Moonlight-pc](https://github.com/moonlight-stream/moonlight-pc) is also currently in development for Windows, OS X and Linux. Versions for [iOS](https://github.com/moonlight-stream/moonlight-ios) and [Windows and Windows Phone](https://github.com/moonlight-stream/moonlight-windows) are also in development.
 
-Check our [wiki](https://github.com/limelight-stream/limelight-android/wiki) for more detailed information or a troubleshooting guide. 
+Check our [wiki](https://github.com/moonlight-stream/moonlight-android/wiki) for more detailed information or a troubleshooting guide. 
 
 ##Features
 
@@ -18,7 +18,7 @@ Check our [wiki](https://github.com/limelight-stream/limelight-android/wiki) for
 
 ##Installation
 
-* Download and install Limelight for Android from
+* Download and install Moonlight for Android from
 [Google Play](https://play.google.com/store/apps/details?id=com.limelight)
 * Download [GeForce Experience](http://www.geforce.com/geforce-experience) and install on your Windows PC
 
@@ -33,7 +33,7 @@ Check our [wiki](https://github.com/limelight-stream/limelight-android/wiki) for
 * Turn on GameStream in the GFE settings
 * If you are connecting from outside the same network, turn on internet
   streaming
-* When on the same network as your PC, open Limelight and tap on your PC in the list
+* When on the same network as your PC, open Moonlight and tap on your PC in the list
 * Accept the pairing confirmation on your PC
 * Tap your PC again to view the list of apps to stream
 * Play games!
@@ -46,8 +46,6 @@ This project is being actively developed at [XDA Developers](http://forum.xda-de
 2. Write code
 3. Send Pull Requests
 
-Check out our [website](http://limelight-stream.com) for project links and information.
-
 ##Authors
 
 * [Cameron Gutman](https://github.com/cgutman)  
@@ -55,5 +53,5 @@ Check out our [website](http://limelight-stream.com) for project links and infor
 * [Aaron Neyer](https://github.com/Aaronneyer)  
 * [Andrew Hennessy](https://github.com/yetanothername)
 
-Limelight is the work of students at [Case Western](http://case.edu) and was
+Moonlight is the work of students at [Case Western](http://case.edu) and was
 started as a project at [MHacks](http://mhacks.org).

app/app.iml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="limelight-android" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="moonlight-android" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -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/aidl/test/nonRoot/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/nonRoot/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/nonRoot/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/nonRoot/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/nonRoot/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/nonRoot/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/nonRoot/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/nonRoot/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/nonRoot/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/nonRoot/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/nonRoot/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/nonRoot/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/nonRoot/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/nonRoot/assets" type="java-resource" />
@@ -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"
-        versionCode = 50
+        versionName "3.1.5"
+        versionCode = 60
     }
 
     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: 'bcpkix-jdk15on', version: '+'
+    compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.51'
+    compile group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '1.51'
 
-    compile group: 'com.google.android', name: 'support-v4', version:'+'
-    compile group: 'com.koushikdutta.ion', name: 'ion', version:'+'
-    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 group: 'com.squareup.okhttp', name: 'okhttp', version:'2.2.0'
+    compile group: 'com.squareup.okio', name:'okio', version:'1.2.0'
 
     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,20 +55,19 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
     private ComputerManagerService.ApplistPoller poller;
     private SpinnerDialog blockingLoadSpinner;
     private String lastRawApplist;
+    private int lastRunningAppId;
+    private boolean suspendGridUpdates;
 
-    private int consecutiveAppListFailures = 0;
-    private final static int CONSECUTIVE_FAILURE_LIMIT = 3;
-
-	private final static int START_OR_RESUME_ID = 1;
-	private final static int QUIT_ID = 2;
-	private final static int CANCEL_ID = 3;
+    private final static int START_OR_RESUME_ID = 1;
+    private final static int QUIT_ID = 2;
+    private final static int CANCEL_ID = 3;
     private final static int START_WTIH_QUIT = 4;
 
     public final static String NAME_EXTRA = "Name";
-	public final static String UUID_EXTRA = "UUID";
+    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,45 +122,54 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
         managerBinder.startPolling(new ComputerManagerListener() {
             @Override
             public void notifyComputerUpdated(ComputerDetails details) {
-                // Don't care about other computers
-                if (details != computer) {
+                // Do nothing if updates are suspended
+                if (suspendGridUpdates) {
                     return;
                 }
 
-                if (details.state != ComputerDetails.State.ONLINE) {
-                    consecutiveAppListFailures++;
+                // Don't care about other computers
+                if (!details.uuid.toString().equalsIgnoreCase(uuidString)) {
+                    return;
+                }
 
-                    if (consecutiveAppListFailures >= CONSECUTIVE_FAILURE_LIMIT) {
-                        // The PC is unreachable now
-                        AppView.this.runOnUiThread(new Runnable() {
-                            @Override
-                            public void run() {
-                                // Display a toast to the user and quit the activity
-                                Toast.makeText(AppView.this, getResources().getText(R.string.lost_connection), Toast.LENGTH_SHORT).show();
-                                finish();
-                            }
-                        });
+                if (details.state == ComputerDetails.State.OFFLINE) {
+                    // The PC is unreachable now
+                    AppView.this.runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            // Display a toast to the user and quit the activity
+                            Toast.makeText(AppView.this, getResources().getText(R.string.lost_connection), Toast.LENGTH_SHORT).show();
+                            finish();
+                        }
+                    });
+
+                    return;
+                }
+
+                // App list is the same or empty
+                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;
                 }
 
-                consecutiveAppListFailures = 0;
-
-                // App list is the same or empty; nothing to do
-                if (details.rawAppList == null || details.rawAppList.equals(lastRawApplist)) {
-                    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,34 +187,38 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
         if (managerBinder != null) {
             managerBinder.stopPolling();
         }
+
+        if (appGridAdapter != null) {
+            appGridAdapter.cancelQueuedOperations();
+        }
     }
-	
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
 
         String locale = PreferenceConfiguration.readPreferences(this).language;
-		if (!locale.equals(PreferenceConfiguration.DEFAULT_LANGUAGE)) {
-			Configuration config = new Configuration(getResources().getConfiguration());
-			config.locale = new Locale(locale);
-			getResources().updateConfiguration(config, getResources().getDisplayMetrics());
-		}
+        if (!locale.equals(PreferenceConfiguration.DEFAULT_LANGUAGE)) {
+            Configuration config = new Configuration(getResources().getConfiguration());
+            config.locale = new Locale(locale);
+            getResources().updateConfiguration(config, getResources().getDisplayMetrics());
+        }
 
-		setContentView(R.layout.activity_app_view);
+        setContentView(R.layout.activity_app_view);
 
         UiHelper.notifyNewRootView(this);
 
         uuidString = getIntent().getStringExtra(UUID_EXTRA);
-		
-		String labelText = getResources().getString(R.string.title_applist)+" "+getIntent().getStringExtra(NAME_EXTRA);
-		TextView label = (TextView) findViewById(R.id.appListText);
-		setTitle(labelText);
-		label.setText(labelText);
+
+        String labelText = getResources().getString(R.string.title_applist)+" "+getIntent().getStringExtra(NAME_EXTRA);
+        TextView label = (TextView) findViewById(R.id.appListText);
+        setTitle(labelText);
+        label.setText(labelText);
 
         // Bind to the computer manager service
         bindService(new Intent(this, ComputerManagerService.class), serviceConnection,
                 Service.BIND_AUTO_CREATE);
-	}
+    }
 
     private void populateAppGridWithCache() {
         try {
@@ -241,25 +242,25 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
         blockingLoadSpinner = SpinnerDialog.displayDialog(this, getResources().getString(R.string.applist_refresh_title),
                 getResources().getString(R.string.applist_refresh_msg), true);
     }
-	
-	@Override
-	protected void onDestroy() {
-		super.onDestroy();
-		
-		SpinnerDialog.closeDialogs(this);
-		Dialog.closeDialogs();
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+
+        SpinnerDialog.closeDialogs(this);
+        Dialog.closeDialogs();
 
         if (managerBinder != null) {
             unbindService(serviceConnection);
         }
-	}
-	
-	@Override
-	protected void onResume() {
-		super.onResume();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
 
         startComputerUpdates();
-	}
+    }
 
     @Override
     protected void onPause() {
@@ -267,75 +268,40 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
 
         stopComputerUpdates();
     }
-	
-	private int getRunningAppId() {
+
+    private int getRunningAppId() {
         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;
-        	}
+            AppObject app = (AppObject) appGridAdapter.getItem(i);
+            if (app.app.getIsRunning()) {
+                runningAppId = app.app.getAppId();
+                break;
+            }
         }
         return runningAppId;
-	}
-	
-	@Override
-	public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
-		super.onCreateContextMenu(menu, v, menuInfo);
+    }
+
+    @Override
+    public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
+        super.onCreateContextMenu(menu, v, menuInfo);
         
         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()) {
+            if (runningAppId == selectedApp.app.getAppId()) {
                 menu.add(Menu.NONE, START_OR_RESUME_ID, 1, getResources().getString(R.string.applist_menu_resume));
                 menu.add(Menu.NONE, QUIT_ID, 2, getResources().getString(R.string.applist_menu_quit));
-        	}
-        	else {
+            }
+            else {
                 menu.add(Menu.NONE, START_WTIH_QUIT, 1, getResources().getString(R.string.applist_menu_quit_and_start));
                 menu.add(Menu.NONE, CANCEL_ID, 2, getResources().getString(R.string.applist_menu_cancel));
-        	}
+            }
         }
     }
-	
-	@Override
-	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 void onContextMenuClosed(Menu menu) {
     }
 
     @Override
@@ -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,31 +478,32 @@ 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 AppObject(NvApp app) {
-			this.app = app;
-		}
-		
-		@Override
-		public String toString() {
-			return app.getAppName();
-		}
-	}
+        public final NvApp app;
+
+        public AppObject(NvApp app) {
+            if (app == null) {
+                throw new IllegalArgumentException("app must not be null");
+            }
+            this.app = app;
+        }
+
+        @Override
+        public String toString() {
+            return app.getAppName();
+        }
+    }
 }

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;
@@ -51,69 +52,71 @@ import android.widget.AdapterView.AdapterContextMenuInfo;
 public class PcView extends Activity implements AdapterFragmentCallbacks {
     private RelativeLayout noPcFoundLayout;
     private PcGridAdapter pcGridAdapter;
-	private ComputerManagerService.ComputerManagerBinder managerBinder;
-	private boolean freezeUpdates, runningPolling;
-	private ServiceConnection serviceConnection = new ServiceConnection() {
-		public void onServiceConnected(ComponentName className, IBinder binder) {
-			final ComputerManagerService.ComputerManagerBinder localBinder =
-					((ComputerManagerService.ComputerManagerBinder)binder);
-			
-			// Wait in a separate thread to avoid stalling the UI
-			new Thread() {
-				@Override
-				public void run() {
-					// Wait for the binder to be ready
-					localBinder.waitForReady();
-					
-					// Now make the binder visible
-					managerBinder = localBinder;
-					
-					// Start updates
-					startComputerUpdates();
-					
-					// Force a keypair to be generated early to avoid discovery delays
-					new AndroidCryptoProvider(PcView.this).getClientCertificate();
-				}
-			}.start();
-		}
+    private ComputerManagerService.ComputerManagerBinder managerBinder;
+    private boolean freezeUpdates, runningPolling;
+    private final ServiceConnection serviceConnection = new ServiceConnection() {
+        public void onServiceConnected(ComponentName className, IBinder binder) {
+            final ComputerManagerService.ComputerManagerBinder localBinder =
+                    ((ComputerManagerService.ComputerManagerBinder)binder);
 
-		public void onServiceDisconnected(ComponentName className) {
-			managerBinder = null;
-		}
-	};
-	
-	public void onConfigurationChanged(Configuration newConfig) {
-		super.onConfigurationChanged(newConfig);
-		
-		// Reinitialize views just in case orientation changed
-		initializeViews();
-	}
-	
-	private final static int APP_LIST_ID = 1;
-	private final static int PAIR_ID = 2;
-	private final static int UNPAIR_ID = 3;
-	private final static int WOL_ID = 4;
-	private final static int DELETE_ID = 5;
-	
-	private void initializeViews() {
-		setContentView(R.layout.activity_pc_view);
+            // Wait in a separate thread to avoid stalling the UI
+            new Thread() {
+                @Override
+                public void run() {
+                    // Wait for the binder to be ready
+                    localBinder.waitForReady();
+
+                    // Now make the binder visible
+                    managerBinder = localBinder;
+
+                    // Start updates
+                    startComputerUpdates();
+
+                    // Force a keypair to be generated early to avoid discovery delays
+                    new AndroidCryptoProvider(PcView.this).getClientCertificate();
+                }
+            }.start();
+        }
+
+        public void onServiceDisconnected(ComponentName className) {
+            managerBinder = null;
+        }
+    };
+
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+
+        // Reinitialize views just in case orientation changed
+        initializeViews();
+    }
+
+    private final static int APP_LIST_ID = 1;
+    private final static int PAIR_ID = 2;
+    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);
 
         UiHelper.notifyNewRootView(this);
 
         // Set default preferences if we've never been run
         PreferenceManager.setDefaultValues(this, R.xml.preferences, false);
 
-		// Setup the list view
+        // Setup the list view
         ImageButton settingsButton = (ImageButton) findViewById(R.id.settingsButton);
         ImageButton addComputerButton = (ImageButton) findViewById(R.id.manuallyAddPc);
 
-		settingsButton.setOnClickListener(new OnClickListener() {
+        settingsButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
                 startActivity(new Intent(PcView.this, StreamSettings.class));
             }
         });
-		addComputerButton.setOnClickListener(new OnClickListener() {
+        addComputerButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
                 Intent i = new Intent(PcView.this, AddComputerManually.class);
@@ -134,114 +137,113 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
         }
         pcGridAdapter.notifyDataSetChanged();
     }
-	
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
 
         String locale = PreferenceConfiguration.readPreferences(this).language;
-		if (!locale.equals(PreferenceConfiguration.DEFAULT_LANGUAGE)) {
-			Configuration config = new Configuration(getResources().getConfiguration());
-			config.locale = new Locale(locale);
-			getResources().updateConfiguration(config, getResources().getDisplayMetrics());
-		}
-		
-		// Bind to the computer manager service
-		bindService(new Intent(PcView.this, ComputerManagerService.class), serviceConnection,
-				Service.BIND_AUTO_CREATE);
+        if (!locale.equals(PreferenceConfiguration.DEFAULT_LANGUAGE)) {
+            Configuration config = new Configuration(getResources().getConfiguration());
+            config.locale = new Locale(locale);
+            getResources().updateConfiguration(config, getResources().getDisplayMetrics());
+        }
+
+        // Bind to the computer manager service
+        bindService(new Intent(PcView.this, ComputerManagerService.class), serviceConnection,
+                Service.BIND_AUTO_CREATE);
 
         pcGridAdapter = new PcGridAdapter(this,
                 PreferenceConfiguration.readPreferences(this).listMode,
                 PreferenceConfiguration.readPreferences(this).smallIconMode);
-		
-		initializeViews();
-	}
-	
-	private void startComputerUpdates() {
-		if (managerBinder != null) {
-			if (runningPolling) {
-				return;
-			}
-			
-			freezeUpdates = false;
-			managerBinder.startPolling(new ComputerManagerListener() {
-				@Override
-				public void notifyComputerUpdated(final ComputerDetails details) {
-					if (!freezeUpdates) {
-						PcView.this.runOnUiThread(new Runnable() {
-							@Override
-							public void run() {
-								updateComputer(details);
-							}
-						});
-					}
-				}
-			});
-			runningPolling = true;
-		}
-	}
-	
-	private void stopComputerUpdates(boolean wait) {
-		if (managerBinder != null) {
-			if (!runningPolling) {
-				return;
-			}
-			
-			freezeUpdates = true;
-			
-			managerBinder.stopPolling();
-			
-			if (wait) {
-				managerBinder.waitForPollingStopped();
-			}
-			
-			runningPolling = false;
-		}
-	}
-	
-	@Override
-	public void onDestroy() {
-		super.onDestroy();
-		
-		if (managerBinder != null) {
-			unbindService(serviceConnection);
-		}
-	}
-	
-	@Override
-	protected void onResume() {
-		super.onResume();
-		
-		startComputerUpdates();
-	}
-	
-	@Override
-	protected void onPause() {
-		super.onPause();
-		
-		stopComputerUpdates(false);
-	}
-	
-	@Override
-	protected void onStop() {
-		super.onStop();
-		
-		Dialog.closeDialogs();
-	}
-	
-	@Override
-	public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
-		stopComputerUpdates(false);
-		
-		// Call superclass
-		super.onCreateContextMenu(menu, v, menuInfo);
+
+        initializeViews();
+    }
+
+    private void startComputerUpdates() {
+        if (managerBinder != null) {
+            if (runningPolling) {
+                return;
+            }
+
+            freezeUpdates = false;
+            managerBinder.startPolling(new ComputerManagerListener() {
+                @Override
+                public void notifyComputerUpdated(final ComputerDetails details) {
+                    if (!freezeUpdates) {
+                        PcView.this.runOnUiThread(new Runnable() {
+                            @Override
+                            public void run() {
+                                updateComputer(details);
+                            }
+                        });
+                    }
+                }
+            });
+            runningPolling = true;
+        }
+    }
+
+    private void stopComputerUpdates(boolean wait) {
+        if (managerBinder != null) {
+            if (!runningPolling) {
+                return;
+            }
+
+            freezeUpdates = true;
+
+            managerBinder.stopPolling();
+
+            if (wait) {
+                managerBinder.waitForPollingStopped();
+            }
+
+            runningPolling = false;
+        }
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+
+        if (managerBinder != null) {
+            unbindService(serviceConnection);
+        }
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+
+        startComputerUpdates();
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+
+        stopComputerUpdates(false);
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+
+        Dialog.closeDialogs();
+    }
+
+    @Override
+    public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
+        stopComputerUpdates(false);
+
+        // Call superclass
+        super.onCreateContextMenu(menu, v, menuInfo);
                 
         AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;
         ComputerObject computer = (ComputerObject) pcGridAdapter.getItem(info.position);
-        if (computer == null || computer.details == null ||
-                computer.details.reachability == ComputerDetails.Reachability.UNKNOWN) {
-        	startComputerUpdates();
-        	return;
+        if (computer.details.reachability == ComputerDetails.Reachability.UNKNOWN) {
+            startComputerUpdates();
+            return;
         }
         
         // Inflate the context menu
@@ -254,98 +256,106 @@ 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));
-            menu.add(Menu.NONE, UNPAIR_ID, 2, getResources().getString(R.string.pcview_menu_unpair_pc));
+            if (computer.details.runningGameId != 0) {
+                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));
         }
     }
-	
-	@Override
-	public void onContextMenuClosed(Menu menu) {
-		startComputerUpdates();
-	}
-	
-	private void doPair(final ComputerDetails computer) {
-		if (computer.reachability == ComputerDetails.Reachability.OFFLINE) {
-			Toast.makeText(PcView.this, getResources().getString(R.string.pair_pc_offline), Toast.LENGTH_SHORT).show();
-			return;
-		}
-		if (computer.runningGameId != 0) {
-			Toast.makeText(PcView.this, getResources().getString(R.string.pair_pc_ingame), Toast.LENGTH_LONG).show();
-			return;
-		}
-		if (managerBinder == null) {
-			Toast.makeText(PcView.this, getResources().getString(R.string.error_manager_not_running), Toast.LENGTH_LONG).show();
-			return;
-		}
-		
-		Toast.makeText(PcView.this, getResources().getString(R.string.pairing), Toast.LENGTH_SHORT).show();
-		new Thread(new Runnable() {
-			@Override
-			public void run() {
-				NvHTTP httpConn;
-				String message;
+
+    @Override
+    public void onContextMenuClosed(Menu menu) {
+        startComputerUpdates();
+    }
+
+    private void doPair(final ComputerDetails computer) {
+        if (computer.reachability == ComputerDetails.Reachability.OFFLINE) {
+            Toast.makeText(PcView.this, getResources().getString(R.string.pair_pc_offline), Toast.LENGTH_SHORT).show();
+            return;
+        }
+        if (computer.runningGameId != 0) {
+            Toast.makeText(PcView.this, getResources().getString(R.string.pair_pc_ingame), Toast.LENGTH_LONG).show();
+            return;
+        }
+        if (managerBinder == null) {
+            Toast.makeText(PcView.this, getResources().getString(R.string.error_manager_not_running), Toast.LENGTH_LONG).show();
+            return;
+        }
+
+        Toast.makeText(PcView.this, getResources().getString(R.string.pairing), Toast.LENGTH_SHORT).show();
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                NvHTTP httpConn;
+                String message;
                 boolean success = false;
-				try {
-					// Stop updates and wait while pairing
-					stopComputerUpdates(true);
-					
-					InetAddress addr = null;
-					if (computer.reachability == ComputerDetails.Reachability.LOCAL) {
-						addr = computer.localIp;
-					}
-					else if (computer.reachability == ComputerDetails.Reachability.REMOTE) {
-						addr = computer.remoteIp;
-					}
-					
-					httpConn = new NvHTTP(addr,
-							managerBinder.getUniqueId(),
-							PlatformBinding.getDeviceName(), 
-							PlatformBinding.getCryptoProvider(PcView.this));
-					if (httpConn.getPairState() == PairingManager.PairState.PAIRED) {
+                try {
+                    // Stop updates and wait while pairing
+                    stopComputerUpdates(true);
+
+                    InetAddress addr = null;
+                    if (computer.reachability == ComputerDetails.Reachability.LOCAL) {
+                        addr = computer.localIp;
+                    }
+                    else if (computer.reachability == ComputerDetails.Reachability.REMOTE) {
+                        addr = computer.remoteIp;
+                    }
+
+                    httpConn = new NvHTTP(addr,
+                            managerBinder.getUniqueId(),
+                            PlatformBinding.getDeviceName(),
+                            PlatformBinding.getCryptoProvider(PcView.this));
+                    if (httpConn.getPairState() == PairingManager.PairState.PAIRED) {
                         // Don't display any toast, but open the app list
-						message = null;
+                        message = null;
                         success = true;
-					}
-					else {
-						final String pinStr = PairingManager.generatePinString();
-						
-						// Spin the dialog off in a thread because it blocks
-						Dialog.displayDialog(PcView.this, getResources().getString(R.string.pair_pairing_title),
-								getResources().getString(R.string.pair_pairing_msg)+" "+pinStr, false);
-						
-						PairingManager.PairState pairState = httpConn.pair(pinStr);
-						if (pairState == PairingManager.PairState.PIN_WRONG) {
-							message = getResources().getString(R.string.pair_incorrect_pin);
-						}
-						else if (pairState == PairingManager.PairState.FAILED) {
-							message = getResources().getString(R.string.pair_fail);
-						}
-						else if (pairState == PairingManager.PairState.PAIRED) {
+                    }
+                    else {
+                        final String pinStr = PairingManager.generatePinString();
+
+                        // Spin the dialog off in a thread because it blocks
+                        Dialog.displayDialog(PcView.this, getResources().getString(R.string.pair_pairing_title),
+                                getResources().getString(R.string.pair_pairing_msg)+" "+pinStr, false);
+
+                        PairingManager.PairState pairState = httpConn.pair(pinStr);
+                        if (pairState == PairingManager.PairState.PIN_WRONG) {
+                            message = getResources().getString(R.string.pair_incorrect_pin);
+                        }
+                        else if (pairState == PairingManager.PairState.FAILED) {
+                            message = getResources().getString(R.string.pair_fail);
+                        }
+                        else if (pairState == PairingManager.PairState.PAIRED) {
                             // Just navigate to the app view without displaying a toast
                             message = null;
                             success = true;
-						}
-						else {
-							// Should be no other values
-							message = null;
-						}
-					}
-				} catch (UnknownHostException e) {
-					message = getResources().getString(R.string.error_unknown_host);
-				} catch (FileNotFoundException e) {
-					message = getResources().getString(R.string.error_404);
-				} catch (Exception e) {
+                        }
+                        else {
+                            // Should be no other values
+                            message = null;
+                        }
+                    }
+                } catch (UnknownHostException e) {
+                    message = getResources().getString(R.string.error_unknown_host);
+                } catch (FileNotFoundException e) {
+                    message = getResources().getString(R.string.error_404);
+                } catch (Exception e) {
                     e.printStackTrace();
-					message = e.getMessage();
-				}
-				
-				Dialog.closeDialogs();
-				
-				final String toastMessage = message;
+                    message = e.getMessage();
+                }
+
+                Dialog.closeDialogs();
+
+                final String toastMessage = message;
                 final boolean toastSuccess = success;
-				runOnUiThread(new Runnable() {
-					@Override
-					public void run() {
+                runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
                         if (toastMessage != null) {
                             Toast.makeText(PcView.this, toastMessage, Toast.LENGTH_LONG).show();
                         }
@@ -354,201 +364,232 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                             // Open the app list after a successful pairing attemp
                             doAppList(computer);
                         }
-					}
-				});
-				
-				// Start polling again
-				startComputerUpdates();
-			}
-		}).start();
-	}
-	
-	private void doWakeOnLan(final ComputerDetails computer) {
-		if (computer.reachability != ComputerDetails.Reachability.OFFLINE) {
-			Toast.makeText(PcView.this, getResources().getString(R.string.wol_pc_online), Toast.LENGTH_SHORT).show();
-			return;
-		}
-		
-		if (computer.macAddress == null) {
-			Toast.makeText(PcView.this, getResources().getString(R.string.wol_no_mac), Toast.LENGTH_SHORT).show();
-			return;
-		}
-		
-		Toast.makeText(PcView.this, getResources().getString(R.string.wol_waking_pc), Toast.LENGTH_SHORT).show();
-		new Thread(new Runnable() {
-			@Override
-			public void run() {
-				String message;
-				try {
-					WakeOnLanSender.sendWolPacket(computer);
-					message = getResources().getString(R.string.wol_waking_msg);
-				} catch (IOException e) {
-					message = getResources().getString(R.string.wol_fail);
-				}
-				
-				final String toastMessage = message;
-				runOnUiThread(new Runnable() {
-					@Override
-					public void run() {
-						Toast.makeText(PcView.this, toastMessage, Toast.LENGTH_LONG).show();
-					}
-				});
-			}
-		}).start();
-	}
-	
-	private void doUnpair(final ComputerDetails computer) {
-		if (computer.reachability == ComputerDetails.Reachability.OFFLINE) {
-			Toast.makeText(PcView.this, getResources().getString(R.string.error_pc_offline), Toast.LENGTH_SHORT).show();
-			return;
-		}
-		if (managerBinder == null) {
-			Toast.makeText(PcView.this, getResources().getString(R.string.error_manager_not_running), Toast.LENGTH_LONG).show();
-			return;
-		}
-		
-		Toast.makeText(PcView.this, getResources().getString(R.string.unpairing), Toast.LENGTH_SHORT).show();
-		new Thread(new Runnable() {
-			@Override
-			public void run() {
-				NvHTTP httpConn;
-				String message;
-				try {
-					InetAddress addr = null;
-					if (computer.reachability == ComputerDetails.Reachability.LOCAL) {
-						addr = computer.localIp;
-					}
-					else if (computer.reachability == ComputerDetails.Reachability.REMOTE) {
-						addr = computer.remoteIp;
-					}
-					
-					httpConn = new NvHTTP(addr,
-							managerBinder.getUniqueId(),
-							PlatformBinding.getDeviceName(), 
-							PlatformBinding.getCryptoProvider(PcView.this));
-					if (httpConn.getPairState() == PairingManager.PairState.PAIRED) {
-						httpConn.unpair();
-						if (httpConn.getPairState() == PairingManager.PairState.NOT_PAIRED) {
-							message = getResources().getString(R.string.unpair_success);
-						}
-						else {
-							message = getResources().getString(R.string.unpair_fail);
-						}
-					}
-					else {
-						message = getResources().getString(R.string.unpair_error);
-					}
-				} 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();
-				}
-								
-				final String toastMessage = message;
-				runOnUiThread(new Runnable() {
-					@Override
-					public void run() {
-						Toast.makeText(PcView.this, toastMessage, Toast.LENGTH_LONG).show();
-					}
-				});
-			}
-		}).start();
-	}
-	
-	private void doAppList(ComputerDetails computer) {
-		if (computer.reachability == ComputerDetails.Reachability.OFFLINE) {
-			Toast.makeText(PcView.this, getResources().getString(R.string.error_pc_offline), Toast.LENGTH_SHORT).show();
-			return;
-		}
-		if (managerBinder == null) {
-			Toast.makeText(PcView.this, getResources().getString(R.string.error_manager_not_running), Toast.LENGTH_LONG).show();
-			return;
-		}
-		
-		Intent i = new Intent(this, AppView.class);
-		i.putExtra(AppView.NAME_EXTRA, computer.name);
-		i.putExtra(AppView.UUID_EXTRA, computer.uuid.toString());
-		startActivity(i);
-	}
+                    }
+                });
+
+                // Start polling again
+                startComputerUpdates();
+            }
+        }).start();
+    }
+
+    private void doWakeOnLan(final ComputerDetails computer) {
+        if (computer.reachability != ComputerDetails.Reachability.OFFLINE) {
+            Toast.makeText(PcView.this, getResources().getString(R.string.wol_pc_online), Toast.LENGTH_SHORT).show();
+            return;
+        }
+
+        if (computer.macAddress == null) {
+            Toast.makeText(PcView.this, getResources().getString(R.string.wol_no_mac), Toast.LENGTH_SHORT).show();
+            return;
+        }
+
+        Toast.makeText(PcView.this, getResources().getString(R.string.wol_waking_pc), Toast.LENGTH_SHORT).show();
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                String message;
+                try {
+                    WakeOnLanSender.sendWolPacket(computer);
+                    message = getResources().getString(R.string.wol_waking_msg);
+                } catch (IOException e) {
+                    message = getResources().getString(R.string.wol_fail);
+                }
+
+                final String toastMessage = message;
+                runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        Toast.makeText(PcView.this, toastMessage, Toast.LENGTH_LONG).show();
+                    }
+                });
+            }
+        }).start();
+    }
+
+    private void doUnpair(final ComputerDetails computer) {
+        if (computer.reachability == ComputerDetails.Reachability.OFFLINE) {
+            Toast.makeText(PcView.this, getResources().getString(R.string.error_pc_offline), Toast.LENGTH_SHORT).show();
+            return;
+        }
+        if (managerBinder == null) {
+            Toast.makeText(PcView.this, getResources().getString(R.string.error_manager_not_running), Toast.LENGTH_LONG).show();
+            return;
+        }
+
+        Toast.makeText(PcView.this, getResources().getString(R.string.unpairing), Toast.LENGTH_SHORT).show();
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                NvHTTP httpConn;
+                String message;
+                try {
+                    InetAddress addr = null;
+                    if (computer.reachability == ComputerDetails.Reachability.LOCAL) {
+                        addr = computer.localIp;
+                    }
+                    else if (computer.reachability == ComputerDetails.Reachability.REMOTE) {
+                        addr = computer.remoteIp;
+                    }
+
+                    httpConn = new NvHTTP(addr,
+                            managerBinder.getUniqueId(),
+                            PlatformBinding.getDeviceName(),
+                            PlatformBinding.getCryptoProvider(PcView.this));
+                    if (httpConn.getPairState() == PairingManager.PairState.PAIRED) {
+                        httpConn.unpair();
+                        if (httpConn.getPairState() == PairingManager.PairState.NOT_PAIRED) {
+                            message = getResources().getString(R.string.unpair_success);
+                        }
+                        else {
+                            message = getResources().getString(R.string.unpair_fail);
+                        }
+                    }
+                    else {
+                        message = getResources().getString(R.string.unpair_error);
+                    }
+                } 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();
+                }
+
+                final String toastMessage = message;
+                runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        Toast.makeText(PcView.this, toastMessage, Toast.LENGTH_LONG).show();
+                    }
+                });
+            }
+        }).start();
+    }
+
+    private void doAppList(ComputerDetails computer) {
+        if (computer.reachability == ComputerDetails.Reachability.OFFLINE) {
+            Toast.makeText(PcView.this, getResources().getString(R.string.error_pc_offline), Toast.LENGTH_SHORT).show();
+            return;
+        }
+        if (managerBinder == null) {
+            Toast.makeText(PcView.this, getResources().getString(R.string.error_manager_not_running), Toast.LENGTH_LONG).show();
+            return;
+        }
+
+        Intent i = new Intent(this, AppView.class);
+        i.putExtra(AppView.NAME_EXTRA, computer.name);
+        i.putExtra(AppView.UUID_EXTRA, computer.uuid.toString());
+        startActivity(i);
+    }
 
     @Override
     public boolean onContextItemSelected(MenuItem item) {
         AdapterContextMenuInfo info = (AdapterContextMenuInfo) item.getMenuInfo();
-        ComputerObject computer = (ComputerObject) pcGridAdapter.getItem(info.position);
-        switch (item.getItemId())
-        {
-        case PAIR_ID:
-        	doPair(computer.details);
-        	return true;
-        	
-        case UNPAIR_ID:
-        	doUnpair(computer.details);
-        	return true;
-        	
-        case WOL_ID:
-        	doWakeOnLan(computer.details);
-        	return true;
-        	
-        case DELETE_ID:
-    		if (managerBinder == null) {
-    			Toast.makeText(PcView.this, getResources().getString(R.string.error_manager_not_running), Toast.LENGTH_LONG).show();
-    			return true;
-    		}
-        	managerBinder.removeComputer(computer.details.name);
-        	removeComputer(computer.details);
-        	return true;
-        	
-        case APP_LIST_ID:
-        	doAppList(computer.details);
-        	return true;
-        	
-        default:
-          return super.onContextItemSelected(item);
+        final ComputerObject computer = (ComputerObject) pcGridAdapter.getItem(info.position);
+        switch (item.getItemId()) {
+            case PAIR_ID:
+                doPair(computer.details);
+                return true;
+
+            case UNPAIR_ID:
+                doUnpair(computer.details);
+                return true;
+
+            case WOL_ID:
+                doWakeOnLan(computer.details);
+                return true;
+
+            case DELETE_ID:
+                if (managerBinder == null) {
+                    Toast.makeText(PcView.this, getResources().getString(R.string.error_manager_not_running), Toast.LENGTH_LONG).show();
+                    return true;
+                }
+                managerBinder.removeComputer(computer.details.name);
+                removeComputer(computer.details);
+                return true;
+
+            case APP_LIST_ID:
+                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);
         }
     }
     
     private void removeComputer(ComputerDetails details) {
-		for (int i = 0; i < pcGridAdapter.getCount(); i++) {
-			ComputerObject computer = (ComputerObject) pcGridAdapter.getItem(i);
-			
-			if (details.equals(computer.details)) {
+        for (int i = 0; i < pcGridAdapter.getCount(); i++) {
+            ComputerObject computer = (ComputerObject) pcGridAdapter.getItem(i);
+
+            if (details.equals(computer.details)) {
                 pcGridAdapter.removeComputer(computer);
                 pcGridAdapter.notifyDataSetChanged();
-				break;
-			}
-		}
+
+                if (pcGridAdapter.getCount() == 0) {
+                    // Show the "Discovery in progress" view
+                    noPcFoundLayout.setVisibility(View.VISIBLE);
+                }
+
+                break;
+            }
+        }
     }
     
-	private void updateComputer(ComputerDetails details) {
-		ComputerObject existingEntry = null;
-		
-		for (int i = 0; i < pcGridAdapter.getCount(); i++) {
-			ComputerObject computer = (ComputerObject) pcGridAdapter.getItem(i);
-			
-			// Check if this is the same computer
-			if (details.equals(computer.details)) {
-				existingEntry = computer;
-				break;
-			}
-		}
-		
-		if (existingEntry != null) {
-			// Replace the information in the existing entry
-			existingEntry.details = details;
-		}
-		else {
-			// Add a new entry
+    private void updateComputer(ComputerDetails details) {
+        ComputerObject existingEntry = null;
+
+        for (int i = 0; i < pcGridAdapter.getCount(); i++) {
+            ComputerObject computer = (ComputerObject) pcGridAdapter.getItem(i);
+
+            // Check if this is the same computer
+            if (details.uuid.equals(computer.details.uuid)) {
+                existingEntry = computer;
+                break;
+            }
+        }
+
+        if (existingEntry != null) {
+            // Replace the information in the existing entry
+            existingEntry.details = details;
+        }
+        else {
+            // Add a new entry
             pcGridAdapter.addComputer(new ComputerObject(details));
 
             // Remove the "Discovery in progress" view
             noPcFoundLayout.setVisibility(View.INVISIBLE);
-		}
+        }
 
         // Notify the view that the data has changed
         pcGridAdapter.notifyDataSetChanged();
-	}
+    }
 
     @Override
     public int getAdapterFragmentLayoutId() {
@@ -582,15 +623,18 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
     }
 
     public class ComputerObject {
-		public ComputerDetails details;
-		
-		public ComputerObject(ComputerDetails details) {
-			this.details = details;
-		}
-		
-		@Override
-		public String toString() {
-			return details.name;
-		}
-	}
+        public ComputerDetails details;
+
+        public ComputerObject(ComputerDetails details) {
+            if (details == null) {
+                throw new IllegalArgumentException("details must not be null");
+            }
+            this.details = details;
+        }
+
+        @Override
+        public String toString() {
+            return details.name;
+        }
+    }
 }

app/src/main/java/com/limelight/binding/PlatformBinding.java

@@ -8,17 +8,17 @@ import com.limelight.nvstream.av.audio.AudioRenderer;
 import com.limelight.nvstream.http.LimelightCryptoProvider;
 
 public class PlatformBinding {
-	public static String getDeviceName() {
-		String deviceName = android.os.Build.MODEL;
+    public static String getDeviceName() {
+        String deviceName = android.os.Build.MODEL;
         deviceName = deviceName.replace(" ", "");
         return deviceName;
-	}
-	
-	public static AudioRenderer getAudioRenderer() {
-		return new AndroidAudioRenderer();
-	}
-	
-	public static LimelightCryptoProvider getCryptoProvider(Context c) {
-		return new AndroidCryptoProvider(c);
-	}
+    }
+
+    public static AudioRenderer getAudioRenderer() {
+        return new AndroidAudioRenderer();
+    }
+
+    public static LimelightCryptoProvider getCryptoProvider(Context c) {
+        return new AndroidCryptoProvider(c);
+    }
 }

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

@@ -9,27 +9,27 @@ import com.limelight.nvstream.av.audio.AudioRenderer;
 
 public class AndroidAudioRenderer implements AudioRenderer {
 
-	public static final int FRAME_SIZE = 960;
-	
-	private AudioTrack track;
+    private static final int FRAME_SIZE = 960;
 
-	@Override
-	public boolean streamInitialized(int channelCount, int sampleRate) {
-		int channelConfig;
-		int bufferSize;
+    private AudioTrack track;
 
-		switch (channelCount)
-		{
-		case 1:
-			channelConfig = AudioFormat.CHANNEL_OUT_MONO;
-			break;
-		case 2:
-			channelConfig = AudioFormat.CHANNEL_OUT_STEREO;
-			break;
-		default:
-			LimeLog.severe("Decoder returned unhandled channel count");
-			return false;
-		}
+    @Override
+    public boolean streamInitialized(int channelCount, int sampleRate) {
+        int channelConfig;
+        int bufferSize;
+
+        switch (channelCount)
+        {
+        case 1:
+            channelConfig = AudioFormat.CHANNEL_OUT_MONO;
+            break;
+        case 2:
+            channelConfig = AudioFormat.CHANNEL_OUT_STEREO;
+            break;
+        default:
+            LimeLog.severe("Decoder returned unhandled channel count");
+            return false;
+        }
 
         // We're not supposed to request less than the minimum
         // buffer size for our buffer, but it appears that we can
@@ -72,26 +72,26 @@ public class AndroidAudioRenderer implements AudioRenderer {
                     AudioTrack.MODE_STREAM);
             track.play();
         }
-		
-		LimeLog.info("Audio track buffer size: "+bufferSize);
 
-		return true;
-	}
+        LimeLog.info("Audio track buffer size: "+bufferSize);
 
-	@Override
-	public void playDecodedAudio(byte[] audioData, int offset, int length) {
-		track.write(audioData, offset, length);
-	}
+        return true;
+    }
 
-	@Override
-	public void streamClosing() {
-		if (track != null) {
-			track.release();
-		}
-	}
+    @Override
+    public void playDecodedAudio(byte[] audioData, int offset, int length) {
+        track.write(audioData, offset, length);
+    }
 
-	@Override
-	public int getCapabilities() {
-		return 0;
-	}
+    @Override
+    public void streamClosing() {
+        if (track != null) {
+            track.release();
+        }
+    }
+
+    @Override
+    public int getCapabilities() {
+        return 0;
+    }
 }

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

@@ -45,239 +45,239 @@ import com.limelight.nvstream.http.LimelightCryptoProvider;
 
 public class AndroidCryptoProvider implements LimelightCryptoProvider {
 
-	private File certFile;
-	private File keyFile;
-	
-	private X509Certificate cert;
-	private RSAPrivateKey key;
-	private byte[] pemCertBytes;
-	
-	private static final Object globalCryptoLock = new Object();
-	
-	static {
-		// Install the Bouncy Castle provider
-		Security.addProvider(new BouncyCastleProvider());
-	}
-	
-	public AndroidCryptoProvider(Context c) {
-		String dataPath = c.getFilesDir().getAbsolutePath();
-		
-		certFile = new File(dataPath + File.separator + "client.crt");
-		keyFile = new File(dataPath + File.separator + "client.key");
-	}
-	
-	private byte[] loadFileToBytes(File f) {
-		if (!f.exists()) {
-			return null;
-		}
-		
-		try {
-			FileInputStream fin = new FileInputStream(f);
-			byte[] fileData = new byte[(int) f.length()];
-			if (fin.read(fileData) != f.length()) {
+    private final File certFile;
+    private final File keyFile;
+
+    private X509Certificate cert;
+    private RSAPrivateKey key;
+    private byte[] pemCertBytes;
+
+    private static final Object globalCryptoLock = new Object();
+
+    static {
+        // Install the Bouncy Castle provider
+        Security.addProvider(new BouncyCastleProvider());
+    }
+
+    public AndroidCryptoProvider(Context c) {
+        String dataPath = c.getFilesDir().getAbsolutePath();
+
+        certFile = new File(dataPath + File.separator + "client.crt");
+        keyFile = new File(dataPath + File.separator + "client.key");
+    }
+
+    private byte[] loadFileToBytes(File f) {
+        if (!f.exists()) {
+            return null;
+        }
+
+        try {
+            FileInputStream fin = new FileInputStream(f);
+            byte[] fileData = new byte[(int) f.length()];
+            if (fin.read(fileData) != f.length()) {
                 // Failed to read
                 fileData = null;
             }
-			fin.close();
-			return fileData;
-		} catch (IOException e) {
-			return null;
-		}
-	}
-	
-	private boolean loadCertKeyPair() {
-		byte[] certBytes = loadFileToBytes(certFile);
-		byte[] keyBytes = loadFileToBytes(keyFile);
-		
-		// If either file was missing, we definitely can't succeed
-		if (certBytes == null || keyBytes == null) {
-			LimeLog.info("Missing cert or key; need to generate a new one");
-			return false;
-		}
-		
-		try {
-			CertificateFactory certFactory = CertificateFactory.getInstance("X.509", "BC");
-			cert = (X509Certificate) certFactory.generateCertificate(new ByteArrayInputStream(certBytes));
-			pemCertBytes = certBytes;
-			KeyFactory keyFactory = KeyFactory.getInstance("RSA", "BC");
-			key = (RSAPrivateKey) keyFactory.generatePrivate(new PKCS8EncodedKeySpec(keyBytes));
-		} catch (CertificateException e) {
-			// May happen if the cert is corrupt
-			LimeLog.warning("Corrupted certificate");
-			return false;
-		} catch (NoSuchAlgorithmException e) {
-			// Should never happen
-			e.printStackTrace();
-			return false;
-		} catch (InvalidKeySpecException e) {
-			// May happen if the key is corrupt
-			LimeLog.warning("Corrupted key");
-			return false;
-		} catch (NoSuchProviderException e) {
-			// Should never happen
-			e.printStackTrace();
-			return false;
-		}
-		
-		return true;
-	}
-	
-	@SuppressLint("TrulyRandom")
-	private boolean generateCertKeyPair() {
-		byte[] snBytes = new byte[8];
-		new SecureRandom().nextBytes(snBytes);
-		
-		KeyPair keyPair;
-		try {
-			KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA", "BC");
-			keyPairGenerator.initialize(2048);
-			keyPair = keyPairGenerator.generateKeyPair();
-		} catch (NoSuchAlgorithmException e1) {
-			// Should never happen
-			e1.printStackTrace();
-			return false;
-		} catch (NoSuchProviderException e) {
-			// Should never happen
-			e.printStackTrace();
-			return false;
-		}
-		
-		Date now = new Date();
-		
-		// Expires in 20 years
-		Calendar calendar = Calendar.getInstance();
-		calendar.setTime(now);
-		calendar.add(Calendar.YEAR, 20);
-		Date expirationDate = calendar.getTime();
-		
-		BigInteger serial = new BigInteger(snBytes).abs();
-		
-		X500NameBuilder nameBuilder = new X500NameBuilder(BCStyle.INSTANCE);
-		nameBuilder.addRDN(BCStyle.CN, "NVIDIA GameStream Client");
-		X500Name name = nameBuilder.build();
-		
-		X509v3CertificateBuilder certBuilder = new X509v3CertificateBuilder(name, serial, now, expirationDate, Locale.ENGLISH, name,
-			SubjectPublicKeyInfo.getInstance(keyPair.getPublic().getEncoded()));
-				
-		try {
-			ContentSigner sigGen = new JcaContentSignerBuilder("SHA1withRSA").setProvider(BouncyCastleProvider.PROVIDER_NAME).build(keyPair.getPrivate());
-			cert = new JcaX509CertificateConverter().setProvider(BouncyCastleProvider.PROVIDER_NAME).getCertificate(certBuilder.build(sigGen));
-			key = (RSAPrivateKey) keyPair.getPrivate();
-		} catch (Exception e) {
-			// Nothing should go wrong here
-			e.printStackTrace();
-			return false;
-		}
-		
-		LimeLog.info("Generated a new key pair");
-		
-		// Save the resulting pair
-		saveCertKeyPair();
-		
-		return true;
-	}
-	
-	private void saveCertKeyPair() {
-		try {
-			FileOutputStream certOut = new FileOutputStream(certFile);
-			FileOutputStream keyOut = new FileOutputStream(keyFile);
-			
-			// Write the certificate in OpenSSL PEM format (important for the server)
-			StringWriter strWriter = new StringWriter();
-			JcaPEMWriter pemWriter = new JcaPEMWriter(strWriter);
-			pemWriter.writeObject(cert);
-			pemWriter.close();
-			
-			// Line endings MUST be UNIX for the PC to accept the cert properly
-			OutputStreamWriter certWriter = new OutputStreamWriter(certOut);
-			String pemStr = strWriter.getBuffer().toString();
-			for (int i = 0; i < pemStr.length(); i++) {
-				char c = pemStr.charAt(i);
-				if (c != '\r')
-					certWriter.append(c);
-			}
-			certWriter.close();
-			
-			// Write the private out in PKCS8 format
-			keyOut.write(key.getEncoded());
-			
-			certOut.close();
-			keyOut.close();
-			
-			LimeLog.info("Saved generated key pair to disk");
-		} catch (IOException e) {
-			// This isn't good because it means we'll have
-			// to re-pair next time
-			e.printStackTrace();
-		}
-	}
-	
-	public X509Certificate getClientCertificate() {
-		// Use a lock here to ensure only one guy will be generating or loading
-		// the certificate and key at a time
-		synchronized (globalCryptoLock) {
-			// Return a loaded cert if we have one
-			if (cert != null) {
-				return cert;
-			}
-			
-			// No loaded cert yet, let's see if we have one on disk
-			if (loadCertKeyPair()) {
-				// Got one
-				return cert;
-			}
-			
-			// Try to generate a new key pair
-			if (!generateCertKeyPair()) {
-				// Failed
-				return null;
-			}
-			
-			// Load the generated pair
-			loadCertKeyPair();
-			return cert;
-		}
-	}
+            fin.close();
+            return fileData;
+        } catch (IOException e) {
+            return null;
+        }
+    }
 
-	public RSAPrivateKey getClientPrivateKey() {
-		// Use a lock here to ensure only one guy will be generating or loading
-		// the certificate and key at a time
-		synchronized (globalCryptoLock) {
-			// Return a loaded key if we have one
-			if (key != null) {
-				return key;
-			}
-			
-			// No loaded key yet, let's see if we have one on disk
-			if (loadCertKeyPair()) {
-				// Got one
-				return key;
-			}
-			
-			// Try to generate a new key pair
-			if (!generateCertKeyPair()) {
-				// Failed
-				return null;
-			}
-			
-			// Load the generated pair
-			loadCertKeyPair();
-			return key;
-		}
-	}
-	
-	public byte[] getPemEncodedClientCertificate() {
-		synchronized (globalCryptoLock) {
-			// Call our helper function to do the cert loading/generation for us
-			getClientCertificate();
-			
-			// Return a cached value if we have it
-			return pemCertBytes;
-		}
-	}
+    private boolean loadCertKeyPair() {
+        byte[] certBytes = loadFileToBytes(certFile);
+        byte[] keyBytes = loadFileToBytes(keyFile);
 
-	@Override
-	public String encodeBase64String(byte[] data) {
-		return Base64.encodeToString(data, Base64.NO_WRAP);
-	}
+        // If either file was missing, we definitely can't succeed
+        if (certBytes == null || keyBytes == null) {
+            LimeLog.info("Missing cert or key; need to generate a new one");
+            return false;
+        }
+
+        try {
+            CertificateFactory certFactory = CertificateFactory.getInstance("X.509", "BC");
+            cert = (X509Certificate) certFactory.generateCertificate(new ByteArrayInputStream(certBytes));
+            pemCertBytes = certBytes;
+            KeyFactory keyFactory = KeyFactory.getInstance("RSA", "BC");
+            key = (RSAPrivateKey) keyFactory.generatePrivate(new PKCS8EncodedKeySpec(keyBytes));
+        } catch (CertificateException e) {
+            // May happen if the cert is corrupt
+            LimeLog.warning("Corrupted certificate");
+            return false;
+        } catch (NoSuchAlgorithmException e) {
+            // Should never happen
+            e.printStackTrace();
+            return false;
+        } catch (InvalidKeySpecException e) {
+            // May happen if the key is corrupt
+            LimeLog.warning("Corrupted key");
+            return false;
+        } catch (NoSuchProviderException e) {
+            // Should never happen
+            e.printStackTrace();
+            return false;
+        }
+
+        return true;
+    }
+
+    @SuppressLint("TrulyRandom")
+    private boolean generateCertKeyPair() {
+        byte[] snBytes = new byte[8];
+        new SecureRandom().nextBytes(snBytes);
+
+        KeyPair keyPair;
+        try {
+            KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA", "BC");
+            keyPairGenerator.initialize(2048);
+            keyPair = keyPairGenerator.generateKeyPair();
+        } catch (NoSuchAlgorithmException e1) {
+            // Should never happen
+            e1.printStackTrace();
+            return false;
+        } catch (NoSuchProviderException e) {
+            // Should never happen
+            e.printStackTrace();
+            return false;
+        }
+
+        Date now = new Date();
+
+        // Expires in 20 years
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(now);
+        calendar.add(Calendar.YEAR, 20);
+        Date expirationDate = calendar.getTime();
+
+        BigInteger serial = new BigInteger(snBytes).abs();
+
+        X500NameBuilder nameBuilder = new X500NameBuilder(BCStyle.INSTANCE);
+        nameBuilder.addRDN(BCStyle.CN, "NVIDIA GameStream Client");
+        X500Name name = nameBuilder.build();
+
+        X509v3CertificateBuilder certBuilder = new X509v3CertificateBuilder(name, serial, now, expirationDate, Locale.ENGLISH, name,
+            SubjectPublicKeyInfo.getInstance(keyPair.getPublic().getEncoded()));
+
+        try {
+            ContentSigner sigGen = new JcaContentSignerBuilder("SHA1withRSA").setProvider(BouncyCastleProvider.PROVIDER_NAME).build(keyPair.getPrivate());
+            cert = new JcaX509CertificateConverter().setProvider(BouncyCastleProvider.PROVIDER_NAME).getCertificate(certBuilder.build(sigGen));
+            key = (RSAPrivateKey) keyPair.getPrivate();
+        } catch (Exception e) {
+            // Nothing should go wrong here
+            e.printStackTrace();
+            return false;
+        }
+
+        LimeLog.info("Generated a new key pair");
+
+        // Save the resulting pair
+        saveCertKeyPair();
+
+        return true;
+    }
+
+    private void saveCertKeyPair() {
+        try {
+            FileOutputStream certOut = new FileOutputStream(certFile);
+            FileOutputStream keyOut = new FileOutputStream(keyFile);
+
+            // Write the certificate in OpenSSL PEM format (important for the server)
+            StringWriter strWriter = new StringWriter();
+            JcaPEMWriter pemWriter = new JcaPEMWriter(strWriter);
+            pemWriter.writeObject(cert);
+            pemWriter.close();
+
+            // Line endings MUST be UNIX for the PC to accept the cert properly
+            OutputStreamWriter certWriter = new OutputStreamWriter(certOut);
+            String pemStr = strWriter.getBuffer().toString();
+            for (int i = 0; i < pemStr.length(); i++) {
+                char c = pemStr.charAt(i);
+                if (c != '\r')
+                    certWriter.append(c);
+            }
+            certWriter.close();
+
+            // Write the private out in PKCS8 format
+            keyOut.write(key.getEncoded());
+
+            certOut.close();
+            keyOut.close();
+
+            LimeLog.info("Saved generated key pair to disk");
+        } catch (IOException e) {
+            // This isn't good because it means we'll have
+            // to re-pair next time
+            e.printStackTrace();
+        }
+    }
+
+    public X509Certificate getClientCertificate() {
+        // Use a lock here to ensure only one guy will be generating or loading
+        // the certificate and key at a time
+        synchronized (globalCryptoLock) {
+            // Return a loaded cert if we have one
+            if (cert != null) {
+                return cert;
+            }
+
+            // No loaded cert yet, let's see if we have one on disk
+            if (loadCertKeyPair()) {
+                // Got one
+                return cert;
+            }
+
+            // Try to generate a new key pair
+            if (!generateCertKeyPair()) {
+                // Failed
+                return null;
+            }
+
+            // Load the generated pair
+            loadCertKeyPair();
+            return cert;
+        }
+    }
+
+    public RSAPrivateKey getClientPrivateKey() {
+        // Use a lock here to ensure only one guy will be generating or loading
+        // the certificate and key at a time
+        synchronized (globalCryptoLock) {
+            // Return a loaded key if we have one
+            if (key != null) {
+                return key;
+            }
+
+            // No loaded key yet, let's see if we have one on disk
+            if (loadCertKeyPair()) {
+                // Got one
+                return key;
+            }
+
+            // Try to generate a new key pair
+            if (!generateCertKeyPair()) {
+                // Failed
+                return null;
+            }
+
+            // Load the generated pair
+            loadCertKeyPair();
+            return key;
+        }
+    }
+
+    public byte[] getPemEncodedClientCertificate() {
+        synchronized (globalCryptoLock) {
+            // Call our helper function to do the cert loading/generation for us
+            getClientCertificate();
+
+            // Return a cached value if we have it
+            return pemCertBytes;
+        }
+    }
+
+    @Override
+    public String encodeBase64String(byte[] data) {
+        return Base64.encodeToString(data, Base64.NO_WRAP);
+    }
 }

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;
@@ -23,8 +23,8 @@ public class KeyboardTranslator extends KeycodeTranslator {
 	public static final int VK_Z = 90;
 	public static final int VK_ALT = 18;
 	public static final int VK_NUMPAD0 = 96;
-	public static final int VK_BACK_SLASH = 92;
-	public static final int VK_CAPS_LOCK = 20;
+    public static final int VK_BACK_SLASH = 92;
+    public static final int VK_CAPS_LOCK = 20;
 	public static final int VK_CLEAR = 12;
 	public static final int VK_COMMA = 44;
 	public static final int VK_CONTROL = 17;

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

@@ -4,94 +4,95 @@ import com.limelight.nvstream.NvConnection;
 import com.limelight.nvstream.input.MouseButtonPacket;
 
 public class TouchContext {
-	private int lastTouchX = 0;
-	private int lastTouchY = 0;
-	private int originalTouchX = 0;
-	private int originalTouchY = 0;
-	private long originalTouchTime = 0;
+    private int lastTouchX = 0;
+    private int lastTouchY = 0;
+    private int originalTouchX = 0;
+    private int originalTouchY = 0;
+    private long originalTouchTime = 0;
     private boolean cancelled;
-	
-	private NvConnection conn;
-	private int actionIndex;
-    private double xFactor, yFactor;
-	
-	private static final int TAP_MOVEMENT_THRESHOLD = 10;
-	private static final int TAP_TIME_THRESHOLD = 250;
-	
-	public TouchContext(NvConnection conn, int actionIndex, double xFactor, double yFactor)
-	{
-		this.conn = conn;
-		this.actionIndex = actionIndex;
+
+    private final NvConnection conn;
+    private final int actionIndex;
+    private final double xFactor;
+    private final double yFactor;
+
+    private static final int TAP_MOVEMENT_THRESHOLD = 10;
+    private static final int TAP_TIME_THRESHOLD = 250;
+
+    public TouchContext(NvConnection conn, int actionIndex, double xFactor, double yFactor)
+    {
+        this.conn = conn;
+        this.actionIndex = actionIndex;
         this.xFactor = xFactor;
         this.yFactor = yFactor;
-	}
+    }
 
     public int getActionIndex()
     {
         return actionIndex;
     }
-	
-	private boolean isTap()
-	{
-		int xDelta = Math.abs(lastTouchX - originalTouchX);
-		int yDelta = Math.abs(lastTouchY - originalTouchY);
-		long timeDelta = System.currentTimeMillis() - originalTouchTime;
-		
-		return xDelta <= TAP_MOVEMENT_THRESHOLD &&
-				yDelta <= TAP_MOVEMENT_THRESHOLD &&
-				timeDelta <= TAP_TIME_THRESHOLD;
-	}
-	
-	private byte getMouseButtonIndex()
-	{
-		if (actionIndex == 1) {
-			return MouseButtonPacket.BUTTON_RIGHT;
-		}
-		else {
-			return MouseButtonPacket.BUTTON_LEFT;
-		}
-	}
-	
-	public boolean touchDownEvent(int eventX, int eventY)
-	{
-		originalTouchX = lastTouchX = eventX;
-		originalTouchY = lastTouchY = eventY;
-		originalTouchTime = System.currentTimeMillis();
+
+    private boolean isTap()
+    {
+        int xDelta = Math.abs(lastTouchX - originalTouchX);
+        int yDelta = Math.abs(lastTouchY - originalTouchY);
+        long timeDelta = System.currentTimeMillis() - originalTouchTime;
+
+        return xDelta <= TAP_MOVEMENT_THRESHOLD &&
+                yDelta <= TAP_MOVEMENT_THRESHOLD &&
+                timeDelta <= TAP_TIME_THRESHOLD;
+    }
+
+    private byte getMouseButtonIndex()
+    {
+        if (actionIndex == 1) {
+            return MouseButtonPacket.BUTTON_RIGHT;
+        }
+        else {
+            return MouseButtonPacket.BUTTON_LEFT;
+        }
+    }
+
+    public boolean touchDownEvent(int eventX, int eventY)
+    {
+        originalTouchX = lastTouchX = eventX;
+        originalTouchY = lastTouchY = eventY;
+        originalTouchTime = System.currentTimeMillis();
         cancelled = false;
 
         return true;
-	}
-	
-	public void touchUpEvent(int eventX, int eventY)
-	{
+    }
+
+    public void touchUpEvent(int eventX, int eventY)
+    {
         if (cancelled) {
             return;
         }
 
-		if (isTap())
-		{
-			byte buttonIndex = getMouseButtonIndex();
-			
-			// Lower the mouse button
-			conn.sendMouseButtonDown(buttonIndex);
-			
-			// We need to sleep a bit here because some games
-			// do input detection by polling
-			try {
-				Thread.sleep(100);
-			} catch (InterruptedException ignored) {}
-			
-			// Raise the mouse button
-			conn.sendMouseButtonUp(buttonIndex);
-		}
-	}
-	
-	public boolean touchMoveEvent(int eventX, int eventY)
+        if (isTap())
+        {
+            byte buttonIndex = getMouseButtonIndex();
+
+            // Lower the mouse button
+            conn.sendMouseButtonDown(buttonIndex);
+
+            // We need to sleep a bit here because some games
+            // do input detection by polling
+            try {
+                Thread.sleep(100);
+            } catch (InterruptedException ignored) {}
+
+            // Raise the mouse button
+            conn.sendMouseButtonUp(buttonIndex);
+        }
+    }
+
+    public boolean touchMoveEvent(int eventX, int eventY)
     {
         if (eventX != lastTouchX || eventY != lastTouchY)
-		{
-			// We only send moves for the primary touch point
-			if (actionIndex == 0) {
+        {
+            // We only send moves for the primary touch point
+            if (actionIndex == 0) {
                 int deltaX = eventX - lastTouchX;
                 int deltaY = eventY - lastTouchY;
 
@@ -99,15 +100,15 @@ public class TouchContext {
                 deltaX = (int)Math.round((double)deltaX * xFactor);
                 deltaY = (int)Math.round((double)deltaY * yFactor);
 
-				conn.sendMouseMove((short)deltaX, (short)deltaY);
-			}
-			
-			lastTouchX = eventX;
-			lastTouchY = eventY;
-		}
-		
-		return true;
-	}
+                conn.sendMouseMove((short)deltaX, (short)deltaY);
+            }
+
+            lastTouchX = eventX;
+            lastTouchY = eventY;
+        }
+
+        return true;
+    }
 
     public void cancelTouch() {
         cancelled = true;

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

@@ -1,41 +1,41 @@
 package com.limelight.binding.input.evdev;
 
 public class EvdevEvent {
-	public static final int EVDEV_MIN_EVENT_SIZE = 16;
-	public static final int EVDEV_MAX_EVENT_SIZE = 24;
-	
-	/* Event types */
-	public static final short EV_SYN = 0x00;
-	public static final short EV_KEY = 0x01;
-	public static final short EV_REL = 0x02;
-	public static final short EV_MSC = 0x04;
-	
-	/* Relative axes */
-	public static final short REL_X = 0x00;
-	public static final short REL_Y = 0x01;
-	public static final short REL_WHEEL = 0x08;
-	
-	/* Buttons */
-	public static final short BTN_LEFT = 0x110;
-	public static final short BTN_RIGHT = 0x111;
-	public static final short BTN_MIDDLE = 0x112;
-	public static final short BTN_SIDE = 0x113;
-	public static final short BTN_EXTRA = 0x114;
-	public static final short BTN_FORWARD = 0x115;
-	public static final short BTN_BACK = 0x116;
-	public static final short BTN_TASK = 0x117;
-	public static final short BTN_GAMEPAD = 0x130;
-	
-	/* Keys */
-	public static final short KEY_Q = 16;
-	
-	public short type;
-	public short code;
-	public int value;
-	
-	public EvdevEvent(short type, short code, int value) {
-		this.type = type;
-		this.code = code;
-		this.value = value;
-	}
+    public static final int EVDEV_MIN_EVENT_SIZE = 16;
+    public static final int EVDEV_MAX_EVENT_SIZE = 24;
+
+    /* Event types */
+    public static final short EV_SYN = 0x00;
+    public static final short EV_KEY = 0x01;
+    public static final short EV_REL = 0x02;
+    public static final short EV_MSC = 0x04;
+
+    /* Relative axes */
+    public static final short REL_X = 0x00;
+    public static final short REL_Y = 0x01;
+    public static final short REL_WHEEL = 0x08;
+
+    /* Buttons */
+    public static final short BTN_LEFT = 0x110;
+    public static final short BTN_RIGHT = 0x111;
+    public static final short BTN_MIDDLE = 0x112;
+    public static final short BTN_SIDE = 0x113;
+    public static final short BTN_EXTRA = 0x114;
+    public static final short BTN_FORWARD = 0x115;
+    public static final short BTN_BACK = 0x116;
+    public static final short BTN_TASK = 0x117;
+    public static final short BTN_GAMEPAD = 0x130;
+
+    /* Keys */
+    public static final short KEY_Q = 16;
+
+    public final short type;
+    public final short code;
+    public final int value;
+
+    public EvdevEvent(short type, short code, int value) {
+        this.type = type;
+        this.code = code;
+        this.value = value;
+    }
 }

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

@@ -7,161 +7,161 @@ import com.limelight.LimeLog;
 
 public class EvdevHandler {
 
-	private String absolutePath;
-	private EvdevListener listener;
-	private boolean shutdown = false;
-	private int fd = -1;
-	
-	private Thread handlerThread = new Thread() {
-		@Override
-		public void run() {
-			// All the finally blocks here make this code look like a mess
-			// but it's important that we get this right to avoid causing
-			// system-wide input problems.
-			
-			// Open the /dev/input/eventX file
-			fd = EvdevReader.open(absolutePath);
-			if (fd == -1) {
-				LimeLog.warning("Unable to open "+absolutePath);
-				return;
-			}
+    private final String absolutePath;
+    private final EvdevListener listener;
+    private boolean shutdown = false;
+    private int fd = -1;
 
-			try {
-				// Check if it's a mouse or keyboard, but not a gamepad
-				if ((!EvdevReader.isMouse(fd) && !EvdevReader.isAlphaKeyboard(fd)) ||
-					EvdevReader.isGamepad(fd)) {
-					// We only handle keyboards and mice
-					return;
-				}
+    private final Thread handlerThread = new Thread() {
+        @Override
+        public void run() {
+            // All the finally blocks here make this code look like a mess
+            // but it's important that we get this right to avoid causing
+            // system-wide input problems.
 
-				// Grab it for ourselves
-				if (!EvdevReader.grab(fd)) {
-					LimeLog.warning("Unable to grab "+absolutePath);
-					return;
-				}
+            // Open the /dev/input/eventX file
+            fd = EvdevReader.open(absolutePath);
+            if (fd == -1) {
+                LimeLog.warning("Unable to open "+absolutePath);
+                return;
+            }
 
-				LimeLog.info("Grabbed device for raw keyboard/mouse input: "+absolutePath);
+            try {
+                // Check if it's a mouse or keyboard, but not a gamepad
+                if ((!EvdevReader.isMouse(fd) && !EvdevReader.isAlphaKeyboard(fd)) ||
+                    EvdevReader.isGamepad(fd)) {
+                    // We only handle keyboards and mice
+                    return;
+                }
 
-				ByteBuffer buffer = ByteBuffer.allocate(EvdevEvent.EVDEV_MAX_EVENT_SIZE).order(ByteOrder.nativeOrder());
+                // Grab it for ourselves
+                if (!EvdevReader.grab(fd)) {
+                    LimeLog.warning("Unable to grab "+absolutePath);
+                    return;
+                }
 
-				try {
-					int deltaX = 0;
-					int deltaY = 0;
-					byte deltaScroll = 0;
+                LimeLog.info("Grabbed device for raw keyboard/mouse input: "+absolutePath);
 
-					while (!isInterrupted() && !shutdown) {
-						EvdevEvent event = EvdevReader.read(fd, buffer);
-						if (event == null) {
-							return;
-						}
+                ByteBuffer buffer = ByteBuffer.allocate(EvdevEvent.EVDEV_MAX_EVENT_SIZE).order(ByteOrder.nativeOrder());
 
-						switch (event.type)
-						{
-						case EvdevEvent.EV_SYN:
-							if (deltaX != 0 || deltaY != 0) {
-								listener.mouseMove(deltaX, deltaY);
-								deltaX = deltaY = 0;
-							}
-							if (deltaScroll != 0) {
-								listener.mouseScroll(deltaScroll);
-								deltaScroll = 0;
-							}
-							break;
+                try {
+                    int deltaX = 0;
+                    int deltaY = 0;
+                    byte deltaScroll = 0;
 
-						case EvdevEvent.EV_REL:
-							switch (event.code)
-							{
-							case EvdevEvent.REL_X:
-								deltaX = event.value;
-								break;
-							case EvdevEvent.REL_Y:
-								deltaY = event.value;
-								break;
-							case EvdevEvent.REL_WHEEL:
-								deltaScroll = (byte) event.value;
-								break;
-							}
-							break;
+                    while (!isInterrupted() && !shutdown) {
+                        EvdevEvent event = EvdevReader.read(fd, buffer);
+                        if (event == null) {
+                            return;
+                        }
 
-						case EvdevEvent.EV_KEY:
-							switch (event.code)
-							{
-							case EvdevEvent.BTN_LEFT:
-								listener.mouseButtonEvent(EvdevListener.BUTTON_LEFT,
-										event.value != 0);
-								break;
-							case EvdevEvent.BTN_MIDDLE:
-								listener.mouseButtonEvent(EvdevListener.BUTTON_MIDDLE,
-										event.value != 0);
-								break;
-							case EvdevEvent.BTN_RIGHT:
-								listener.mouseButtonEvent(EvdevListener.BUTTON_RIGHT,
-										event.value != 0);
-								break;
-								
-							case EvdevEvent.BTN_SIDE:
-							case EvdevEvent.BTN_EXTRA:
-							case EvdevEvent.BTN_FORWARD:
-							case EvdevEvent.BTN_BACK:
-							case EvdevEvent.BTN_TASK:
-								// Other unhandled mouse buttons
-								break;
-								
-							default:
-								// We got some unrecognized button. This means
-								// someone is trying to use the other device in this
-								// "combination" input device. We'll try to handle
-								// it via keyboard, but we're not going to disconnect
-								// if we can't
-								short keyCode = EvdevTranslator.translateEvdevKeyCode(event.code);
-								if (keyCode != 0) {
-									listener.keyboardEvent(event.value != 0, keyCode);
-								}
-								break;
-							}
-							break;
-							
-						case EvdevEvent.EV_MSC:
-							break;
-						}
-					}
-				} finally {
-					// Release our grab
-					EvdevReader.ungrab(fd);
-				}
-			} finally {
-				// Close the file
-				EvdevReader.close(fd);
-			}
-		}
-	};
-	
-	public EvdevHandler(String absolutePath, EvdevListener listener) {
-		this.absolutePath = absolutePath;
-		this.listener = listener;
-	}
-	
-	public void start() {
-		handlerThread.start();
-	}
-	
-	public void stop() {
-		// Close the fd. It doesn't matter if this races
-		// with the handler thread. We'll close this out from
-		// under the thread to wake it up
-		if (fd != -1) {
-			EvdevReader.close(fd);
-		}
-		
-		shutdown = true;
-		handlerThread.interrupt();
-		
-		try {
-			handlerThread.join();
-		} catch (InterruptedException ignored) {}
-	}
-	
-	public void notifyDeleted() {
-		stop();
-	}
+                        switch (event.type)
+                        {
+                        case EvdevEvent.EV_SYN:
+                            if (deltaX != 0 || deltaY != 0) {
+                                listener.mouseMove(deltaX, deltaY);
+                                deltaX = deltaY = 0;
+                            }
+                            if (deltaScroll != 0) {
+                                listener.mouseScroll(deltaScroll);
+                                deltaScroll = 0;
+                            }
+                            break;
+
+                        case EvdevEvent.EV_REL:
+                            switch (event.code)
+                            {
+                            case EvdevEvent.REL_X:
+                                deltaX = event.value;
+                                break;
+                            case EvdevEvent.REL_Y:
+                                deltaY = event.value;
+                                break;
+                            case EvdevEvent.REL_WHEEL:
+                                deltaScroll = (byte) event.value;
+                                break;
+                            }
+                            break;
+
+                        case EvdevEvent.EV_KEY:
+                            switch (event.code)
+                            {
+                            case EvdevEvent.BTN_LEFT:
+                                listener.mouseButtonEvent(EvdevListener.BUTTON_LEFT,
+                                        event.value != 0);
+                                break;
+                            case EvdevEvent.BTN_MIDDLE:
+                                listener.mouseButtonEvent(EvdevListener.BUTTON_MIDDLE,
+                                        event.value != 0);
+                                break;
+                            case EvdevEvent.BTN_RIGHT:
+                                listener.mouseButtonEvent(EvdevListener.BUTTON_RIGHT,
+                                        event.value != 0);
+                                break;
+
+                            case EvdevEvent.BTN_SIDE:
+                            case EvdevEvent.BTN_EXTRA:
+                            case EvdevEvent.BTN_FORWARD:
+                            case EvdevEvent.BTN_BACK:
+                            case EvdevEvent.BTN_TASK:
+                                // Other unhandled mouse buttons
+                                break;
+
+                            default:
+                                // We got some unrecognized button. This means
+                                // someone is trying to use the other device in this
+                                // "combination" input device. We'll try to handle
+                                // it via keyboard, but we're not going to disconnect
+                                // if we can't
+                                short keyCode = EvdevTranslator.translateEvdevKeyCode(event.code);
+                                if (keyCode != 0) {
+                                    listener.keyboardEvent(event.value != 0, keyCode);
+                                }
+                                break;
+                            }
+                            break;
+
+                        case EvdevEvent.EV_MSC:
+                            break;
+                        }
+                    }
+                } finally {
+                    // Release our grab
+                    EvdevReader.ungrab(fd);
+                }
+            } finally {
+                // Close the file
+                EvdevReader.close(fd);
+            }
+        }
+    };
+
+    public EvdevHandler(String absolutePath, EvdevListener listener) {
+        this.absolutePath = absolutePath;
+        this.listener = listener;
+    }
+
+    public void start() {
+        handlerThread.start();
+    }
+
+    public void stop() {
+        // Close the fd. It doesn't matter if this races
+        // with the handler thread. We'll close this out from
+        // under the thread to wake it up
+        if (fd != -1) {
+            EvdevReader.close(fd);
+        }
+
+        shutdown = true;
+        handlerThread.interrupt();
+
+        try {
+            handlerThread.join();
+        } catch (InterruptedException ignored) {}
+    }
+
+    public void notifyDeleted() {
+        stop();
+    }
 }

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

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

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

@@ -8,9 +8,9 @@ import java.util.Locale;
 import com.limelight.LimeLog;
 
 public class EvdevReader {
-	static {
-		System.loadLibrary("evdev_reader");
-	}
+    static {
+        System.loadLibrary("evdev_reader");
+    }
 
     public static void patchSeLinuxPolicies() {
         //
@@ -26,80 +26,80 @@ 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 }\"");
         }
     }
-	
-	// Requires root to chmod /dev/input/eventX
-	public static void setPermissions(String[] files, int octalPermissions) {
+
+    // Requires root to chmod /dev/input/eventX
+    public static void setPermissions(String[] files, int octalPermissions) {
         EvdevShell shell = EvdevShell.getInstance();
 
         for (String file : files) {
             shell.runCommand(String.format((Locale)null, "chmod %o %s", octalPermissions, file));
         }
-	}
-	
-	// Returns the fd to be passed to other function or -1 on error
-	public static native int open(String fileName);
-	
-	// Prevent other apps (including Android itself) from using the device while "grabbed"
-	public static native boolean grab(int fd);
-	public static native boolean ungrab(int fd);
-	
-	// Used for checking device capabilities
-	public static native boolean hasRelAxis(int fd, short axis);
-	public static native boolean hasAbsAxis(int fd, short axis);
-	public static native boolean hasKey(int fd, short key);
-	
-	public static boolean isMouse(int fd) {
-		// This is the same check that Android does in EventHub.cpp
-		return hasRelAxis(fd, EvdevEvent.REL_X) &&
-				hasRelAxis(fd, EvdevEvent.REL_Y) &&
-				hasKey(fd, EvdevEvent.BTN_LEFT);
-	}
-	
-	public static boolean isAlphaKeyboard(int fd) {
-		// This is the same check that Android does in EventHub.cpp
-		return hasKey(fd, EvdevEvent.KEY_Q);
-	}
-	
-	public static boolean isGamepad(int fd) {
-		return hasKey(fd, EvdevEvent.BTN_GAMEPAD);
-	}
-	
-	// Returns the bytes read or -1 on error
-	private static native int read(int fd, byte[] buffer);
-	
-	// Takes a byte buffer to use to read the output into.
-	// This buffer MUST be in native byte order and at least
-	// EVDEV_MAX_EVENT_SIZE bytes long.
-	public static EvdevEvent read(int fd, ByteBuffer buffer) {
-		int bytesRead = read(fd, buffer.array());
-		if (bytesRead < 0) {
-			LimeLog.warning("Failed to read: "+bytesRead);
-			return null;
-		}
-		else if (bytesRead < EvdevEvent.EVDEV_MIN_EVENT_SIZE) {
-			LimeLog.warning("Short read: "+bytesRead);
-			return null;
-		}
-		
-		buffer.limit(bytesRead);
-		buffer.rewind();
-		
-		// Throw away the time stamp
-		if (bytesRead == EvdevEvent.EVDEV_MAX_EVENT_SIZE) {
-			buffer.getLong();
-			buffer.getLong();
-		} else {
-			buffer.getInt();
-			buffer.getInt();
-		}
-		
-		return new EvdevEvent(buffer.getShort(), buffer.getShort(), buffer.getInt());
-	}
-	
-	// Closes the fd from open()
-	public static native int close(int fd);
+    }
+
+    // Returns the fd to be passed to other function or -1 on error
+    public static native int open(String fileName);
+
+    // Prevent other apps (including Android itself) from using the device while "grabbed"
+    public static native boolean grab(int fd);
+    public static native boolean ungrab(int fd);
+
+    // Used for checking device capabilities
+    public static native boolean hasRelAxis(int fd, short axis);
+    public static native boolean hasAbsAxis(int fd, short axis);
+    public static native boolean hasKey(int fd, short key);
+
+    public static boolean isMouse(int fd) {
+        // This is the same check that Android does in EventHub.cpp
+        return hasRelAxis(fd, EvdevEvent.REL_X) &&
+                hasRelAxis(fd, EvdevEvent.REL_Y) &&
+                hasKey(fd, EvdevEvent.BTN_LEFT);
+    }
+
+    public static boolean isAlphaKeyboard(int fd) {
+        // This is the same check that Android does in EventHub.cpp
+        return hasKey(fd, EvdevEvent.KEY_Q);
+    }
+
+    public static boolean isGamepad(int fd) {
+        return hasKey(fd, EvdevEvent.BTN_GAMEPAD);
+    }
+
+    // Returns the bytes read or -1 on error
+    private static native int read(int fd, byte[] buffer);
+
+    // Takes a byte buffer to use to read the output into.
+    // This buffer MUST be in native byte order and at least
+    // EVDEV_MAX_EVENT_SIZE bytes long.
+    public static EvdevEvent read(int fd, ByteBuffer buffer) {
+        int bytesRead = read(fd, buffer.array());
+        if (bytesRead < 0) {
+            LimeLog.warning("Failed to read: "+bytesRead);
+            return null;
+        }
+        else if (bytesRead < EvdevEvent.EVDEV_MIN_EVENT_SIZE) {
+            LimeLog.warning("Short read: "+bytesRead);
+            return null;
+        }
+
+        buffer.limit(bytesRead);
+        buffer.rewind();
+
+        // Throw away the time stamp
+        if (bytesRead == EvdevEvent.EVDEV_MAX_EVENT_SIZE) {
+            buffer.getLong();
+            buffer.getLong();
+        } else {
+            buffer.getInt();
+            buffer.getInt();
+        }
+
+        return new EvdevEvent(buffer.getShort(), buffer.getShort(), buffer.getInt());
+    }
+
+    // Closes the fd from open()
+    public static native int close(int fd);
 }

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

@@ -4,136 +4,136 @@ import android.view.KeyEvent;
 
 public class EvdevTranslator {
 
-	public static final short EVDEV_KEY_CODES[] = {
-		0, //KeyEvent.VK_RESERVED
-		KeyEvent.KEYCODE_ESCAPE,
-		KeyEvent.KEYCODE_1,
-		KeyEvent.KEYCODE_2,
-		KeyEvent.KEYCODE_3,
-		KeyEvent.KEYCODE_4,
-		KeyEvent.KEYCODE_5,
-		KeyEvent.KEYCODE_6,
-		KeyEvent.KEYCODE_7,
-		KeyEvent.KEYCODE_8,
-		KeyEvent.KEYCODE_9,
-		KeyEvent.KEYCODE_0,
-		KeyEvent.KEYCODE_MINUS,
-		KeyEvent.KEYCODE_EQUALS,
-		KeyEvent.KEYCODE_DEL,
-		KeyEvent.KEYCODE_TAB,
-		KeyEvent.KEYCODE_Q,
-		KeyEvent.KEYCODE_W,
-		KeyEvent.KEYCODE_E,
-		KeyEvent.KEYCODE_R,
-		KeyEvent.KEYCODE_T,
-		KeyEvent.KEYCODE_Y,
-		KeyEvent.KEYCODE_U,
-		KeyEvent.KEYCODE_I,
-		KeyEvent.KEYCODE_O,
-		KeyEvent.KEYCODE_P,
-		KeyEvent.KEYCODE_LEFT_BRACKET,
-		KeyEvent.KEYCODE_RIGHT_BRACKET,
-		KeyEvent.KEYCODE_ENTER,
-		KeyEvent.KEYCODE_CTRL_LEFT,
-		KeyEvent.KEYCODE_A,
-		KeyEvent.KEYCODE_S,
-		KeyEvent.KEYCODE_D,
-		KeyEvent.KEYCODE_F,
-		KeyEvent.KEYCODE_G,
-		KeyEvent.KEYCODE_H,
-		KeyEvent.KEYCODE_J,
-		KeyEvent.KEYCODE_K,
-		KeyEvent.KEYCODE_L,
-		KeyEvent.KEYCODE_SEMICOLON,
-		KeyEvent.KEYCODE_APOSTROPHE,
-		KeyEvent.KEYCODE_GRAVE,
-		KeyEvent.KEYCODE_SHIFT_LEFT,
-		KeyEvent.KEYCODE_BACKSLASH,
-		KeyEvent.KEYCODE_Z,
-		KeyEvent.KEYCODE_X,
-		KeyEvent.KEYCODE_C,
-		KeyEvent.KEYCODE_V,
-		KeyEvent.KEYCODE_B,
-		KeyEvent.KEYCODE_N,
-		KeyEvent.KEYCODE_M,
-		KeyEvent.KEYCODE_COMMA,
-		KeyEvent.KEYCODE_PERIOD,
-		KeyEvent.KEYCODE_SLASH,
-		KeyEvent.KEYCODE_SHIFT_RIGHT,
-		KeyEvent.KEYCODE_NUMPAD_MULTIPLY,
-		KeyEvent.KEYCODE_ALT_LEFT,
-		KeyEvent.KEYCODE_SPACE,
-		KeyEvent.KEYCODE_CAPS_LOCK,
-		KeyEvent.KEYCODE_F1,
-		KeyEvent.KEYCODE_F2,
-		KeyEvent.KEYCODE_F3,
-		KeyEvent.KEYCODE_F4,
-		KeyEvent.KEYCODE_F5,
-		KeyEvent.KEYCODE_F6,
-		KeyEvent.KEYCODE_F7,
-		KeyEvent.KEYCODE_F8,
-		KeyEvent.KEYCODE_F9,
-		KeyEvent.KEYCODE_F10,
-		KeyEvent.KEYCODE_NUM_LOCK,
-		KeyEvent.KEYCODE_SCROLL_LOCK,
-		KeyEvent.KEYCODE_NUMPAD_7,
-		KeyEvent.KEYCODE_NUMPAD_8,
-		KeyEvent.KEYCODE_NUMPAD_9,
-		KeyEvent.KEYCODE_NUMPAD_SUBTRACT,
-		KeyEvent.KEYCODE_NUMPAD_4,
-		KeyEvent.KEYCODE_NUMPAD_5,
-		KeyEvent.KEYCODE_NUMPAD_6,
-		KeyEvent.KEYCODE_NUMPAD_ADD,
-		KeyEvent.KEYCODE_NUMPAD_1,
-		KeyEvent.KEYCODE_NUMPAD_2,
-		KeyEvent.KEYCODE_NUMPAD_3,
-		KeyEvent.KEYCODE_NUMPAD_0,
-		KeyEvent.KEYCODE_NUMPAD_DOT,
-		0,
-		0, //KeyEvent.VK_ZENKAKUHANKAKU,
-		0, //KeyEvent.VK_102ND,
-		KeyEvent.KEYCODE_F11,
-		KeyEvent.KEYCODE_F12,
-		0, //KeyEvent.VK_RO,
-		0, //KeyEvent.VK_KATAKANA,
-		0, //KeyEvent.VK_HIRAGANA,
-		0, //KeyEvent.VK_HENKAN,
-		0, //KeyEvent.VK_KATAKANAHIRAGANA,
-		0, //KeyEvent.VK_MUHENKAN,
-		0, //KeyEvent.VK_KPJPCOMMA,
-		KeyEvent.KEYCODE_NUMPAD_ENTER,
-		KeyEvent.KEYCODE_CTRL_RIGHT,
-		KeyEvent.KEYCODE_NUMPAD_DIVIDE,
-		KeyEvent.KEYCODE_SYSRQ,
-		KeyEvent.KEYCODE_ALT_RIGHT,
-		0, //KeyEvent.VK_LINEFEED,
-		KeyEvent.KEYCODE_HOME,
-		KeyEvent.KEYCODE_DPAD_UP,
-		KeyEvent.KEYCODE_PAGE_UP,
-		KeyEvent.KEYCODE_DPAD_LEFT,
-		KeyEvent.KEYCODE_DPAD_RIGHT,
-		KeyEvent.KEYCODE_MOVE_END,
-		KeyEvent.KEYCODE_DPAD_DOWN,
-		KeyEvent.KEYCODE_PAGE_DOWN,
-		KeyEvent.KEYCODE_INSERT,
-		KeyEvent.KEYCODE_FORWARD_DEL,
-		0, //KeyEvent.VK_MACRO,
-		0, //KeyEvent.VK_MUTE,
-		0, //KeyEvent.VK_VOLUMEDOWN,
-		0, //KeyEvent.VK_VOLUMEUP,
-		0, //KeyEvent.VK_POWER, /* SC System Power Down */
-		KeyEvent.KEYCODE_NUMPAD_EQUALS,
-		0, //KeyEvent.VK_KPPLUSMINUS,
-		KeyEvent.KEYCODE_BREAK,
-		0, //KeyEvent.VK_SCALE, /* AL Compiz Scale (Expose) */
-	};
-	
-	public static short translateEvdevKeyCode(short evdevKeyCode) {
-		if (evdevKeyCode < EVDEV_KEY_CODES.length) {
-			return EVDEV_KEY_CODES[evdevKeyCode];
-		}
-		
-		return 0;
-	}
+    private static final short[] EVDEV_KEY_CODES = {
+        0, //KeyEvent.VK_RESERVED
+        KeyEvent.KEYCODE_ESCAPE,
+        KeyEvent.KEYCODE_1,
+        KeyEvent.KEYCODE_2,
+        KeyEvent.KEYCODE_3,
+        KeyEvent.KEYCODE_4,
+        KeyEvent.KEYCODE_5,
+        KeyEvent.KEYCODE_6,
+        KeyEvent.KEYCODE_7,
+        KeyEvent.KEYCODE_8,
+        KeyEvent.KEYCODE_9,
+        KeyEvent.KEYCODE_0,
+        KeyEvent.KEYCODE_MINUS,
+        KeyEvent.KEYCODE_EQUALS,
+        KeyEvent.KEYCODE_DEL,
+        KeyEvent.KEYCODE_TAB,
+        KeyEvent.KEYCODE_Q,
+        KeyEvent.KEYCODE_W,
+        KeyEvent.KEYCODE_E,
+        KeyEvent.KEYCODE_R,
+        KeyEvent.KEYCODE_T,
+        KeyEvent.KEYCODE_Y,
+        KeyEvent.KEYCODE_U,
+        KeyEvent.KEYCODE_I,
+        KeyEvent.KEYCODE_O,
+        KeyEvent.KEYCODE_P,
+        KeyEvent.KEYCODE_LEFT_BRACKET,
+        KeyEvent.KEYCODE_RIGHT_BRACKET,
+        KeyEvent.KEYCODE_ENTER,
+        KeyEvent.KEYCODE_CTRL_LEFT,
+        KeyEvent.KEYCODE_A,
+        KeyEvent.KEYCODE_S,
+        KeyEvent.KEYCODE_D,
+        KeyEvent.KEYCODE_F,
+        KeyEvent.KEYCODE_G,
+        KeyEvent.KEYCODE_H,
+        KeyEvent.KEYCODE_J,
+        KeyEvent.KEYCODE_K,
+        KeyEvent.KEYCODE_L,
+        KeyEvent.KEYCODE_SEMICOLON,
+        KeyEvent.KEYCODE_APOSTROPHE,
+        KeyEvent.KEYCODE_GRAVE,
+        KeyEvent.KEYCODE_SHIFT_LEFT,
+        KeyEvent.KEYCODE_BACKSLASH,
+        KeyEvent.KEYCODE_Z,
+        KeyEvent.KEYCODE_X,
+        KeyEvent.KEYCODE_C,
+        KeyEvent.KEYCODE_V,
+        KeyEvent.KEYCODE_B,
+        KeyEvent.KEYCODE_N,
+        KeyEvent.KEYCODE_M,
+        KeyEvent.KEYCODE_COMMA,
+        KeyEvent.KEYCODE_PERIOD,
+        KeyEvent.KEYCODE_SLASH,
+        KeyEvent.KEYCODE_SHIFT_RIGHT,
+        KeyEvent.KEYCODE_NUMPAD_MULTIPLY,
+        KeyEvent.KEYCODE_ALT_LEFT,
+        KeyEvent.KEYCODE_SPACE,
+        KeyEvent.KEYCODE_CAPS_LOCK,
+        KeyEvent.KEYCODE_F1,
+        KeyEvent.KEYCODE_F2,
+        KeyEvent.KEYCODE_F3,
+        KeyEvent.KEYCODE_F4,
+        KeyEvent.KEYCODE_F5,
+        KeyEvent.KEYCODE_F6,
+        KeyEvent.KEYCODE_F7,
+        KeyEvent.KEYCODE_F8,
+        KeyEvent.KEYCODE_F9,
+        KeyEvent.KEYCODE_F10,
+        KeyEvent.KEYCODE_NUM_LOCK,
+        KeyEvent.KEYCODE_SCROLL_LOCK,
+        KeyEvent.KEYCODE_NUMPAD_7,
+        KeyEvent.KEYCODE_NUMPAD_8,
+        KeyEvent.KEYCODE_NUMPAD_9,
+        KeyEvent.KEYCODE_NUMPAD_SUBTRACT,
+        KeyEvent.KEYCODE_NUMPAD_4,
+        KeyEvent.KEYCODE_NUMPAD_5,
+        KeyEvent.KEYCODE_NUMPAD_6,
+        KeyEvent.KEYCODE_NUMPAD_ADD,
+        KeyEvent.KEYCODE_NUMPAD_1,
+        KeyEvent.KEYCODE_NUMPAD_2,
+        KeyEvent.KEYCODE_NUMPAD_3,
+        KeyEvent.KEYCODE_NUMPAD_0,
+        KeyEvent.KEYCODE_NUMPAD_DOT,
+        0,
+        0, //KeyEvent.VK_ZENKAKUHANKAKU,
+        0, //KeyEvent.VK_102ND,
+        KeyEvent.KEYCODE_F11,
+        KeyEvent.KEYCODE_F12,
+        0, //KeyEvent.VK_RO,
+        0, //KeyEvent.VK_KATAKANA,
+        0, //KeyEvent.VK_HIRAGANA,
+        0, //KeyEvent.VK_HENKAN,
+        0, //KeyEvent.VK_KATAKANAHIRAGANA,
+        0, //KeyEvent.VK_MUHENKAN,
+        0, //KeyEvent.VK_KPJPCOMMA,
+        KeyEvent.KEYCODE_NUMPAD_ENTER,
+        KeyEvent.KEYCODE_CTRL_RIGHT,
+        KeyEvent.KEYCODE_NUMPAD_DIVIDE,
+        KeyEvent.KEYCODE_SYSRQ,
+        KeyEvent.KEYCODE_ALT_RIGHT,
+        0, //KeyEvent.VK_LINEFEED,
+        KeyEvent.KEYCODE_HOME,
+        KeyEvent.KEYCODE_DPAD_UP,
+        KeyEvent.KEYCODE_PAGE_UP,
+        KeyEvent.KEYCODE_DPAD_LEFT,
+        KeyEvent.KEYCODE_DPAD_RIGHT,
+        KeyEvent.KEYCODE_MOVE_END,
+        KeyEvent.KEYCODE_DPAD_DOWN,
+        KeyEvent.KEYCODE_PAGE_DOWN,
+        KeyEvent.KEYCODE_INSERT,
+        KeyEvent.KEYCODE_FORWARD_DEL,
+        0, //KeyEvent.VK_MACRO,
+        0, //KeyEvent.VK_MUTE,
+        0, //KeyEvent.VK_VOLUMEDOWN,
+        0, //KeyEvent.VK_VOLUMEUP,
+        0, //KeyEvent.VK_POWER, /* SC System Power Down */
+        KeyEvent.KEYCODE_NUMPAD_EQUALS,
+        0, //KeyEvent.VK_KPPLUSMINUS,
+        KeyEvent.KEYCODE_BREAK,
+        0, //KeyEvent.VK_SCALE, /* AL Compiz Scale (Expose) */
+    };
+
+    public static short translateEvdevKeyCode(short evdevKeyCode) {
+        if (evdevKeyCode < EVDEV_KEY_CODES.length) {
+            return EVDEV_KEY_CODES[evdevKeyCode];
+        }
+
+        return 0;
+    }
 
 }

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

@@ -10,115 +10,115 @@ import android.os.FileObserver;
 
 @SuppressWarnings("ALL")
 public class EvdevWatcher {
-	private static final String PATH = "/dev/input";
-	private static final String REQUIRED_FILE_PREFIX = "event";
-	
-	private final HashMap<String, EvdevHandler> handlers = new HashMap<String, EvdevHandler>();
-	private boolean shutdown = false;
-	private boolean init = false;
-	private boolean ungrabbed = false;
-	private EvdevListener listener;
-	private Thread startThread;
+    private static final String PATH = "/dev/input";
+    private static final String REQUIRED_FILE_PREFIX = "event";
+
+    private final HashMap<String, EvdevHandler> handlers = new HashMap<String, EvdevHandler>();
+    private boolean shutdown = false;
+    private boolean init = false;
+    private boolean ungrabbed = false;
+    private EvdevListener listener;
+    private Thread startThread;
 
     private static boolean patchedSeLinuxPolicies = false;
-	
-	private FileObserver observer = new FileObserver(PATH, FileObserver.CREATE | FileObserver.DELETE) {
-		@Override
-		public void onEvent(int event, String fileName) {
-			if (fileName == null) {
-				return;
-			}
-			
-			if (!fileName.startsWith(REQUIRED_FILE_PREFIX)) {
-				return;
-			}
-			
-			synchronized (handlers) {
-				if (shutdown) {
-					return;
-				}
-				
-				if ((event & FileObserver.CREATE) != 0) {
-					LimeLog.info("Starting evdev handler for "+fileName);
-					
-					if (!init) {
-						// If this a real new device, update permissions again so we can read it
-						EvdevReader.setPermissions(new String[]{PATH + "/" + fileName}, 0666);
-					}
-					
-					EvdevHandler handler = new EvdevHandler(PATH + "/" + fileName, listener);
-					
-					// If we're ungrabbed now, don't start the handler
-					if (!ungrabbed) {
-						handler.start();
-					}
-					
-					handlers.put(fileName, handler);
-				}
-				
-				if ((event & FileObserver.DELETE) != 0) {
-					LimeLog.info("Halting evdev handler for "+fileName);
-					
-					EvdevHandler handler = handlers.remove(fileName);
-					if (handler != null) {
-						handler.notifyDeleted();
-					}
-				}
-			}
-		}
-	};
-	
-	public EvdevWatcher(EvdevListener listener) {
-		this.listener = listener;
-	}
-	
-	private File[] rundownWithPermissionsChange(int newPermissions) {
-		// Rundown existing files
-		File devInputDir = new File(PATH);
-		File[] files = devInputDir.listFiles();
-		if (files == null) {
-			return new File[0];
-		}
-		
-		// Set desired permissions
-		String[] filePaths = new String[files.length];
-		for (int i = 0; i < files.length; i++) {
-			filePaths[i] = files[i].getAbsolutePath();
-		}
-		EvdevReader.setPermissions(filePaths, newPermissions);
-		
-		return files;
-	}
-	
-	public void ungrabAll() {
-		synchronized (handlers) {
-			// Note that we're ungrabbed for now
-			ungrabbed = true;
-			
-			// Stop all handlers
-			for (EvdevHandler handler : handlers.values()) {
-				handler.stop();
-			}
-		}
-	}
-	
-	public void regrabAll() {
-		synchronized (handlers) {
-			// We're regrabbing everything now
-			ungrabbed = false;
-			
-			for (Map.Entry<String, EvdevHandler> entry : handlers.entrySet()) {
-				// We need to recreate each entry since we can't reuse a stopped one
-				entry.setValue(new EvdevHandler(PATH + "/" + entry.getKey(), listener));
-				entry.getValue().start();
-			}
-		}
-	}
-	
-	public void start() {
-		startThread = new Thread() {
-			@Override
-			public void run() {
+
+    private FileObserver observer = new FileObserver(PATH, FileObserver.CREATE | FileObserver.DELETE) {
+        @Override
+        public void onEvent(int event, String fileName) {
+            if (fileName == null) {
+                return;
+            }
+
+            if (!fileName.startsWith(REQUIRED_FILE_PREFIX)) {
+                return;
+            }
+
+            synchronized (handlers) {
+                if (shutdown) {
+                    return;
+                }
+
+                if ((event & FileObserver.CREATE) != 0) {
+                    LimeLog.info("Starting evdev handler for "+fileName);
+
+                    if (!init) {
+                        // If this a real new device, update permissions again so we can read it
+                        EvdevReader.setPermissions(new String[]{PATH + "/" + fileName}, 0666);
+                    }
+
+                    EvdevHandler handler = new EvdevHandler(PATH + "/" + fileName, listener);
+
+                    // If we're ungrabbed now, don't start the handler
+                    if (!ungrabbed) {
+                        handler.start();
+                    }
+
+                    handlers.put(fileName, handler);
+                }
+
+                if ((event & FileObserver.DELETE) != 0) {
+                    LimeLog.info("Halting evdev handler for "+fileName);
+
+                    EvdevHandler handler = handlers.remove(fileName);
+                    if (handler != null) {
+                        handler.notifyDeleted();
+                    }
+                }
+            }
+        }
+    };
+
+    public EvdevWatcher(EvdevListener listener) {
+        this.listener = listener;
+    }
+
+    private File[] rundownWithPermissionsChange(int newPermissions) {
+        // Rundown existing files
+        File devInputDir = new File(PATH);
+        File[] files = devInputDir.listFiles();
+        if (files == null) {
+            return new File[0];
+        }
+
+        // Set desired permissions
+        String[] filePaths = new String[files.length];
+        for (int i = 0; i < files.length; i++) {
+            filePaths[i] = files[i].getAbsolutePath();
+        }
+        EvdevReader.setPermissions(filePaths, newPermissions);
+
+        return files;
+    }
+
+    public void ungrabAll() {
+        synchronized (handlers) {
+            // Note that we're ungrabbed for now
+            ungrabbed = true;
+
+            // Stop all handlers
+            for (EvdevHandler handler : handlers.values()) {
+                handler.stop();
+            }
+        }
+    }
+
+    public void regrabAll() {
+        synchronized (handlers) {
+            // We're regrabbing everything now
+            ungrabbed = false;
+
+            for (Map.Entry<String, EvdevHandler> entry : handlers.entrySet()) {
+                // We need to recreate each entry since we can't reuse a stopped one
+                entry.setValue(new EvdevHandler(PATH + "/" + entry.getKey(), listener));
+                entry.getValue().start();
+            }
+        }
+    }
+
+    public void start() {
+        startThread = new Thread() {
+            @Override
+            public void run() {
                 // Initialize the root shell
                 EvdevShell.getInstance().startShell();
 
@@ -128,61 +128,61 @@ public class EvdevWatcher {
                     patchedSeLinuxPolicies = true;
                 }
 
-				// List all files and allow us access
-				File[] files = rundownWithPermissionsChange(0666);
-				
-				init = true;
-				for (File f : files) {
-					observer.onEvent(FileObserver.CREATE, f.getName());
-				}
-				
-				// Done with initial onEvent calls
-				init = false;
-				
-				// Start watching for new files
-				observer.startWatching();
-				
-				synchronized (startThread) {
-					// Wait to be awoken again by shutdown()
-					try {
-						startThread.wait();
-					} catch (InterruptedException e) {}
-				}
-				
-				// Giveup eventX permissions
-				rundownWithPermissionsChange(0660);
+                // List all files and allow us access
+                File[] files = rundownWithPermissionsChange(0666);
+
+                init = true;
+                for (File f : files) {
+                    observer.onEvent(FileObserver.CREATE, f.getName());
+                }
+
+                // Done with initial onEvent calls
+                init = false;
+
+                // Start watching for new files
+                observer.startWatching();
+
+                synchronized (startThread) {
+                    // Wait to be awoken again by shutdown()
+                    try {
+                        startThread.wait();
+                    } catch (InterruptedException e) {}
+                }
+
+                // Giveup eventX permissions
+                rundownWithPermissionsChange(0660);
 
                 // Kill the root shell
                 try {
                     EvdevShell.getInstance().stopShell();
                 } catch (InterruptedException e) {}
-			}
-		};
-		startThread.start();
-	}
-	
-	public void shutdown() {
-		// Let start thread cleanup on it's own sweet time
-		synchronized (startThread) {
-			startThread.notify();
-		}
-		
-		// Stop the observer
-		observer.stopWatching();
-		
-		synchronized (handlers) {			
-			// Stop creating new handlers
-			shutdown = true;
-			
-			// If we've already ungrabbed, there's nothing else to do
-			if (ungrabbed) {
-				return;
-			}
-			
-			// Stop all handlers
-			for (EvdevHandler handler : handlers.values()) {
-				handler.stop();
-			}
-		}
-	}
+            }
+        };
+        startThread.start();
+    }
+
+    public void shutdown() {
+        // Let start thread cleanup on it's own sweet time
+        synchronized (startThread) {
+            startThread.notify();
+        }
+
+        // Stop the observer
+        observer.stopWatching();
+
+        synchronized (handlers) {
+            // Stop creating new handlers
+            shutdown = true;
+
+            // If we've already ungrabbed, there's nothing else to do
+            if (ungrabbed) {
+                return;
+            }
+
+            // Stop all handlers
+            for (EvdevHandler handler : handlers.values()) {
+                handler.stop();
+            }
+        }
+    }
 }

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

@@ -20,140 +20,140 @@ import com.limelight.nvstream.av.video.cpu.AvcDecoder;
 @SuppressWarnings("EmptyCatchBlock")
 public class AndroidCpuDecoderRenderer extends EnhancedDecoderRenderer {
 
-	private Thread rendererThread, decoderThread;
-	private int targetFps;
-	
-	private static final int DECODER_BUFFER_SIZE = 92*1024;
-	private ByteBuffer decoderBuffer;
-	
-	// Only sleep if the difference is above this value
-	private static final int WAIT_CEILING_MS = 5;
-	
-	private static final int LOW_PERF = 1;
-	private static final int MED_PERF = 2;
-	private static final int HIGH_PERF = 3;
-	
-	private int totalFrames;
-	private long totalTimeMs;
-	
-	private int cpuCount = Runtime.getRuntime().availableProcessors();
-	
-	@SuppressWarnings("unused")
-	private int findOptimalPerformanceLevel() {
-		StringBuilder cpuInfo = new StringBuilder();
-		BufferedReader br = null;
-		try {
-			br = new BufferedReader(new FileReader(new File("/proc/cpuinfo")));
-			for (;;) {
-				int ch = br.read();
-				if (ch == -1)
-					break;
-				cpuInfo.append((char)ch);
-			}
-			
-			// Here we're doing very simple heuristics based on CPU model
-			String cpuInfoStr = cpuInfo.toString();
+    private Thread rendererThread, decoderThread;
+    private int targetFps;
 
-			// We order them from greatest to least for proper detection
-			// of devices with multiple sets of cores (like Exynos 5 Octa)
-			// TODO Make this better (only even kind of works on ARM)
-			if (Build.FINGERPRINT.contains("generic")) {
-				// Emulator
-				return LOW_PERF;
-			}
-			else if (cpuInfoStr.contains("0xc0f")) {
-				// Cortex-A15
-				return MED_PERF;
-			}
-			else if (cpuInfoStr.contains("0xc09")) {
-				// Cortex-A9
-				return LOW_PERF;
-			}
-			else if (cpuInfoStr.contains("0xc07")) {
-				// Cortex-A7
-				return LOW_PERF;
-			}
-			else {
-				// Didn't have anything we're looking for
-				return MED_PERF;
-			}
-		} catch (IOException e) {
-		} finally {
-			if (br != null) {
-				try {
-					br.close();
-				} catch (IOException e) {}
-			}
-		}
-		
-		// Couldn't read cpuinfo, so assume medium
-		return MED_PERF;
-	}
-	
-	@Override
-	public boolean setup(int width, int height, int redrawRate, Object renderTarget, int drFlags) {
-		this.targetFps = redrawRate;
-		
-		int perfLevel = LOW_PERF; //findOptimalPerformanceLevel();
-		int threadCount;
-		
-		int avcFlags = 0;
-		switch (perfLevel) {
-		case HIGH_PERF:
-			// Single threaded low latency decode is ideal but hard to acheive
-			avcFlags = AvcDecoder.LOW_LATENCY_DECODE;
-			threadCount = 1;
-			break;
+    private static final int DECODER_BUFFER_SIZE = 92*1024;
+    private ByteBuffer decoderBuffer;
 
-		case LOW_PERF:
-			// Disable the loop filter for performance reasons
-			avcFlags = AvcDecoder.FAST_BILINEAR_FILTERING;
-			
-			// Use plenty of threads to try to utilize the CPU as best we can
-			threadCount = cpuCount - 1;
-			break;
+    // Only sleep if the difference is above this value
+    private static final int WAIT_CEILING_MS = 5;
 
-		default:
-		case MED_PERF:
-			avcFlags = AvcDecoder.BILINEAR_FILTERING;
-			
-			// Only use 2 threads to minimize frame processing latency
-			threadCount = 2;
-			break;
-		}
-		
-		// If the user wants quality, we'll remove the low IQ flags
-		if ((drFlags & VideoDecoderRenderer.FLAG_PREFER_QUALITY) != 0) {
-			// Make sure the loop filter is enabled
-			avcFlags &= ~AvcDecoder.DISABLE_LOOP_FILTER;
-			
-			// Disable the non-compliant speed optimizations
-			avcFlags &= ~AvcDecoder.FAST_DECODE;
-			
-			LimeLog.info("Using high quality decoding");
-		}
-		
-		SurfaceHolder sh = (SurfaceHolder)renderTarget;
-		sh.setFormat(PixelFormat.RGBX_8888);
-		
-		int err = AvcDecoder.init(width, height, avcFlags, threadCount);
-		if (err != 0) {
-			throw new IllegalStateException("AVC decoder initialization failure: "+err);
-		}
-		
-		if (!AvcDecoder.setRenderTarget(sh.getSurface())) {
+    private static final int LOW_PERF = 1;
+    private static final int MED_PERF = 2;
+    private static final int HIGH_PERF = 3;
+
+    private int totalFrames;
+    private long totalTimeMs;
+
+    private final int cpuCount = Runtime.getRuntime().availableProcessors();
+
+    @SuppressWarnings("unused")
+    private int findOptimalPerformanceLevel() {
+        StringBuilder cpuInfo = new StringBuilder();
+        BufferedReader br = null;
+        try {
+            br = new BufferedReader(new FileReader(new File("/proc/cpuinfo")));
+            for (;;) {
+                int ch = br.read();
+                if (ch == -1)
+                    break;
+                cpuInfo.append((char)ch);
+            }
+
+            // Here we're doing very simple heuristics based on CPU model
+            String cpuInfoStr = cpuInfo.toString();
+
+            // We order them from greatest to least for proper detection
+            // of devices with multiple sets of cores (like Exynos 5 Octa)
+            // TODO Make this better (only even kind of works on ARM)
+            if (Build.FINGERPRINT.contains("generic")) {
+                // Emulator
+                return LOW_PERF;
+            }
+            else if (cpuInfoStr.contains("0xc0f")) {
+                // Cortex-A15
+                return MED_PERF;
+            }
+            else if (cpuInfoStr.contains("0xc09")) {
+                // Cortex-A9
+                return LOW_PERF;
+            }
+            else if (cpuInfoStr.contains("0xc07")) {
+                // Cortex-A7
+                return LOW_PERF;
+            }
+            else {
+                // Didn't have anything we're looking for
+                return MED_PERF;
+            }
+        } catch (IOException e) {
+        } finally {
+            if (br != null) {
+                try {
+                    br.close();
+                } catch (IOException e) {}
+            }
+        }
+
+        // Couldn't read cpuinfo, so assume medium
+        return MED_PERF;
+    }
+
+    @Override
+    public boolean setup(int width, int height, int redrawRate, Object renderTarget, int drFlags) {
+        this.targetFps = redrawRate;
+
+        int perfLevel = LOW_PERF; //findOptimalPerformanceLevel();
+        int threadCount;
+
+        int avcFlags = 0;
+        switch (perfLevel) {
+        case HIGH_PERF:
+            // Single threaded low latency decode is ideal but hard to acheive
+            avcFlags = AvcDecoder.LOW_LATENCY_DECODE;
+            threadCount = 1;
+            break;
+
+        case LOW_PERF:
+            // Disable the loop filter for performance reasons
+            avcFlags = AvcDecoder.FAST_BILINEAR_FILTERING;
+
+            // Use plenty of threads to try to utilize the CPU as best we can
+            threadCount = cpuCount - 1;
+            break;
+
+        default:
+        case MED_PERF:
+            avcFlags = AvcDecoder.BILINEAR_FILTERING;
+
+            // Only use 2 threads to minimize frame processing latency
+            threadCount = 2;
+            break;
+        }
+
+        // If the user wants quality, we'll remove the low IQ flags
+        if ((drFlags & VideoDecoderRenderer.FLAG_PREFER_QUALITY) != 0) {
+            // Make sure the loop filter is enabled
+            avcFlags &= ~AvcDecoder.DISABLE_LOOP_FILTER;
+
+            // Disable the non-compliant speed optimizations
+            avcFlags &= ~AvcDecoder.FAST_DECODE;
+
+            LimeLog.info("Using high quality decoding");
+        }
+
+        SurfaceHolder sh = (SurfaceHolder)renderTarget;
+        sh.setFormat(PixelFormat.RGBX_8888);
+
+        int err = AvcDecoder.init(width, height, avcFlags, threadCount);
+        if (err != 0) {
+            throw new IllegalStateException("AVC decoder initialization failure: "+err);
+        }
+
+        if (!AvcDecoder.setRenderTarget(sh.getSurface())) {
             return false;
         }
-		
-		decoderBuffer = ByteBuffer.allocate(DECODER_BUFFER_SIZE + AvcDecoder.getInputPaddingSize());
-		
-		LimeLog.info("Using software decoding (performance level: "+perfLevel+")");
-		
-		return true;
-	}
 
-	@Override
-	public boolean start(final VideoDepacketizer depacketizer) {
+        decoderBuffer = ByteBuffer.allocate(DECODER_BUFFER_SIZE + AvcDecoder.getInputPaddingSize());
+
+        LimeLog.info("Using software decoding (performance level: "+perfLevel+")");
+
+        return true;
+    }
+
+    @Override
+    public boolean start(final VideoDepacketizer depacketizer) {
         decoderThread = new Thread() {
             @Override
             public void run() {
@@ -174,112 +174,113 @@ public class AndroidCpuDecoderRenderer extends EnhancedDecoderRenderer {
         decoderThread.setPriority(Thread.MAX_PRIORITY - 1);
         decoderThread.start();
 
-		rendererThread = new Thread() {
-			@Override
-			public void run() {
-				long nextFrameTime = System.currentTimeMillis();
-				DecodeUnit du;
-				while (!isInterrupted())
-				{
-					long diff = nextFrameTime - System.currentTimeMillis();
+        rendererThread = new Thread() {
+            @Override
+            public void run() {
+                long nextFrameTime = System.currentTimeMillis();
+                while (!isInterrupted())
+                {
+                    long diff = nextFrameTime - System.currentTimeMillis();
 
-					if (diff > WAIT_CEILING_MS) {
+                    if (diff > WAIT_CEILING_MS) {
                         try {
                             Thread.sleep(diff - WAIT_CEILING_MS);
                         } catch (InterruptedException e) {
                             return;
                         }
                         continue;
-					}
+                    }
 
-					nextFrameTime = computePresentationTimeMs(targetFps);
-					AvcDecoder.redraw();
-				}
-			}
-		};
-		rendererThread.setName("Video - Renderer (CPU)");
-		rendererThread.setPriority(Thread.MAX_PRIORITY);
-		rendererThread.start();
-		return true;
-	}
-	
-	private long computePresentationTimeMs(int frameRate) {
-		return System.currentTimeMillis() + (1000 / frameRate);
-	}
+                    nextFrameTime = computePresentationTimeMs(targetFps);
+                    AvcDecoder.redraw();
+                }
+            }
+        };
+        rendererThread.setName("Video - Renderer (CPU)");
+        rendererThread.setPriority(Thread.MAX_PRIORITY);
+        rendererThread.start();
+        return true;
+    }
 
-	@Override
-	public void stop() {
-		rendererThread.interrupt();
+    private long computePresentationTimeMs(int frameRate) {
+        return System.currentTimeMillis() + (1000 / frameRate);
+    }
+
+    @Override
+    public void stop() {
+        rendererThread.interrupt();
         decoderThread.interrupt();
-		
-		try {
+
+        try {
             rendererThread.join();
         } catch (InterruptedException e) { }
         try {
             decoderThread.join();
         } catch (InterruptedException e) { }
-	}
+    }
 
-	@Override
-	public void release() {
-		AvcDecoder.destroy();
-	}
+    @Override
+    public void release() {
+        AvcDecoder.destroy();
+    }
 
-	private boolean submitDecodeUnit(DecodeUnit decodeUnit) {
-		byte[] data;
-		
-		// Use the reserved decoder buffer if this decode unit will fit
-		if (decodeUnit.getDataLength() <= DECODER_BUFFER_SIZE) {
-			decoderBuffer.clear();
-			
-			for (ByteBufferDescriptor bbd : decodeUnit.getBufferList()) {
-				decoderBuffer.put(bbd.data, bbd.offset, bbd.length);
-			}
-			
-			data = decoderBuffer.array();
-		}
-		else {
-			data = new byte[decodeUnit.getDataLength()+AvcDecoder.getInputPaddingSize()];
-			
-			int offset = 0;
-			for (ByteBufferDescriptor bbd : decodeUnit.getBufferList()) {
-				System.arraycopy(bbd.data, bbd.offset, data, offset, bbd.length);
-				offset += bbd.length;
-			}
-		}
-		
-		boolean success = (AvcDecoder.decode(data, 0, decodeUnit.getDataLength()) == 0);
-		if (success) {
-			long timeAfterDecode = System.currentTimeMillis();
-			
-		    // Add delta time to the totals (excluding probable outliers)
-		    long delta = timeAfterDecode - decodeUnit.getReceiveTimestamp();
-			if (delta >= 0 && delta < 1000) {
-			    totalTimeMs += delta;
-			    totalFrames++;
-			}
-		}
-		
-		return success;
-	}
+    private boolean submitDecodeUnit(DecodeUnit decodeUnit) {
+        byte[] data;
 
-	@Override
-	public int getCapabilities() {
-		return 0;
-	}
+        // Use the reserved decoder buffer if this decode unit will fit
+        if (decodeUnit.getDataLength() <= DECODER_BUFFER_SIZE) {
+            decoderBuffer.clear();
 
-	@Override
-	public int getAverageDecoderLatency() {
-		return 0;
-	}
+            for (ByteBufferDescriptor bbd = decodeUnit.getBufferHead();
+                 bbd != null; bbd = bbd.nextDescriptor) {
+                decoderBuffer.put(bbd.data, bbd.offset, bbd.length);
+            }
 
-	@Override
-	public int getAverageEndToEndLatency() {
-		if (totalFrames == 0) {
-			return 0;
-		}
-		return (int)(totalTimeMs / totalFrames);
-	}
+            data = decoderBuffer.array();
+        }
+        else {
+            data = new byte[decodeUnit.getDataLength()+AvcDecoder.getInputPaddingSize()];
+
+            int offset = 0;
+            for (ByteBufferDescriptor bbd = decodeUnit.getBufferHead();
+                 bbd != null; bbd = bbd.nextDescriptor) {
+                System.arraycopy(bbd.data, bbd.offset, data, offset, bbd.length);
+                offset += bbd.length;
+            }
+        }
+
+        boolean success = (AvcDecoder.decode(data, 0, decodeUnit.getDataLength()) == 0);
+        if (success) {
+            long timeAfterDecode = System.currentTimeMillis();
+
+            // Add delta time to the totals (excluding probable outliers)
+            long delta = timeAfterDecode - decodeUnit.getReceiveTimestamp();
+            if (delta >= 0 && delta < 1000) {
+                totalTimeMs += delta;
+                totalFrames++;
+            }
+        }
+
+        return success;
+    }
+
+    @Override
+    public int getCapabilities() {
+        return 0;
+    }
+
+    @Override
+    public int getAverageDecoderLatency() {
+        return 0;
+    }
+
+    @Override
+    public int getAverageEndToEndLatency() {
+        if (totalFrames == 0) {
+            return 0;
+        }
+        return (int)(totalTimeMs / totalFrames);
+    }
 
     @Override
     public String getDecoderName() {

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

@@ -1,79 +1,85 @@
 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;
 
 public class ConfigurableDecoderRenderer extends EnhancedDecoderRenderer {
 
-	private EnhancedDecoderRenderer decoderRenderer;
-	
-	@Override
-	public void release() {
-		if (decoderRenderer != null) {
-			decoderRenderer.release();
-		}
-	}
+    private EnhancedDecoderRenderer decoderRenderer;
 
-	@Override
-	public boolean setup(int width, int height, int redrawRate, Object renderTarget, int drFlags) {
-		if (decoderRenderer == null) {
-			throw new IllegalStateException("ConfigurableDecoderRenderer not initialized");
-		}
-		return decoderRenderer.setup(width, height, redrawRate, renderTarget, drFlags);
-	}
-	
-	public void initializeWithFlags(int drFlags) {
-		if ((drFlags & VideoDecoderRenderer.FLAG_FORCE_HARDWARE_DECODING) != 0 ||
-				((drFlags & VideoDecoderRenderer.FLAG_FORCE_SOFTWARE_DECODING) == 0 &&
-				MediaCodecHelper.findProbableSafeDecoder() != null)) {
-			decoderRenderer = new MediaCodecDecoderRenderer();
-		}
-		else {
-			decoderRenderer = new AndroidCpuDecoderRenderer();
-		}
-	}
-	
-	public boolean isHardwareAccelerated() {
-		if (decoderRenderer == null) {
-			throw new IllegalStateException("ConfigurableDecoderRenderer not initialized");
-		}
-		return (decoderRenderer instanceof MediaCodecDecoderRenderer);
-	}
+    @Override
+    public void release() {
+        if (decoderRenderer != null) {
+            decoderRenderer.release();
+        }
+    }
 
-	@Override
-	public boolean start(VideoDepacketizer depacketizer) {
-		return decoderRenderer.start(depacketizer);
-	}
+    @Override
+    public boolean setup(int width, int height, int redrawRate, Object renderTarget, int drFlags) {
+        if (decoderRenderer == null) {
+            throw new IllegalStateException("ConfigurableDecoderRenderer not initialized");
+        }
+        return decoderRenderer.setup(width, height, redrawRate, renderTarget, drFlags);
+    }
 
-	@Override
-	public void stop() {
-		decoderRenderer.stop();
-	}
+    public void initializeWithFlags(int drFlags) {
+        if ((drFlags & VideoDecoderRenderer.FLAG_FORCE_HARDWARE_DECODING) != 0 ||
+                ((drFlags & VideoDecoderRenderer.FLAG_FORCE_SOFTWARE_DECODING) == 0 &&
+                MediaCodecHelper.findProbableSafeDecoder() != null)) {
+            decoderRenderer = new MediaCodecDecoderRenderer();
+        }
+        else {
+            decoderRenderer = new AndroidCpuDecoderRenderer();
+        }
+    }
 
-	@Override
-	public int getCapabilities() {
-		return decoderRenderer.getCapabilities();
-	}
+    public boolean isHardwareAccelerated() {
+        if (decoderRenderer == null) {
+            throw new IllegalStateException("ConfigurableDecoderRenderer not initialized");
+        }
+        return (decoderRenderer instanceof MediaCodecDecoderRenderer);
+    }
 
-	@Override
-	public int getAverageDecoderLatency() {
-		if (decoderRenderer != null) {
-			return decoderRenderer.getAverageDecoderLatency();
-		}
-		else {
-			return 0;
-		}
-	}
+    @Override
+    public boolean start(VideoDepacketizer depacketizer) {
+        return decoderRenderer.start(depacketizer);
+    }
 
-	@Override
-	public int getAverageEndToEndLatency() {
-		if (decoderRenderer != null) {
-			return decoderRenderer.getAverageEndToEndLatency();
-		}
-		else {
-			return 0;
-		}
-	}
+    @Override
+    public void stop() {
+        decoderRenderer.stop();
+    }
+
+    @Override
+    public int getCapabilities() {
+        return decoderRenderer.getCapabilities();
+    }
+
+    @Override
+    public void directSubmitDecodeUnit(DecodeUnit du) {
+        decoderRenderer.directSubmitDecodeUnit(du);
+    }
+
+    @Override
+    public int getAverageDecoderLatency() {
+        if (decoderRenderer != null) {
+            return decoderRenderer.getAverageDecoderLatency();
+        }
+        else {
+            return 0;
+        }
+    }
+
+    @Override
+    public int getAverageEndToEndLatency() {
+        if (decoderRenderer != null) {
+            return decoderRenderer.getAverageEndToEndLatency();
+        }
+        else {
+            return 0;
+        }
+    }
 
     @Override
     public String getDecoderName() {

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

@@ -20,13 +20,28 @@ import com.limelight.LimeLog;
 
 public class MediaCodecHelper {
 	
-	public static final List<String> preferredDecoders;
+	private static final List<String> preferredDecoders;
+
+	private static final List<String> blacklistedDecoderPrefixes;
+	private static final List<String> spsFixupBitstreamFixupDecoderPrefixes;
+	private static final List<String> whitelistedAdaptiveResolutionPrefixes;
+    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");
+        directSubmitPrefixes.add("omx.arc");
+    }
 
-	public static final List<String> blacklistedDecoderPrefixes;
-	public static final List<String> spsFixupBitstreamFixupDecoderPrefixes;
-	public static final List<String> whitelistedAdaptiveResolutionPrefixes;
-    public static final List<String> baselineProfileHackPrefixes;
-	
 	static {
 		preferredDecoders = new LinkedList<String>();
 	}
@@ -72,8 +87,8 @@ public class MediaCodecHelper {
 	@TargetApi(Build.VERSION_CODES.KITKAT)
 	public static boolean decoderSupportsAdaptivePlayback(String decoderName, MediaCodecInfo decoderInfo) {
 		/*
-		FIXME: Intel's decoder on Nexus Player forces the high latency path if adaptive playback is enabled
-		so we'll keep it off for now, since we don't know whether other devices also do the same
+        FIXME: Intel's decoder on Nexus Player forces the high latency path if adaptive playback is enabled
+        so we'll keep it off for now, since we don't know whether other devices also do the same
 
 		if (isDecoderInList(whitelistedAdaptiveResolutionPrefixes, decoderName)) {
 			LimeLog.info("Adaptive playback supported (whitelist)");
@@ -97,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 +165,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 +236,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/ComputerDatabaseManager.java

@@ -17,153 +17,153 @@ import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteException;
 
 public class ComputerDatabaseManager {
-	private static final String COMPUTER_DB_NAME = "computers.db";
-	private static final String COMPUTER_TABLE_NAME = "Computers";
-	private static final String COMPUTER_NAME_COLUMN_NAME = "ComputerName";
-	private static final String COMPUTER_UUID_COLUMN_NAME = "UUID";
-	private static final String LOCAL_IP_COLUMN_NAME = "LocalIp";
-	private static final String REMOTE_IP_COLUMN_NAME = "RemoteIp";
-	private static final String MAC_COLUMN_NAME = "Mac";
-	
-	private SQLiteDatabase computerDb;
-	
-	public ComputerDatabaseManager(Context c) {
-		try {
-			// Create or open an existing DB
-			computerDb = c.openOrCreateDatabase(COMPUTER_DB_NAME, 0, null);
-		} catch (SQLiteException e) {
-			// Delete the DB and try again
-			c.deleteDatabase(COMPUTER_DB_NAME);
-			computerDb = c.openOrCreateDatabase(COMPUTER_DB_NAME, 0, null);
-		}
-		initializeDb();
-	}
-	
-	public void close() {
-		computerDb.close();
-	}
-	
-	private void initializeDb() {
-		// Create tables if they aren't already there
-		computerDb.execSQL(String.format((Locale)null, "CREATE TABLE IF NOT EXISTS %s(%s TEXT PRIMARY KEY," +
-				" %s TEXT NOT NULL, %s TEXT NOT NULL, %s TEXT NOT NULL, %s TEXT NOT NULL)",
-				COMPUTER_TABLE_NAME,
-				COMPUTER_NAME_COLUMN_NAME, COMPUTER_UUID_COLUMN_NAME, LOCAL_IP_COLUMN_NAME,
-				REMOTE_IP_COLUMN_NAME, MAC_COLUMN_NAME));
-	}
-	
-	public void deleteComputer(String name) {
-		computerDb.delete(COMPUTER_TABLE_NAME, COMPUTER_NAME_COLUMN_NAME+"='"+name+"'", null);
-	}
-	
-	public boolean updateComputer(ComputerDetails details) {
-		ContentValues values = new ContentValues();
-		values.put(COMPUTER_NAME_COLUMN_NAME, details.name);
-		values.put(COMPUTER_UUID_COLUMN_NAME, details.uuid.toString());
-		values.put(LOCAL_IP_COLUMN_NAME, details.localIp.getAddress());
-		values.put(REMOTE_IP_COLUMN_NAME, details.remoteIp.getAddress());
-		values.put(MAC_COLUMN_NAME, details.macAddress);
-		return -1 != computerDb.insertWithOnConflict(COMPUTER_TABLE_NAME, null, values, SQLiteDatabase.CONFLICT_REPLACE);
-	}
-	
-	public List<ComputerDetails> getAllComputers() {
-		Cursor c = computerDb.rawQuery("SELECT * FROM "+COMPUTER_TABLE_NAME, null);
-		LinkedList<ComputerDetails> computerList = new LinkedList<ComputerDetails>();
-		while (c.moveToNext()) {
-			ComputerDetails details = new ComputerDetails();
-			
-			details.name = c.getString(0);
-			
-			String uuidStr = c.getString(1);
-			try {
-				details.uuid = UUID.fromString(uuidStr);
-			} catch (IllegalArgumentException e) {
-				// We'll delete this entry
-				LimeLog.severe("DB: Corrupted UUID for "+details.name);
-			}
-			
-			try {
-				details.localIp = InetAddress.getByAddress(c.getBlob(2));
-			} catch (UnknownHostException e) {
-				// We'll delete this entry
-				LimeLog.severe("DB: Corrupted local IP for "+details.name);
-			}
-			
-			try {
-				details.remoteIp = InetAddress.getByAddress(c.getBlob(3));
-			} catch (UnknownHostException e) {
-				// We'll delete this entry
-				LimeLog.severe("DB: Corrupted remote IP for "+details.name);
-			}
-			
-			details.macAddress = c.getString(4);
-			
-			// This signifies we don't have dynamic state (like pair state)
+    private static final String COMPUTER_DB_NAME = "computers.db";
+    private static final String COMPUTER_TABLE_NAME = "Computers";
+    private static final String COMPUTER_NAME_COLUMN_NAME = "ComputerName";
+    private static final String COMPUTER_UUID_COLUMN_NAME = "UUID";
+    private static final String LOCAL_IP_COLUMN_NAME = "LocalIp";
+    private static final String REMOTE_IP_COLUMN_NAME = "RemoteIp";
+    private static final String MAC_COLUMN_NAME = "Mac";
+
+    private SQLiteDatabase computerDb;
+
+    public ComputerDatabaseManager(Context c) {
+        try {
+            // Create or open an existing DB
+            computerDb = c.openOrCreateDatabase(COMPUTER_DB_NAME, 0, null);
+        } catch (SQLiteException e) {
+            // Delete the DB and try again
+            c.deleteDatabase(COMPUTER_DB_NAME);
+            computerDb = c.openOrCreateDatabase(COMPUTER_DB_NAME, 0, null);
+        }
+        initializeDb();
+    }
+
+    public void close() {
+        computerDb.close();
+    }
+
+    private void initializeDb() {
+        // Create tables if they aren't already there
+        computerDb.execSQL(String.format((Locale)null, "CREATE TABLE IF NOT EXISTS %s(%s TEXT PRIMARY KEY," +
+                " %s TEXT NOT NULL, %s TEXT NOT NULL, %s TEXT NOT NULL, %s TEXT NOT NULL)",
+                COMPUTER_TABLE_NAME,
+                COMPUTER_NAME_COLUMN_NAME, COMPUTER_UUID_COLUMN_NAME, LOCAL_IP_COLUMN_NAME,
+                REMOTE_IP_COLUMN_NAME, MAC_COLUMN_NAME));
+    }
+
+    public void deleteComputer(String name) {
+        computerDb.delete(COMPUTER_TABLE_NAME, COMPUTER_NAME_COLUMN_NAME+"='"+name+"'", null);
+    }
+
+    public boolean updateComputer(ComputerDetails details) {
+        ContentValues values = new ContentValues();
+        values.put(COMPUTER_NAME_COLUMN_NAME, details.name);
+        values.put(COMPUTER_UUID_COLUMN_NAME, details.uuid.toString());
+        values.put(LOCAL_IP_COLUMN_NAME, details.localIp.getAddress());
+        values.put(REMOTE_IP_COLUMN_NAME, details.remoteIp.getAddress());
+        values.put(MAC_COLUMN_NAME, details.macAddress);
+        return -1 != computerDb.insertWithOnConflict(COMPUTER_TABLE_NAME, null, values, SQLiteDatabase.CONFLICT_REPLACE);
+    }
+
+    public List<ComputerDetails> getAllComputers() {
+        Cursor c = computerDb.rawQuery("SELECT * FROM "+COMPUTER_TABLE_NAME, null);
+        LinkedList<ComputerDetails> computerList = new LinkedList<ComputerDetails>();
+        while (c.moveToNext()) {
+            ComputerDetails details = new ComputerDetails();
+
+            details.name = c.getString(0);
+
+            String uuidStr = c.getString(1);
+            try {
+                details.uuid = UUID.fromString(uuidStr);
+            } catch (IllegalArgumentException e) {
+                // We'll delete this entry
+                LimeLog.severe("DB: Corrupted UUID for "+details.name);
+            }
+
+            try {
+                details.localIp = InetAddress.getByAddress(c.getBlob(2));
+            } catch (UnknownHostException e) {
+                // We'll delete this entry
+                LimeLog.severe("DB: Corrupted local IP for "+details.name);
+            }
+
+            try {
+                details.remoteIp = InetAddress.getByAddress(c.getBlob(3));
+            } catch (UnknownHostException e) {
+                // We'll delete this entry
+                LimeLog.severe("DB: Corrupted remote IP for "+details.name);
+            }
+
+            details.macAddress = c.getString(4);
+
+            // This signifies we don't have dynamic state (like pair state)
             details.state = ComputerDetails.State.UNKNOWN;
             details.reachability = ComputerDetails.Reachability.UNKNOWN;
-			
-			// If a field is corrupt or missing, skip the database entry
-			if (details.uuid == null || details.localIp == null || details.remoteIp == null ||
-					details.macAddress == null) {
-				continue;
-			}
+
+            // If a field is corrupt or missing, skip the database entry
+            if (details.uuid == null || details.localIp == null || details.remoteIp == null ||
+                    details.macAddress == null) {
+                continue;
+            }
 
 
             computerList.add(details);
-		}
-		
-		c.close();
-		
-		return computerList;
-	}
-	
-	public ComputerDetails getComputerByName(String name) {
-		Cursor c = computerDb.rawQuery("SELECT * FROM "+COMPUTER_TABLE_NAME+" WHERE "+COMPUTER_NAME_COLUMN_NAME+"='"+name+"'", null);
-		ComputerDetails details = new ComputerDetails();
-		if (!c.moveToFirst()) {
-			// No matching computer
-			c.close();
-			return null;
-		}
+        }
 
-		details.name = c.getString(0);
-		
-		String uuidStr = c.getString(1);
-		try {
-			details.uuid = UUID.fromString(uuidStr);
-		} catch (IllegalArgumentException e) {
-			// We'll delete this entry
-			LimeLog.severe("DB: Corrupted UUID for "+details.name);
-		}
-		
-		try {
-			details.localIp = InetAddress.getByAddress(c.getBlob(2));
-		} catch (UnknownHostException e) {
-			// We'll delete this entry
-			LimeLog.severe("DB: Corrupted local IP for "+details.name);
-		}
-		
-		try {
-			details.remoteIp = InetAddress.getByAddress(c.getBlob(3));
-		} catch (UnknownHostException e) {
-			// We'll delete this entry
-			LimeLog.severe("DB: Corrupted remote IP for "+details.name);
-		}
-		
-		details.macAddress = c.getString(4);
-		
-		c.close();
+        c.close();
+
+        return computerList;
+    }
+
+    public ComputerDetails getComputerByName(String name) {
+        Cursor c = computerDb.rawQuery("SELECT * FROM "+COMPUTER_TABLE_NAME+" WHERE "+COMPUTER_NAME_COLUMN_NAME+"='"+name+"'", null);
+        ComputerDetails details = new ComputerDetails();
+        if (!c.moveToFirst()) {
+            // No matching computer
+            c.close();
+            return null;
+        }
+
+        details.name = c.getString(0);
+
+        String uuidStr = c.getString(1);
+        try {
+            details.uuid = UUID.fromString(uuidStr);
+        } catch (IllegalArgumentException e) {
+            // We'll delete this entry
+            LimeLog.severe("DB: Corrupted UUID for "+details.name);
+        }
+
+        try {
+            details.localIp = InetAddress.getByAddress(c.getBlob(2));
+        } catch (UnknownHostException e) {
+            // We'll delete this entry
+            LimeLog.severe("DB: Corrupted local IP for "+details.name);
+        }
+
+        try {
+            details.remoteIp = InetAddress.getByAddress(c.getBlob(3));
+        } catch (UnknownHostException e) {
+            // We'll delete this entry
+            LimeLog.severe("DB: Corrupted remote IP for "+details.name);
+        }
+
+        details.macAddress = c.getString(4);
+
+        c.close();
 
         details.state = ComputerDetails.State.UNKNOWN;
         details.reachability = ComputerDetails.Reachability.UNKNOWN;
-		
-		// If a field is corrupt or missing, delete the database entry
-		if (details.uuid == null || details.localIp == null || details.remoteIp == null ||
-				details.macAddress == null) {
-			deleteComputer(details.name);
-			return null;
-		}
-		
-		return details;
-	}
+
+        // If a field is corrupt or missing, delete the database entry
+        if (details.uuid == null || details.localIp == null || details.remoteIp == null ||
+                details.macAddress == null) {
+            deleteComputer(details.name);
+            return null;
+        }
+
+        return details;
+    }
 }

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

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

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,45 +31,45 @@ 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 MDNS_QUERY_PERIOD_MS = 1000;
-	
-	private ComputerManagerBinder binder = new ComputerManagerBinder();
-	
-	private ComputerDatabaseManager dbManager;
-	private 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 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 final ComputerManagerBinder binder = new ComputerManagerBinder();
+
+    private ComputerDatabaseManager dbManager;
+    private final AtomicInteger dbRefCount = new AtomicInteger(0);
+
+    private IdentityManager idManager;
+    private final LinkedList<PollingTuple> pollingTuples = new LinkedList<PollingTuple>();
+    private ComputerManagerListener listener = null;
+    private final AtomicInteger activePolls = new AtomicInteger(0);
     private boolean pollingActive = false;
 
-	private DiscoveryService.DiscoveryBinder discoveryBinder;
-	private final ServiceConnection discoveryServiceConnection = new ServiceConnection() {
-		public void onServiceConnected(ComponentName className, IBinder binder) {
-			synchronized (discoveryServiceConnection) {
-				DiscoveryService.DiscoveryBinder privateBinder = ((DiscoveryService.DiscoveryBinder)binder);
-				
-				// Set us as the event listener
-				privateBinder.setListener(createDiscoveryListener());
-				
-				// Signal a possible waiter that we're all setup
-				discoveryBinder = privateBinder;
-				discoveryServiceConnection.notifyAll();
-			}
-		}
+    private DiscoveryService.DiscoveryBinder discoveryBinder;
+    private final ServiceConnection discoveryServiceConnection = new ServiceConnection() {
+        public void onServiceConnected(ComponentName className, IBinder binder) {
+            synchronized (discoveryServiceConnection) {
+                DiscoveryService.DiscoveryBinder privateBinder = ((DiscoveryService.DiscoveryBinder)binder);
 
-		public void onServiceDisconnected(ComponentName className) {
-			discoveryBinder = null;
-		}
-	};
+                // Set us as the event listener
+                privateBinder.setListener(createDiscoveryListener());
+
+                // Signal a possible waiter that we're all setup
+                discoveryBinder = privateBinder;
+                discoveryServiceConnection.notifyAll();
+            }
+        }
+
+        public void onServiceDisconnected(ComponentName className) {
+            discoveryBinder = null;
+        }
+    };
 
     // Returns true if the details object was modified
-    private boolean runPoll(ComputerDetails details)
-    {
-        boolean newPc = details.name.isEmpty();
-
+    private boolean runPoll(ComputerDetails details, boolean newPc, int offlineCount) throws InterruptedException {
         if (!getLocalDatabaseReference()) {
             return false;
         }
@@ -76,12 +77,23 @@ public class ComputerManagerService extends Service {
         activePolls.incrementAndGet();
 
         // Poll the machine
-        if (!doPollMachine(details)) {
-            details.state = ComputerDetails.State.OFFLINE;
-            details.reachability = ComputerDetails.Reachability.OFFLINE;
-        }
+        try {
+            if (!pollComputer(details)) {
+                if (!newPc && offlineCount < OFFLINE_POLL_TRIES) {
+                    // Return without calling the listener
+                    releaseLocalDatabaseReference();
+                    return false;
+                }
 
-        activePolls.decrementAndGet();
+                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 +103,7 @@ public class ComputerManagerService extends Service {
                 if (dbManager.getComputerByName(details.name) == null) {
                     // It's gone
                     releaseLocalDatabaseReference();
-                    return true;
+                    return false;
                 }
             }
 
@@ -111,13 +123,21 @@ public class ComputerManagerService extends Service {
         Thread t = new Thread() {
             @Override
             public void run() {
-                while (!isInterrupted() && pollingActive) {
-                    // Check if this poll has modified the details
-                    runPoll(details);
 
-                    // Wait until the next polling interval
+                int offlineCount = 0;
+                while (!isInterrupted() && pollingActive) {
                     try {
-                        Thread.sleep(POLLING_PERIOD_MS);
+                        // Check if this poll has modified the details
+                        if (!runPoll(details, false, offlineCount)) {
+                            LimeLog.warning(details.name + " is offline (try " + offlineCount + ")");
+                            offlineCount++;
+                        }
+                        else {
+                            offlineCount = 0;
+                        }
+
+                        // Wait until the next polling interval
+                        Thread.sleep(SERVERINFO_POLLING_PERIOD_MS / ((offlineCount > 0) ? 2 : 1));
                     } catch (InterruptedException e) {
                         break;
                     }
@@ -127,17 +147,17 @@ public class ComputerManagerService extends Service {
         t.setName("Polling thread for "+details.localIp.getHostAddress());
         return t;
     }
-	
-	public class ComputerManagerBinder extends Binder {
-		public void startPolling(ComputerManagerListener listener) {
+
+    public class ComputerManagerBinder extends Binder {
+        public void startPolling(ComputerManagerListener listener) {
             // Polling is active
             pollingActive = true;
 
-			// Set the listener
-			ComputerManagerService.this.listener = listener;
-			
-			// Start mDNS autodiscovery too
-			discoveryBinder.startDiscovery(MDNS_QUERY_PERIOD_MS);
+            // Set the listener
+            ComputerManagerService.this.listener = listener;
+
+            // Start mDNS autodiscovery too
+            discoveryBinder.startDiscovery(MDNS_QUERY_PERIOD_MS);
 
             synchronized (pollingTuples) {
                 for (PollingTuple tuple : pollingTuples) {
@@ -151,52 +171,48 @@ public class ComputerManagerService extends Service {
                     }
                 }
             }
-		}
-		
-		public void waitForReady() {
-			synchronized (discoveryServiceConnection) {
-				try {
-					while (discoveryBinder == null) {
-						// Wait for the bind notification
-						discoveryServiceConnection.wait(1000);
-					}
-				} catch (InterruptedException ignored) {
-				}
-			}
-		}
-		
-		public void waitForPollingStopped() {
-			while (activePolls.get() != 0) {
-				try {
-					Thread.sleep(250);
-				} catch (InterruptedException ignored) {}
-			}
-		}
-		
-		public boolean addComputerBlocking(InetAddress addr) {
-			return ComputerManagerService.this.addComputerBlocking(addr);
-		}
-		
-		public void addComputer(InetAddress addr) {
-			ComputerManagerService.this.addComputer(addr);
-		}
-		
-		public void removeComputer(String name) {
-			ComputerManagerService.this.removeComputer(name);
-		}
-		
-		public void stopPolling() {
-			// Just call the unbind handler to cleanup
-			ComputerManagerService.this.onUnbind(null);
-		}
+        }
+
+        public void waitForReady() {
+            synchronized (discoveryServiceConnection) {
+                try {
+                    while (discoveryBinder == null) {
+                        // Wait for the bind notification
+                        discoveryServiceConnection.wait(1000);
+                    }
+                } catch (InterruptedException ignored) {
+                }
+            }
+        }
+
+        public void waitForPollingStopped() {
+            while (activePolls.get() != 0) {
+                try {
+                    Thread.sleep(250);
+                } catch (InterruptedException ignored) {}
+            }
+        }
+
+        public boolean addComputerBlocking(InetAddress addr) {
+            return ComputerManagerService.this.addComputerBlocking(addr);
+        }
+
+        public void removeComputer(String name) {
+            ComputerManagerService.this.removeComputer(name);
+        }
+
+        public void stopPolling() {
+            // Just call the unbind handler to cleanup
+            ComputerManagerService.this.onUnbind(null);
+        }
 
         public ApplistPoller createAppListPoller(ComputerDetails computer) {
             return new ApplistPoller(computer);
         }
-		
-		public String getUniqueId() {
-			return idManager.getUniqueId();
-		}
+
+        public String getUniqueId() {
+            return idManager.getUniqueId();
+        }
 
         public ComputerDetails getComputer(UUID uuid) {
             synchronized (pollingTuples) {
@@ -209,14 +225,14 @@ public class ComputerManagerService extends Service {
 
             return null;
         }
-	}
-	
-	@Override
-	public boolean onUnbind(Intent intent) {
-		// Stop mDNS autodiscovery
-		discoveryBinder.stopDiscovery();
-		
-		// Stop polling
+    }
+
+    @Override
+    public boolean onUnbind(Intent intent) {
+        // Stop mDNS autodiscovery
+        discoveryBinder.stopDiscovery();
+
+        // Stop polling
         pollingActive = false;
         synchronized (pollingTuples) {
             for (PollingTuple tuple : pollingTuples) {
@@ -227,56 +243,39 @@ public class ComputerManagerService extends Service {
                 }
             }
         }
-		
-		// Remove the listener
-		listener = null;
-		
-		return false;
-	}
-	
-	private MdnsDiscoveryListener createDiscoveryListener() {
-		return new MdnsDiscoveryListener() {
-			@Override
-			public void notifyComputerAdded(MdnsComputer computer) {
-				// Kick off a serverinfo poll on this machine
-				addComputer(computer.getAddress());
-			}
 
-			@Override
-			public void notifyComputerRemoved(MdnsComputer computer) {
-				// Nothing to do here
-			}
+        // Remove the listener
+        listener = null;
 
-			@Override
-			public void notifyDiscoveryFailure(Exception e) {
-				LimeLog.severe("mDNS discovery failed");
-				e.printStackTrace();
-			}
-		};
-	}
+        return false;
+    }
 
-	public void addComputer(InetAddress addr) {
-		// Setup a placeholder
-		ComputerDetails fakeDetails = new ComputerDetails();
-		fakeDetails.localIp = addr;
-		fakeDetails.remoteIp = addr;
-        fakeDetails.name = "";
+    private MdnsDiscoveryListener createDiscoveryListener() {
+        return new MdnsDiscoveryListener() {
+            @Override
+            public void notifyComputerAdded(MdnsComputer computer) {
+                // Kick off a serverinfo poll on this machine
+                addComputerBlocking(computer.getAddress());
+            }
 
-        addTuple(fakeDetails);
-	}
+            @Override
+            public void notifyComputerRemoved(MdnsComputer computer) {
+                // Nothing to do here
+            }
+
+            @Override
+            public void notifyDiscoveryFailure(Exception e) {
+                LimeLog.severe("mDNS discovery failed");
+                e.printStackTrace();
+            }
+        };
+    }
 
     private void addTuple(ComputerDetails details) {
         synchronized (pollingTuples) {
             for (PollingTuple tuple : pollingTuples) {
                 // Check if this is the same computer
-                if (tuple.computer == details ||
-                        // 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))) {
-
+                if (tuple.computer.uuid.equals(details.uuid)) {
                     // 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;
@@ -302,18 +301,23 @@ public class ComputerManagerService extends Service {
         }
     }
 
-	public boolean addComputerBlocking(InetAddress addr) {
-		// Setup a placeholder
-		ComputerDetails fakeDetails = new ComputerDetails();
-		fakeDetails.localIp = addr;
-		fakeDetails.remoteIp = addr;
-        fakeDetails.name = "";
-		
-		// Block while we try to fill the details
-        runPoll(fakeDetails);
-		
-		// If the machine is reachable, it was successful
-		if (fakeDetails.state == ComputerDetails.State.ONLINE) {
+    public boolean addComputerBlocking(InetAddress addr) {
+        // Setup a placeholder
+        ComputerDetails fakeDetails = new ComputerDetails();
+        fakeDetails.localIp = addr;
+        fakeDetails.remoteIp = addr;
+
+        // Block while we try to fill the details
+        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;
@@ -321,15 +325,15 @@ public class ComputerManagerService extends Service {
         else {
             return false;
         }
-	}
-	
-	public void removeComputer(String name) {
-		if (!getLocalDatabaseReference()) {
-			return;
-		}
-		
-		// Remove it from the database
-		dbManager.deleteComputer(name);
+    }
+
+    public void removeComputer(String name) {
+        if (!getLocalDatabaseReference()) {
+            return;
+        }
+
+        // Remove it from the database
+        dbManager.deleteComputer(name);
 
         synchronized (pollingTuples) {
             // Remove the computer from the computer list
@@ -344,31 +348,31 @@ public class ComputerManagerService extends Service {
                 }
             }
         }
-		
-		releaseLocalDatabaseReference();
-	}
-	
-	private boolean getLocalDatabaseReference() {
-		if (dbRefCount.get() == 0) {
-			return false;
-		}
-		
-		dbRefCount.incrementAndGet();
-		return true;
-	}
-	
-	private void releaseLocalDatabaseReference() {
-		if (dbRefCount.decrementAndGet() == 0) {
-			dbManager.close();
-		}
-	}
-	
-	private ComputerDetails tryPollIp(ComputerDetails details, InetAddress ipAddr) {
-		try {
-			NvHTTP http = new NvHTTP(ipAddr, idManager.getUniqueId(),
-					null, PlatformBinding.getCryptoProvider(ComputerManagerService.this));
 
-			ComputerDetails newDetails = http.getComputerDetails();
+        releaseLocalDatabaseReference();
+    }
+
+    private boolean getLocalDatabaseReference() {
+        if (dbRefCount.get() == 0) {
+            return false;
+        }
+
+        dbRefCount.incrementAndGet();
+        return true;
+    }
+
+    private void releaseLocalDatabaseReference() {
+        if (dbRefCount.decrementAndGet() == 0) {
+            dbManager.close();
+        }
+    }
+
+    private ComputerDetails tryPollIp(ComputerDetails details, InetAddress ipAddr) {
+        try {
+            NvHTTP http = new NvHTTP(ipAddr, idManager.getUniqueId(),
+                    null, PlatformBinding.getCryptoProvider(ComputerManagerService.this));
+
+            ComputerDetails newDetails = http.getComputerDetails();
 
             // Check if this is the PC we expected
             if (details.uuid != null && newDetails.uuid != null &&
@@ -379,84 +383,156 @@ public class ComputerManagerService extends Service {
             }
 
             return newDetails;
-		} catch (Exception e) {
-			return null;
-		}
-	}
-	
-	private boolean pollComputer(ComputerDetails details, boolean localFirst) {
-		ComputerDetails polledDetails;
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    // 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;
-        }
-		
-		if (localFirst) {
-			polledDetails = tryPollIp(details, details.localIp);
-		}
-		else {
-			polledDetails = tryPollIp(details, details.remoteIp);
-		}
-		
-		if (polledDetails == null && !details.localIp.equals(details.remoteIp)) {
-			// Failed, so let's try the fallback
-			if (!localFirst) {
-				polledDetails = tryPollIp(details, details.localIp);
-			}
-			else {
-				polledDetails = tryPollIp(details, details.remoteIp);
-			}
-			
-			// The fallback poll worked
-			if (polledDetails != null) {
-				polledDetails.reachability = !localFirst ? ComputerDetails.Reachability.LOCAL :
-					ComputerDetails.Reachability.REMOTE;
-			}
-		}
-		else if (polledDetails != null) {
-			polledDetails.reachability = localFirst ? ComputerDetails.Reachability.LOCAL :
-				ComputerDetails.Reachability.REMOTE;
-		}
-		
-		// Machine was unreachable both tries
-		if (polledDetails == null) {
-			return false;
-		}
-		
-		// If we got here, it's reachable
-		details.update(polledDetails);
-		return true;
-	}
-	
-	private boolean doPollMachine(ComputerDetails details) {
-        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);
+            reachability = ComputerDetails.Reachability.REMOTE;
         }
         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);
+            // 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());
         }
-	}
-	
-	@Override
-	public void onCreate() {
-		// Bind to the discovery service
-		bindService(new Intent(this, DiscoveryService.class),
-				discoveryServiceConnection, Service.BIND_AUTO_CREATE);
-		
-		// Lookup or generate this device's UID
-		idManager = new IdentityManager(this);
-		
-		// Initialize the DB
-		dbManager = new ComputerDatabaseManager(this);
-		dbRefCount.set(1);
+
+        // 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);
+        }
+        else {
+            polledDetails = tryPollIp(details, details.remoteIp);
+        }
+
+        if (polledDetails == null && !details.localIp.equals(details.remoteIp)) {
+            // Failed, so let's try the fallback
+            if (!localFirst) {
+                polledDetails = tryPollIp(details, details.localIp);
+            }
+            else {
+                polledDetails = tryPollIp(details, details.remoteIp);
+            }
+
+            // The fallback poll worked
+            if (polledDetails != null) {
+                polledDetails.reachability = !localFirst ? ComputerDetails.Reachability.LOCAL :
+                    ComputerDetails.Reachability.REMOTE;
+            }
+        }
+        else if (polledDetails != null) {
+            polledDetails.reachability = localFirst ? ComputerDetails.Reachability.LOCAL :
+                ComputerDetails.Reachability.REMOTE;
+        }
+
+        // Machine was unreachable both tries
+        if (polledDetails == null) {
+            return false;
+        }
+
+        // Save the old MAC address
+        String savedMacAddress = details.macAddress;
+
+        // If we got here, it's reachable
+        details.update(polledDetails);
+
+        // 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;
+        }
+
+        return true;
+    }
+
+    @Override
+    public void onCreate() {
+        // Bind to the discovery service
+        bindService(new Intent(this, DiscoveryService.class),
+                discoveryServiceConnection, Service.BIND_AUTO_CREATE);
+
+        // Lookup or generate this device's UID
+        idManager = new IdentityManager(this);
+
+        // Initialize the DB
+        dbManager = new ComputerDatabaseManager(this);
+        dbRefCount.set(1);
 
         // Grab known machines into our computer list
         if (!getLocalDatabaseReference()) {
@@ -469,30 +545,30 @@ public class ComputerManagerService extends Service {
         }
 
         releaseLocalDatabaseReference();
-	}
-	
-	@Override
-	public void onDestroy() {
-		if (discoveryBinder != null) {
-			// Unbind from the discovery service
-			unbindService(discoveryServiceConnection);
-		}
-		
-		// FIXME: Should await termination here but we have timeout issues in HttpURLConnection
-		
-		// Remove the initial DB reference
-		releaseLocalDatabaseReference();
-	}
-	
-	@Override
-	public IBinder onBind(Intent intent) {
-		return binder;
-	}
+    }
+
+    @Override
+    public void onDestroy() {
+        if (discoveryBinder != null) {
+            // Unbind from the discovery service
+            unbindService(discoveryServiceConnection);
+        }
+
+        // FIXME: Should await termination here but we have timeout issues in HttpURLConnection
+
+        // Remove the initial DB reference
+        releaseLocalDatabaseReference();
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return binder;
+    }
 
     public class ApplistPoller {
         private Thread thread;
-        private ComputerDetails computer;
-        private Object pollEvent = new Object();
+        private final ComputerDetails computer;
+        private final Object pollEvent = new Object();
 
         public ApplistPoller(ComputerDetails computer) {
             this.computer = computer;
@@ -507,7 +583,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 +628,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());
-                                CacheHelper.writeStringToOutputStream(cacheOut, appList);
-                                cacheOut.close();
+                                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 +679,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/computers/IdentityManager.java

@@ -12,75 +12,75 @@ import com.limelight.LimeLog;
 import android.content.Context;
 
 public class IdentityManager {
-	private static final String UNIQUE_ID_FILE_NAME = "uniqueid";
-	private static final int UID_SIZE_IN_BYTES = 8;
-	
-	private String uniqueId;
-	
-	public IdentityManager(Context c) {
-		uniqueId = loadUniqueId(c);
-		if (uniqueId == null) {
-			uniqueId = generateNewUniqueId(c);
-		}
-		
-		LimeLog.info("UID is now: "+uniqueId);
-	}
-	
-	public String getUniqueId() {
-		return uniqueId;
-	}
-	
-	private static String loadUniqueId(Context c) {
-		// 2 Hex digits per byte
-		char[] uid = new char[UID_SIZE_IN_BYTES * 2];
-		InputStreamReader reader = null;
-		LimeLog.info("Reading UID from disk");
-		try {
-			reader = new InputStreamReader(c.openFileInput(UNIQUE_ID_FILE_NAME));
-			if (reader.read(uid) != UID_SIZE_IN_BYTES * 2)
-			{
-				LimeLog.severe("UID file data is truncated");
-				return null;
-			}
-			return new String(uid);
-		} catch (FileNotFoundException e) {
-			LimeLog.info("No UID file found");
-			return null;
-		} catch (IOException e) {
-			LimeLog.severe("Error while reading UID file");
-			e.printStackTrace();
-			return null;
-		} finally {
-			if (reader != null) {
-				try {
-					reader.close();
-				} catch (IOException ignored) {}
-			}
-		}
-	}
-	
-	private static String generateNewUniqueId(Context c) {
-		// Generate a new UID hex string
-		LimeLog.info("Generating new UID");
-		String uidStr = String.format((Locale)null, "%016x", new Random().nextLong());
-		
-		OutputStreamWriter writer = null;
-		try {
-			writer = new OutputStreamWriter(c.openFileOutput(UNIQUE_ID_FILE_NAME, 0));
-			writer.write(uidStr);
-			LimeLog.info("UID written to disk");
-		} catch (IOException e) {
-			LimeLog.severe("Error while writing UID file");
-			e.printStackTrace();
-		} finally {
-			if (writer != null) {
-				try {
-					writer.close();
-				} catch (IOException ignored) {}
-			}
-		}
-		
-		// We can return a UID even if I/O fails
-		return uidStr;
-	}
+    private static final String UNIQUE_ID_FILE_NAME = "uniqueid";
+    private static final int UID_SIZE_IN_BYTES = 8;
+
+    private String uniqueId;
+
+    public IdentityManager(Context c) {
+        uniqueId = loadUniqueId(c);
+        if (uniqueId == null) {
+            uniqueId = generateNewUniqueId(c);
+        }
+
+        LimeLog.info("UID is now: "+uniqueId);
+    }
+
+    public String getUniqueId() {
+        return uniqueId;
+    }
+
+    private static String loadUniqueId(Context c) {
+        // 2 Hex digits per byte
+        char[] uid = new char[UID_SIZE_IN_BYTES * 2];
+        InputStreamReader reader = null;
+        LimeLog.info("Reading UID from disk");
+        try {
+            reader = new InputStreamReader(c.openFileInput(UNIQUE_ID_FILE_NAME));
+            if (reader.read(uid) != UID_SIZE_IN_BYTES * 2)
+            {
+                LimeLog.severe("UID file data is truncated");
+                return null;
+            }
+            return new String(uid);
+        } catch (FileNotFoundException e) {
+            LimeLog.info("No UID file found");
+            return null;
+        } catch (IOException e) {
+            LimeLog.severe("Error while reading UID file");
+            e.printStackTrace();
+            return null;
+        } finally {
+            if (reader != null) {
+                try {
+                    reader.close();
+                } catch (IOException ignored) {}
+            }
+        }
+    }
+
+    private static String generateNewUniqueId(Context c) {
+        // Generate a new UID hex string
+        LimeLog.info("Generating new UID");
+        String uidStr = String.format((Locale)null, "%016x", new Random().nextLong());
+
+        OutputStreamWriter writer = null;
+        try {
+            writer = new OutputStreamWriter(c.openFileOutput(UNIQUE_ID_FILE_NAME, 0));
+            writer.write(uidStr);
+            LimeLog.info("UID written to disk");
+        } catch (IOException e) {
+            LimeLog.severe("Error while writing UID file");
+            e.printStackTrace();
+        } finally {
+            if (writer != null) {
+                try {
+                    writer.close();
+                } catch (IOException ignored) {}
+            }
+        }
+
+        // We can return a UID even if I/O fails
+        return uidStr;
+    }
 }

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

@@ -15,76 +15,76 @@ import android.os.Binder;
 import android.os.IBinder;
 
 public class DiscoveryService extends Service {
-	
-	private MdnsDiscoveryAgent discoveryAgent;
-	private MdnsDiscoveryListener boundListener;
-	private MulticastLock multicastLock;
-	
-	public class DiscoveryBinder extends Binder {
-		public void setListener(MdnsDiscoveryListener listener) {
-			boundListener = listener;
-		}
-		
-		public void startDiscovery(int queryIntervalMs) {
-			multicastLock.acquire();
-			discoveryAgent.startDiscovery(queryIntervalMs);
-		}
-		
-		public void stopDiscovery() {
-			discoveryAgent.stopDiscovery();
-			multicastLock.release();
-		}
-		
-		public List<MdnsComputer> getComputerSet() {
-			return discoveryAgent.getComputerSet();
-		}
-	}
-	
-	@Override
-	public void onCreate() {
-		WifiManager wifiMgr = (WifiManager) getSystemService(Context.WIFI_SERVICE);
-		multicastLock = wifiMgr.createMulticastLock("Limelight mDNS");
-		multicastLock.setReferenceCounted(false);
-		
-		discoveryAgent = new MdnsDiscoveryAgent(new MdnsDiscoveryListener() {
-			@Override
-			public void notifyComputerAdded(MdnsComputer computer) {
-				if (boundListener != null) {
-					boundListener.notifyComputerAdded(computer);
-				}
-			}
 
-			@Override
-			public void notifyComputerRemoved(MdnsComputer computer) {
-				if (boundListener != null) {
-					boundListener.notifyComputerRemoved(computer);
-				}
-			}
+    private MdnsDiscoveryAgent discoveryAgent;
+    private MdnsDiscoveryListener boundListener;
+    private MulticastLock multicastLock;
 
-			@Override
-			public void notifyDiscoveryFailure(Exception e) {
-				if (boundListener != null) {
-					boundListener.notifyDiscoveryFailure(e);
-				}
-			}
-		});
-	}
-	
-	private DiscoveryBinder binder = new DiscoveryBinder();
-	
-	@Override
-	public IBinder onBind(Intent intent) {
-		return binder;
-	}
-	
-	@Override
-	public boolean onUnbind(Intent intent) {
-		// Stop any discovery session
-		discoveryAgent.stopDiscovery();
-		multicastLock.release();
-		
-		// Unbind the listener
-		boundListener = null;
-		return false;
-	}
+    public class DiscoveryBinder extends Binder {
+        public void setListener(MdnsDiscoveryListener listener) {
+            boundListener = listener;
+        }
+
+        public void startDiscovery(int queryIntervalMs) {
+            multicastLock.acquire();
+            discoveryAgent.startDiscovery(queryIntervalMs);
+        }
+
+        public void stopDiscovery() {
+            discoveryAgent.stopDiscovery();
+            multicastLock.release();
+        }
+
+        public List<MdnsComputer> getComputerSet() {
+            return discoveryAgent.getComputerSet();
+        }
+    }
+
+    @Override
+    public void onCreate() {
+        WifiManager wifiMgr = (WifiManager) getSystemService(Context.WIFI_SERVICE);
+        multicastLock = wifiMgr.createMulticastLock("Limelight mDNS");
+        multicastLock.setReferenceCounted(false);
+
+        discoveryAgent = new MdnsDiscoveryAgent(new MdnsDiscoveryListener() {
+            @Override
+            public void notifyComputerAdded(MdnsComputer computer) {
+                if (boundListener != null) {
+                    boundListener.notifyComputerAdded(computer);
+                }
+            }
+
+            @Override
+            public void notifyComputerRemoved(MdnsComputer computer) {
+                if (boundListener != null) {
+                    boundListener.notifyComputerRemoved(computer);
+                }
+            }
+
+            @Override
+            public void notifyDiscoveryFailure(Exception e) {
+                if (boundListener != null) {
+                    boundListener.notifyDiscoveryFailure(e);
+                }
+            }
+        });
+    }
+
+    private final DiscoveryBinder binder = new DiscoveryBinder();
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return binder;
+    }
+
+    @Override
+    public boolean onUnbind(Intent intent) {
+        // Stop any discovery session
+        discoveryAgent.stopDiscovery();
+        multicastLock.release();
+
+        // Unbind the listener
+        boundListener = null;
+        return false;
+    }
 }

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

@@ -1,117 +1,68 @@
 package com.limelight.grid;
 
-import android.content.Context;
-import android.graphics.Bitmap;
+import android.app.Activity;
 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 String uniqueId;
-    private LimelightCryptoProvider cryptoProvider;
-    private SSLContext sslContext;
-    private final HashMap<ImageView, Future> pendingRequests = new HashMap<ImageView, Future>();
+    private final CachedAppAssetLoader loader;
 
-    public AppGridAdapter(Context context, boolean listMode, boolean small, ComputerDetails computer, String uniqueId) throws NoSuchAlgorithmException, KeyManagementException {
-        super(context, listMode ? R.layout.simple_row : (small ? R.layout.app_grid_item_small : R.layout.app_grid_item), R.drawable.image_loading);
+    public AppGridAdapter(Activity activity, boolean listMode, boolean small, ComputerDetails computer, String uniqueId) throws KeyManagementException, NoSuchAlgorithmException {
+        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;
-        this.uniqueId = uniqueId;
+        int dpi = activity.getResources().getDisplayMetrics().densityDpi;
+        int dp;
 
-        cryptoProvider = PlatformBinding.getCryptoProvider(context);
+        if (small) {
+            dp = SMALL_WIDTH_DP;
+        }
+        else {
+            dp = LARGE_WIDTH_DP;
+        }
 
-        sslContext = SSLContext.getInstance("SSL");
-        sslContext.init(ourKeyman, trustAllCerts, new SecureRandom());
+        double scalingDivisor = ART_WIDTH_PX / (dp * (dpi / 160.0));
+        if (scalingDivisor < 1.0) {
+            // We don't want to make them bigger before draw-time
+            scalingDivisor = 1.0;
+        }
+        LimeLog.info("Art scaling divisor: " + scalingDivisor);
+
+        BitmapFactory.Options options = new BitmapFactory.Options();
+        options.inSampleSize = (int) scalingDivisor;
+
+        this.loader = new CachedAppAssetLoader(computer, scalingDivisor,
+                new NetworkAssetLoader(context, uniqueId),
+                new MemoryAssetLoader(),
+                new DiskAssetLoader(context.getCacheDir()),
+                BitmapFactory.decodeResource(activity.getResources(),
+                        R.drawable.image_loading, options));
     }
 
-    TrustManager[] trustAllCerts = new TrustManager[] {
-            new X509TrustManager() {
-                public X509Certificate[] getAcceptedIssuers() {
-                    return new X509Certificate[0];
-                }
-                public void checkClientTrusted(X509Certificate[] certs, String authType) {}
-                public void checkServerTrusted(X509Certificate[] certs, String authType) {}
-            }};
-
-    KeyManager[] ourKeyman = new KeyManager[] {
-            new X509KeyManager() {
-                public String chooseClientAlias(String[] keyTypes,
-                                                Principal[] issuers, Socket socket) {
-                    return "Limelight-RSA";
-                }
-
-                public String chooseServerAlias(String keyType, Principal[] issuers,
-                                                Socket socket) {
-                    return null;
-                }
-
-                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; }
-    };
+    public void cancelQueuedOperations() {
+        loader.cancelForegroundLoads();
+        loader.cancelBackgroundLoads();
+        loader.freeCacheMemory();
+    }
 
     private void sortList() {
         Collections.sort(itemList, new Comparator<AppView.AppObject>() {
@@ -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() {
-        HashMap<ImageView, Future> tempMap;
-
-        synchronized (pendingRequests) {
-            // Copy the pending requests under a lock
-            tempMap = new HashMap<ImageView, Future>(pendingRequests);
-        }
-
-        for (Future f : tempMap.values()) {
-            if (!f.isCancelled() && !f.isDone()) {
-                f.cancel(true);
-            }
-        }
-
-        synchronized (pendingRequests) {
-            // Remove cancelled requests
-            for (ImageView v : tempMap.keySet()) {
-                pendingRequests.remove(v);
-            }
-        }
+    public void removeApp(AppView.AppObject app) {
+        itemList.remove(app);
     }
 
-    // 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();
-
+    public boolean populateImageView(ImageView imgView, AppView.AppObject obj) {
+        // Let the cached asset loader handle it
+        loader.populateImageView(obj.app, imgView);
         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 int defaultImageRes;
-    protected int layoutId;
-    protected ArrayList<T> itemList = new ArrayList<T>();
-    protected LayoutInflater inflater;
+    protected final Context context;
+    protected final int defaultImageRes;
+    protected final int layoutId;
+    protected final ArrayList<T> itemList = new ArrayList<T>();
+    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,333 @@
+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.IOException;
+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);
+
+                // Close the network input stream
+                try {
+                    in.close();
+                } catch (IOException ignored) {}
+
+                // 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/nvstream/av/video/cpu/AvcDecoder.java

@@ -1,44 +1,44 @@
 package com.limelight.nvstream.av.video.cpu;
 
 public class AvcDecoder {
-	static {
-		// FFMPEG dependencies
-		System.loadLibrary("avutil-52");
-		System.loadLibrary("swresample-0");
-		System.loadLibrary("swscale-2");
-		System.loadLibrary("avcodec-55");
-		System.loadLibrary("avformat-55");
-		
-		System.loadLibrary("nv_avc_dec");
-	}
-	
-	/** Disables the deblocking filter at the cost of image quality */
-	public static final int DISABLE_LOOP_FILTER = 0x1;
-	/** Uses the low latency decode flag (disables multithreading) */
-	public static final int LOW_LATENCY_DECODE = 0x2;
-	/** Threads process each slice, rather than each frame */
-	public static final int SLICE_THREADING = 0x4;
-	/** Uses nonstandard speedup tricks */
-	public static final int FAST_DECODE = 0x8;
-	/** Uses bilinear filtering instead of bicubic */
-	public static final int BILINEAR_FILTERING = 0x10;
-	/** Uses a faster bilinear filtering with lower image quality */
-	public static final int FAST_BILINEAR_FILTERING = 0x20;
-	/** Disables color conversion (output is NV21) */
-	public static final int NO_COLOR_CONVERSION = 0x40;
-	
-	public static native int init(int width, int height, int perflvl, int threadcount);
-	public static native void destroy();
-	
-	// Rendering API when NO_COLOR_CONVERSION == 0
-	public static native boolean setRenderTarget(Object androidSurface);
-	public static native boolean getRgbFrameInt(int[] rgbFrame, int bufferSize);
-	public static native boolean getRgbFrame(byte[] rgbFrame, int bufferSize);
-	public static native boolean redraw();
+    static {
+        // FFMPEG dependencies
+        System.loadLibrary("avutil-52");
+        System.loadLibrary("swresample-0");
+        System.loadLibrary("swscale-2");
+        System.loadLibrary("avcodec-55");
+        System.loadLibrary("avformat-55");
 
-	// Rendering API when NO_COLOR_CONVERSION == 1
-	public static native boolean getRawFrame(byte[] yuvFrame, int bufferSize);
-	
-	public static native int getInputPaddingSize();
-	public static native int decode(byte[] indata, int inoff, int inlen);
+        System.loadLibrary("nv_avc_dec");
+    }
+
+    /** Disables the deblocking filter at the cost of image quality */
+    public static final int DISABLE_LOOP_FILTER = 0x1;
+    /** Uses the low latency decode flag (disables multithreading) */
+    public static final int LOW_LATENCY_DECODE = 0x2;
+    /** Threads process each slice, rather than each frame */
+    public static final int SLICE_THREADING = 0x4;
+    /** Uses nonstandard speedup tricks */
+    public static final int FAST_DECODE = 0x8;
+    /** Uses bilinear filtering instead of bicubic */
+    public static final int BILINEAR_FILTERING = 0x10;
+    /** Uses a faster bilinear filtering with lower image quality */
+    public static final int FAST_BILINEAR_FILTERING = 0x20;
+    /** Disables color conversion (output is NV21) */
+    public static final int NO_COLOR_CONVERSION = 0x40;
+
+    public static native int init(int width, int height, int perflvl, int threadcount);
+    public static native void destroy();
+
+    // Rendering API when NO_COLOR_CONVERSION == 0
+    public static native boolean setRenderTarget(Object androidSurface);
+    public static native boolean getRgbFrameInt(int[] rgbFrame, int bufferSize);
+    public static native boolean getRgbFrame(byte[] rgbFrame, int bufferSize);
+    public static native boolean redraw();
+
+    // Rendering API when NO_COLOR_CONVERSION == 1
+    public static native boolean getRawFrame(byte[] yuvFrame, int bufferSize);
+
+    public static native int getInputPaddingSize();
+    public static native int decode(byte[] indata, int inoff, int inlen);
 }

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,131 +22,132 @@ 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 Thread addThread;
-	private ServiceConnection serviceConnection = new ServiceConnection() {
-		public void onServiceConnected(ComponentName className, final IBinder binder) {
-			managerBinder = ((ComputerManagerService.ComputerManagerBinder)binder);
-			startAddThread();
-		}
+    private TextView hostText;
+    private ComputerManagerService.ComputerManagerBinder managerBinder;
+    private final LinkedBlockingQueue<String> computersToAdd = new LinkedBlockingQueue<String>();
+    private Thread addThread;
+    private final ServiceConnection serviceConnection = new ServiceConnection() {
+        public void onServiceConnected(ComponentName className, final IBinder binder) {
+            managerBinder = ((ComputerManagerService.ComputerManagerBinder)binder);
+            startAddThread();
+        }
 
-		public void onServiceDisconnected(ComponentName className) {
-			joinAddThread();
-			managerBinder = null;
-		}
-	};
-	
-	private void doAddPc(String host) {
-		String msg;
-		boolean finish = false;
+        public void onServiceDisconnected(ComponentName className) {
+            joinAddThread();
+            managerBinder = null;
+        }
+    };
+
+    private void doAddPc(String host) {
+        String msg;
+        boolean finish = false;
 
         SpinnerDialog dialog = SpinnerDialog.displayDialog(this, getResources().getString(R.string.title_add_pc),
-			getResources().getString(R.string.msg_add_pc), false);
+            getResources().getString(R.string.msg_add_pc), false);
 
-		try {
-			InetAddress addr = InetAddress.getByName(host);
-			
-			if (!managerBinder.addComputerBlocking(addr)){
-				msg = getResources().getString(R.string.addpc_fail);
-			}
-			else {
-				msg = getResources().getString(R.string.addpc_success);
-				finish = true;
-			}
-		} catch (UnknownHostException e) {
-			msg = getResources().getString(R.string.addpc_unknown_host);
-		}
+        try {
+            InetAddress addr = InetAddress.getByName(host);
+
+            if (!managerBinder.addComputerBlocking(addr)){
+                msg = getResources().getString(R.string.addpc_fail);
+            }
+            else {
+                msg = getResources().getString(R.string.addpc_success);
+                finish = true;
+            }
+        } catch (UnknownHostException e) {
+            msg = getResources().getString(R.string.addpc_unknown_host);
+        }
 
         dialog.dismiss();
 
         final boolean toastFinish = finish;
-		final String toastMsg = msg;
-		AddComputerManually.this.runOnUiThread(new Runnable() {
-			@Override
-			public void run() {
-				Toast.makeText(AddComputerManually.this, toastMsg, Toast.LENGTH_LONG).show();
-				
-				if (toastFinish && !isFinishing()) {
-					// Close the activity
-					AddComputerManually.this.finish();
-				}
-			}
-		});
-	}
-	
-	private void startAddThread() {
-		addThread = new Thread() {
-			@Override
-			public void run() {
-				while (!isInterrupted()) {
-					String computer;
-					
-					try {
-						computer = computersToAdd.take();
-					} catch (InterruptedException e) {
-						return;
-					}
-					
-					doAddPc(computer);
-				}
-			}
-		};
-		addThread.setName("UI - AddComputerManually");
-		addThread.start();
-	}
-	
-	private void joinAddThread() {
-		if (addThread != null) {
-			addThread.interrupt();
-			
-			try {
-				addThread.join();
-			} catch (InterruptedException ignored) {}
-			
-			addThread = null;
-		}
-	}
+        final String toastMsg = msg;
+        AddComputerManually.this.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                Toast.makeText(AddComputerManually.this, toastMsg, Toast.LENGTH_LONG).show();
 
-	@Override
-	protected void onStop() {
-		super.onStop();
-		
-		Dialog.closeDialogs();
+                if (toastFinish && !isFinishing()) {
+                    // Close the activity
+                    AddComputerManually.this.finish();
+                }
+            }
+        });
+    }
+
+    private void startAddThread() {
+        addThread = new Thread() {
+            @Override
+            public void run() {
+                while (!isInterrupted()) {
+                    String computer;
+
+                    try {
+                        computer = computersToAdd.take();
+                    } catch (InterruptedException e) {
+                        return;
+                    }
+
+                    doAddPc(computer);
+                }
+            }
+        };
+        addThread.setName("UI - AddComputerManually");
+        addThread.start();
+    }
+
+    private void joinAddThread() {
+        if (addThread != null) {
+            addThread.interrupt();
+
+            try {
+                addThread.join();
+            } catch (InterruptedException ignored) {}
+
+            addThread = null;
+        }
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+
+        Dialog.closeDialogs();
         SpinnerDialog.closeDialogs(this);
-	}
-	
-	@Override
-	protected void onDestroy() {
-		super.onDestroy();
-		
-		if (managerBinder != null) {
-			joinAddThread();
-			unbindService(serviceConnection);
-		}
-	}
-	
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		
-		String locale = PreferenceConfiguration.readPreferences(this).language;
-		if (!locale.equals(PreferenceConfiguration.DEFAULT_LANGUAGE)) {
-			Configuration config = new Configuration(getResources().getConfiguration());
-			config.locale = new Locale(locale);
-			getResources().updateConfiguration(config, getResources().getDisplayMetrics());
-		}
-		
-		setContentView(R.layout.activity_add_computer_manually);
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+
+        if (managerBinder != null) {
+            joinAddThread();
+            unbindService(serviceConnection);
+        }
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        String locale = PreferenceConfiguration.readPreferences(this).language;
+        if (!locale.equals(PreferenceConfiguration.DEFAULT_LANGUAGE)) {
+            Configuration config = new Configuration(getResources().getConfiguration());
+            config.locale = new Locale(locale);
+            getResources().updateConfiguration(config, getResources().getDisplayMetrics());
+        }
+
+        setContentView(R.layout.activity_add_computer_manually);
 
         UiHelper.notifyNewRootView(this);
 
-		this.hostText = (TextView) findViewById(R.id.hostTextView);
+        this.hostText = (TextView) findViewById(R.id.hostTextView);
         hostText.setImeOptions(EditorInfo.IME_ACTION_DONE);
         hostText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
@@ -161,13 +163,19 @@ 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;
             }
         });
-		
-		// Bind to the ComputerManager service
-		bindService(new Intent(AddComputerManually.this,
-					ComputerManagerService.class), serviceConnection, Service.BIND_AUTO_CREATE);
-	}
+
+        // Bind to the ComputerManager service
+        bindService(new Intent(AddComputerManually.this,
+                    ComputerManagerService.class), serviceConnection, Service.BIND_AUTO_CREATE);
+    }
 }

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 int defaultValue, maxValue, minValue, currentValue;
+    private final String dialogMessage;
+    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 {
-        return new FileInputStream(openPath(false, root, path));
+    public static boolean cacheFileExists(File root, String... path) {
+        return openPath(false, root, path).exists();
     }
 
-    public static FileOutputStream openCacheFileForOutput(File root, String... path) throws FileNotFoundException {
-        return new FileOutputStream(openPath(true, root, path));
+    public static InputStream openCacheFileForInput(File root, String... path) throws FileNotFoundException {
+        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 {
@@ -48,6 +61,10 @@ public class CacheHelper {
             sb.append(buf, 0, bytesRead);
         }
 
+        try {
+            in.close();
+        } catch (IOException ignored) {}
+
         return sb.toString();
     }
 

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

@@ -7,70 +7,71 @@ import android.app.AlertDialog;
 import android.content.DialogInterface;
 
 public class Dialog implements Runnable {
-	private String title, message;
-	private Activity activity;
-	private boolean endAfterDismiss;
-	
-	private AlertDialog alert;
-	
-	private static final ArrayList<Dialog> rundownDialogs = new ArrayList<Dialog>();
-	
-	public Dialog(Activity activity, String title, String message, boolean endAfterDismiss)
-	{
-		this.activity = activity;
-		this.title = title;
-		this.message = message;
-		this.endAfterDismiss = endAfterDismiss;
-	}
-	
-	public static void closeDialogs()
-	{
-		synchronized (rundownDialogs) {
-			for (Dialog d : rundownDialogs) {
-				if (d.alert.isShowing()) {
-					d.alert.dismiss();
-				}
-			}
-			
-			rundownDialogs.clear();
-		}
-	}
-	
-	public static void displayDialog(Activity activity, String title, String message, boolean endAfterDismiss)
-	{
-		activity.runOnUiThread(new Dialog(activity, title, message, endAfterDismiss));
-	}
-	
-	@Override
-	public void run() {
-		// If we're dying, don't bother creating a dialog
-		if (activity.isFinishing())
-			return;
-		
-		alert = new AlertDialog.Builder(activity).create();
+    private final String title;
+    private final String message;
+    private final Activity activity;
+    private final boolean endAfterDismiss;
 
-    	alert.setTitle(title);
-    	alert.setMessage(message);
-    	alert.setCancelable(false);
-    	alert.setCanceledOnTouchOutside(false);
+    private AlertDialog alert;
+
+    private static final ArrayList<Dialog> rundownDialogs = new ArrayList<Dialog>();
+
+    private Dialog(Activity activity, String title, String message, boolean endAfterDismiss)
+    {
+        this.activity = activity;
+        this.title = title;
+        this.message = message;
+        this.endAfterDismiss = endAfterDismiss;
+    }
+
+    public static void closeDialogs()
+    {
+        synchronized (rundownDialogs) {
+            for (Dialog d : rundownDialogs) {
+                if (d.alert.isShowing()) {
+                    d.alert.dismiss();
+                }
+            }
+
+            rundownDialogs.clear();
+        }
+    }
+
+    public static void displayDialog(Activity activity, String title, String message, boolean endAfterDismiss)
+    {
+        activity.runOnUiThread(new Dialog(activity, title, message, endAfterDismiss));
+    }
+
+    @Override
+    public void run() {
+        // If we're dying, don't bother creating a dialog
+        if (activity.isFinishing())
+            return;
+
+        alert = new AlertDialog.Builder(activity).create();
+
+        alert.setTitle(title);
+        alert.setMessage(message);
+        alert.setCancelable(false);
+        alert.setCanceledOnTouchOutside(false);
  
-    	alert.setButton(AlertDialog.BUTTON_NEUTRAL, "OK", new DialogInterface.OnClickListener() {
-    	      public void onClick(DialogInterface dialog, int which) {
-    	    	  synchronized (rundownDialogs) {
-        	    	  rundownDialogs.remove(Dialog.this);
-        	    	  alert.dismiss();
-    	    	  }
-    	    	  
-    	    	  if (endAfterDismiss) {
-    	    		  activity.finish();
-    	    	  }
-    	      }
-    	});
-    	
-    	synchronized (rundownDialogs) {
-        	rundownDialogs.add(this);
-        	alert.show();	
-    	}
-	}
+        alert.setButton(AlertDialog.BUTTON_NEUTRAL, "OK", new DialogInterface.OnClickListener() {
+              public void onClick(DialogInterface dialog, int which) {
+                  synchronized (rundownDialogs) {
+                      rundownDialogs.remove(Dialog.this);
+                      alert.dismiss();
+                  }
+
+                  if (endAfterDismiss) {
+                      activity.finish();
+                  }
+              }
+        });
+
+        synchronized (rundownDialogs) {
+            rundownDialogs.add(this);
+            alert.show();
+        }
+    }
 
 }

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,111 +9,112 @@ import android.content.DialogInterface;
 import android.content.DialogInterface.OnCancelListener;
 
 public class SpinnerDialog implements Runnable,OnCancelListener {
-	private String title, message;
-	private Activity activity;
-	private ProgressDialog progress;
-	private boolean finish;
-	
-	private static final ArrayList<SpinnerDialog> rundownDialogs = new ArrayList<SpinnerDialog>();
-	
-	public SpinnerDialog(Activity activity, String title, String message, boolean finish)
-	{
-		this.activity = activity;
-		this.title = title;
-		this.message = message;
-		this.progress = null;
-		this.finish = finish;
-	}
-	
-	public static SpinnerDialog displayDialog(Activity activity, String title, String message, boolean finish)
-	{
-		SpinnerDialog spinner = new SpinnerDialog(activity, title, message, finish);
-		activity.runOnUiThread(spinner);
-		return spinner;
-	}
-	
-	public static void closeDialogs(Activity activity)
-	{
-		synchronized (rundownDialogs) {
-			Iterator<SpinnerDialog> i = rundownDialogs.iterator();
-			while (i.hasNext()) {
-				SpinnerDialog dialog = i.next();
-				if (dialog.activity == activity) {
-					i.remove();
-					if (dialog.progress.isShowing()) {
-						dialog.progress.dismiss();
-					}
-				}
-			}
-		}
-	}
-	
-	public void dismiss()
-	{
-		// Running again with progress != null will destroy it
-		activity.runOnUiThread(this);
-	}
-	
-	public void setMessage(final String message)
-	{
-		activity.runOnUiThread(new Runnable() {
-			@Override
-			public void run() {
-				progress.setMessage(message);
-			}
-		});
-	}
-	
-	@Override
-	public void run() {
+    private final String title;
+    private final String message;
+    private final Activity activity;
+    private ProgressDialog progress;
+    private final boolean finish;
 
-		// If we're dying, don't bother doing anything
-		if (activity.isFinishing()) {
-			return;
-		}
-		
-		if (progress == null)
-		{
-	    	progress = new ProgressDialog(activity);
-	    	
-	    	progress.setTitle(title);
-	    	progress.setMessage(message);
-	    	progress.setProgressStyle(ProgressDialog.STYLE_SPINNER);
-	    	progress.setOnCancelListener(this);
-	    	
-	    	// If we want to finish the activity when this is killed, make it cancellable
-	    	if (finish)
-	    	{
-	    		progress.setCancelable(true);
-	    		progress.setCanceledOnTouchOutside(false);
-	    	}
-	    	else
-	    	{
-	    		progress.setCancelable(false);
-	    	}
-	    	
-	    	synchronized (rundownDialogs) {
-		    	rundownDialogs.add(this);
-		    	progress.show();
-	    	}
-		}
-		else
-		{
-			synchronized (rundownDialogs) {
-				if (rundownDialogs.remove(this) && progress.isShowing()) {
-					progress.dismiss();
-				}
-			}
-		}
-	}
+    private static final ArrayList<SpinnerDialog> rundownDialogs = new ArrayList<SpinnerDialog>();
 
-	@Override
-	public void onCancel(DialogInterface dialog) {
-		synchronized (rundownDialogs) {
-			rundownDialogs.remove(this);
-		}
-		
-		// This will only be called if finish was true, so we don't need to check again
-		activity.finish();
-	}
+    private SpinnerDialog(Activity activity, String title, String message, boolean finish)
+    {
+        this.activity = activity;
+        this.title = title;
+        this.message = message;
+        this.progress = null;
+        this.finish = finish;
+    }
+
+    public static SpinnerDialog displayDialog(Activity activity, String title, String message, boolean finish)
+    {
+        SpinnerDialog spinner = new SpinnerDialog(activity, title, message, finish);
+        activity.runOnUiThread(spinner);
+        return spinner;
+    }
+
+    public static void closeDialogs(Activity activity)
+    {
+        synchronized (rundownDialogs) {
+            Iterator<SpinnerDialog> i = rundownDialogs.iterator();
+            while (i.hasNext()) {
+                SpinnerDialog dialog = i.next();
+                if (dialog.activity == activity) {
+                    i.remove();
+                    if (dialog.progress.isShowing()) {
+                        dialog.progress.dismiss();
+                    }
+                }
+            }
+        }
+    }
+
+    public void dismiss()
+    {
+        // Running again with progress != null will destroy it
+        activity.runOnUiThread(this);
+    }
+
+    public void setMessage(final String message)
+    {
+        activity.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                progress.setMessage(message);
+            }
+        });
+    }
+
+    @Override
+    public void run() {
+
+        // If we're dying, don't bother doing anything
+        if (activity.isFinishing()) {
+            return;
+        }
+
+        if (progress == null)
+        {
+            progress = new ProgressDialog(activity);
+
+            progress.setTitle(title);
+            progress.setMessage(message);
+            progress.setProgressStyle(ProgressDialog.STYLE_SPINNER);
+            progress.setOnCancelListener(this);
+
+            // If we want to finish the activity when this is killed, make it cancellable
+            if (finish)
+            {
+                progress.setCancelable(true);
+                progress.setCanceledOnTouchOutside(false);
+            }
+            else
+            {
+                progress.setCancelable(false);
+            }
+
+            synchronized (rundownDialogs) {
+                rundownDialogs.add(this);
+                progress.show();
+            }
+        }
+        else
+        {
+            synchronized (rundownDialogs) {
+                if (rundownDialogs.remove(this) && progress.isShowing()) {
+                    progress.dismiss();
+                }
+            }
+        }
+    }
+
+    @Override
+    public void onCancel(DialogInterface dialog) {
+        synchronized (rundownDialogs) {
+            rundownDialogs.remove(this);
+        }
+
+        // This will only be called if finish was true, so we don't need to check again
+        activity.finish();
+    }
 }

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,12 +95,14 @@
     <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>
 
     <string name="category_ui_settings">Impostazioni Interfaccia</string>
     <string name="title_language_list">Lingua</string>
-    <string name="summary_language_list">Lingua da usare in Limelight</string>
+    <string name="summary_language_list">Lingua da usare in Moonlight</string>
     <string name="title_checkbox_list_mode">Usa lista invece della griglia</string>
     <string name="summary_checkbox_list_mode">Visualizza applicazioni e computers in una lista invece di una griglia</string>
     <string name="title_checkbox_small_icon_mode">Usa icone piccole</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,12 +95,14 @@
     <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>
 
     <string name="category_ui_settings">UI Settings</string>
     <string name="title_language_list">Language</string>
-    <string name="summary_language_list">Language to use for Limelight</string>
+    <string name="summary_language_list">Language to use for Moonlight</string>
     <string name="title_checkbox_list_mode">Use lists instead of grids</string>
     <string name="summary_checkbox_list_mode">Display apps and PCs in lists instead of grids</string>
     <string name="title_checkbox_small_icon_mode">Use small icons</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">
-        <com.limelight.preferences.SeekBarPreference
+    <PreferenceCategory android:title="@string/category_gamepad_settings">
+        <!--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"/>
-    </PreferenceCategory-->
+            android:title="@string/title_seekbar_deadzone"/-->
+        <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"

app/src/nonRoot/AndroidManifest.xml

@@ -2,5 +2,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- Non-root application name -->
-    <application android:label="Limelight" />
+    <application android:label="Moonlight" />
 </manifest>

app/src/root/AndroidManifest.xml

@@ -5,5 +5,5 @@
     <uses-permission android:name="android.permission.ACCESS_SUPERUSER" />
 
     <!-- Root application name -->
-    <application android:label="Limelight (Root)" />
+    <application android:label="Moonlight (Root)" />
 </manifest>

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'
     }
 }
 

moonlight-android.iml

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