diff --git a/app/src/main/java/com/limelight/AppView.java b/app/src/main/java/com/limelight/AppView.java index 931e5b34..c215c488 100644 --- a/app/src/main/java/com/limelight/AppView.java +++ b/app/src/main/java/com/limelight/AppView.java @@ -1,5 +1,6 @@ package com.limelight; +import java.io.IOException; import java.io.StringReader; import java.util.List; @@ -43,6 +44,8 @@ import android.widget.TextView; import android.widget.Toast; import android.widget.AdapterView.AdapterContextMenuInfo; +import org.xmlpull.v1.XmlPullParserException; + public class AppView extends Activity implements AdapterFragmentCallbacks { private AppGridAdapter appGridAdapter; private String uuidString; @@ -214,7 +217,9 @@ public class AppView extends Activity implements AdapterFragmentCallbacks { blockingLoadSpinner.dismiss(); blockingLoadSpinner = null; } - } catch (Exception ignored) {} + } catch (XmlPullParserException | IOException e) { + e.printStackTrace(); + } } }); @@ -278,7 +283,7 @@ public class AppView extends Activity implements AdapterFragmentCallbacks { List applist = NvHTTP.getAppListByReader(new StringReader(lastRawApplist)); updateUiWithAppList(applist); LimeLog.info("Loaded applist from cache"); - } catch (Exception e) { + } catch (IOException | XmlPullParserException e) { if (lastRawApplist != null) { LimeLog.warning("Saved applist corrupted: "+lastRawApplist); e.printStackTrace(); diff --git a/app/src/main/java/com/limelight/PcView.java b/app/src/main/java/com/limelight/PcView.java index 8d276920..7e4ffeb9 100644 --- a/app/src/main/java/com/limelight/PcView.java +++ b/app/src/main/java/com/limelight/PcView.java @@ -53,6 +53,8 @@ import android.widget.RelativeLayout; import android.widget.Toast; import android.widget.AdapterView.AdapterContextMenuInfo; +import org.xmlpull.v1.XmlPullParserException; + import javax.microedition.khronos.egl.EGLConfig; import javax.microedition.khronos.opengles.GL10; @@ -420,7 +422,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks { message = getResources().getString(R.string.error_unknown_host); } catch (FileNotFoundException e) { message = getResources().getString(R.string.error_404); - } catch (Exception e) { + } catch (XmlPullParserException | IOException e) { e.printStackTrace(); message = e.getMessage(); } @@ -521,8 +523,9 @@ public class PcView extends Activity implements AdapterFragmentCallbacks { message = getResources().getString(R.string.error_unknown_host); } catch (FileNotFoundException e) { message = getResources().getString(R.string.error_404); - } catch (Exception e) { + } catch (XmlPullParserException | IOException e) { message = e.getMessage(); + e.printStackTrace(); } final String toastMessage = message; diff --git a/app/src/main/java/com/limelight/binding/crypto/AndroidCryptoProvider.java b/app/src/main/java/com/limelight/binding/crypto/AndroidCryptoProvider.java index eb9352f7..08d86d40 100644 --- a/app/src/main/java/com/limelight/binding/crypto/AndroidCryptoProvider.java +++ b/app/src/main/java/com/limelight/binding/crypto/AndroidCryptoProvider.java @@ -154,7 +154,7 @@ public class AndroidCryptoProvider implements LimelightCryptoProvider { } catch (Exception e) { // Nothing should go wrong here e.printStackTrace(); - return false; + throw new RuntimeException(e); } LimeLog.info("Generated a new key pair"); diff --git a/app/src/main/java/com/limelight/binding/input/virtual_controller/VirtualController.java b/app/src/main/java/com/limelight/binding/input/virtual_controller/VirtualController.java index 39d26f03..3d166a0d 100644 --- a/app/src/main/java/com/limelight/binding/input/virtual_controller/VirtualController.java +++ b/app/src/main/java/com/limelight/binding/input/virtual_controller/VirtualController.java @@ -167,26 +167,22 @@ public class VirtualController { } void sendControllerInputContext() { - try { - _DBG("INPUT_MAP + " + inputContext.inputMap); - _DBG("LEFT_TRIGGER " + inputContext.leftTrigger); - _DBG("RIGHT_TRIGGER " + inputContext.rightTrigger); - _DBG("LEFT STICK X: " + inputContext.leftStickX + " Y: " + inputContext.leftStickY); - _DBG("RIGHT STICK X: " + inputContext.rightStickX + " Y: " + inputContext.rightStickY); + _DBG("INPUT_MAP + " + inputContext.inputMap); + _DBG("LEFT_TRIGGER " + inputContext.leftTrigger); + _DBG("RIGHT_TRIGGER " + inputContext.rightTrigger); + _DBG("LEFT STICK X: " + inputContext.leftStickX + " Y: " + inputContext.leftStickY); + _DBG("RIGHT STICK X: " + inputContext.rightStickX + " Y: " + inputContext.rightStickY); - if (connection != null) { - connection.sendControllerInput( - inputContext.inputMap, - inputContext.leftTrigger, - inputContext.rightTrigger, - inputContext.leftStickX, - inputContext.leftStickY, - inputContext.rightStickX, - inputContext.rightStickY - ); - } - } catch (Exception e) { - e.printStackTrace(); + if (connection != null) { + connection.sendControllerInput( + inputContext.inputMap, + inputContext.leftTrigger, + inputContext.rightTrigger, + inputContext.leftStickX, + inputContext.leftStickY, + inputContext.rightStickX, + inputContext.rightStickY + ); } } } diff --git a/app/src/main/java/com/limelight/binding/input/virtual_controller/VirtualControllerElement.java b/app/src/main/java/com/limelight/binding/input/virtual_controller/VirtualControllerElement.java index e026b35b..f99cc69a 100644 --- a/app/src/main/java/com/limelight/binding/input/virtual_controller/VirtualControllerElement.java +++ b/app/src/main/java/com/limelight/binding/input/virtual_controller/VirtualControllerElement.java @@ -166,58 +166,54 @@ public abstract class VirtualControllerElement extends View { } protected void showConfigurationDialog() { - try { - AlertDialog.Builder alertBuilder = new AlertDialog.Builder(getContext()); + AlertDialog.Builder alertBuilder = new AlertDialog.Builder(getContext()); - alertBuilder.setTitle("Configuration"); + alertBuilder.setTitle("Configuration"); - CharSequence functions[] = new CharSequence[]{ - "Move", - "Resize", - /*election - "Set n - Disable color sormal color", - "Set pressed color", + CharSequence functions[] = new CharSequence[]{ + "Move", + "Resize", + /*election + "Set n + Disable color sormal color", + "Set pressed color", + */ + "Cancel" + }; + + alertBuilder.setItems(functions, new DialogInterface.OnClickListener() { + + @Override + public void onClick(DialogInterface dialog, int which) { + switch (which) { + case 0: { // move + actionEnableMove(); + break; + } + case 1: { // resize + actionEnableResize(); + break; + } + /* + case 2: { // set default color + actionShowNormalColorChooser(); + break; + } + case 3: { // set pressed color + actionShowPressedColorChooser(); + break; + } */ - "Cancel" - }; - - alertBuilder.setItems(functions, new DialogInterface.OnClickListener() { - - @Override - public void onClick(DialogInterface dialog, int which) { - switch (which) { - case 0: { // move - actionEnableMove(); - break; - } - case 1: { // resize - actionEnableResize(); - break; - } - /* - case 2: { // set default color - actionShowNormalColorChooser(); + default: { // cancel + actionCancel(); break; } - case 3: { // set pressed color - actionShowPressedColorChooser(); - break; - } - */ - default: { // cancel - actionCancel(); - break; - } - } } - }); - AlertDialog alert = alertBuilder.create(); - // show menu - alert.show(); - } catch (Exception e) { - e.printStackTrace(); - } + } + }); + AlertDialog alert = alertBuilder.create(); + // show menu + alert.show(); } @Override diff --git a/app/src/main/java/com/limelight/computers/ComputerManagerService.java b/app/src/main/java/com/limelight/computers/ComputerManagerService.java index f79a5e85..d59e2f5e 100644 --- a/app/src/main/java/com/limelight/computers/ComputerManagerService.java +++ b/app/src/main/java/com/limelight/computers/ComputerManagerService.java @@ -471,7 +471,7 @@ public class ComputerManagerService extends Service { newDetails.activeAddress = address; return newDetails; - } catch (Exception e) { + } catch (XmlPullParserException | IOException e) { e.printStackTrace(); return null; } diff --git a/app/src/main/java/com/limelight/utils/ServerHelper.java b/app/src/main/java/com/limelight/utils/ServerHelper.java index 21d01ebd..09b5a6a6 100644 --- a/app/src/main/java/com/limelight/utils/ServerHelper.java +++ b/app/src/main/java/com/limelight/utils/ServerHelper.java @@ -13,7 +13,10 @@ import com.limelight.nvstream.http.GfeHttpResponseException; import com.limelight.nvstream.http.NvApp; import com.limelight.nvstream.http.NvHTTP; +import org.xmlpull.v1.XmlPullParserException; + import java.io.FileNotFoundException; +import java.io.IOException; import java.net.UnknownHostException; import java.security.cert.CertificateEncodingException; @@ -84,8 +87,9 @@ public class ServerHelper { message = parent.getResources().getString(R.string.error_unknown_host); } catch (FileNotFoundException e) { message = parent.getResources().getString(R.string.error_404); - } catch (Exception e) { + } catch (IOException | XmlPullParserException e) { message = e.getMessage(); + e.printStackTrace(); } finally { if (onComplete != null) { onComplete.run(); diff --git a/moonlight-common b/moonlight-common index f42261cc..6bed1cd2 160000 --- a/moonlight-common +++ b/moonlight-common @@ -1 +1 @@ -Subproject commit f42261cc925c32200da132c168a9f72b34fa367a +Subproject commit 6bed1cd22e63e44c63fc37a55b10e33aeabb7892