Updating hello sdl example apps

2 files changed, 10 insertions, 22 deletions

diff --git a/android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/SdlService.java b/android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/SdlService.java
index 090eb097b..fcfb1ac93 100755
--- a/android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/SdlService.java
+++ b/android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/SdlService.java
@@ -82,11 +82,6 @@ public class SdlService extends Service {
 	private SdlManager sdlManager = null;
 	private List<ChoiceCell> choiceCellList;
 
-	private ButtonName[] buttonNames = {ButtonName.PLAY_PAUSE, ButtonName.SEEKLEFT, ButtonName.SEEKRIGHT, ButtonName.AC_MAX, ButtonName.AC, ButtonName.RECIRCULATE,
-			ButtonName.FAN_UP, ButtonName.FAN_DOWN, ButtonName.TEMP_UP, ButtonName.FAN_DOWN, ButtonName.DEFROST_MAX, ButtonName.DEFROST_REAR, ButtonName.DEFROST,
-			ButtonName.UPPER_VENT, ButtonName.LOWER_VENT, ButtonName.VOLUME_UP, ButtonName.VOLUME_DOWN, ButtonName.EJECT, ButtonName.SOURCE, ButtonName.SHUFFLE, ButtonName.REPEAT};
-	private OnButtonListener onButtonListener;
-
 	@Override
 	public IBinder onBind(Intent intent) {
 		return null;
@@ -384,7 +379,11 @@ public class SdlService extends Service {
 	 * Attempts to Subscribe to all preset buttons
 	 */
 	private void subscribeToButtons() {
-		onButtonListener = new OnButtonListener() {
+		ButtonName[] buttonNames = {ButtonName.PLAY_PAUSE, ButtonName.SEEKLEFT, ButtonName.SEEKRIGHT, ButtonName.AC_MAX, ButtonName.AC, ButtonName.RECIRCULATE,
+				ButtonName.FAN_UP, ButtonName.FAN_DOWN, ButtonName.TEMP_UP, ButtonName.FAN_DOWN, ButtonName.DEFROST_MAX, ButtonName.DEFROST_REAR, ButtonName.DEFROST,
+				ButtonName.UPPER_VENT, ButtonName.LOWER_VENT, ButtonName.VOLUME_UP, ButtonName.VOLUME_DOWN, ButtonName.EJECT, ButtonName.SOURCE, ButtonName.SHUFFLE, ButtonName.REPEAT};
+
+		OnButtonListener onButtonListener = new OnButtonListener() {
 			@Override
 			public void onPress(ButtonName buttonName, OnButtonPress buttonPress) {
 				sdlManager.getScreenManager().setTextField1("Subscribed Button Named: " + buttonName + " was pressed");
diff --git a/hello_sdl_java/src/main/java/com/smartdevicelink/java/SdlService.java b/hello_sdl_java/src/main/java/com/smartdevicelink/java/SdlService.java
index 3b66d4653..786b4d06b 100644
--- a/hello_sdl_java/src/main/java/com/smartdevicelink/java/SdlService.java
+++ b/hello_sdl_java/src/main/java/com/smartdevicelink/java/SdlService.java
@@ -77,18 +77,12 @@ public class SdlService {
 
     private static final String IMAGE_DIR =             "assets/images/";
 
-
-
     // variable to create and call functions of the SyncProxy
     private SdlManager sdlManager = null;
     private List<ChoiceCell> choiceCellList;
 
     private SdlServiceCallback callback;
 
-    private ButtonName[] buttonNames = {ButtonName.PLAY_PAUSE, ButtonName.SEEKLEFT, ButtonName.SEEKRIGHT, ButtonName.AC_MAX, ButtonName.AC, ButtonName.RECIRCULATE,
-            ButtonName.FAN_UP, ButtonName.FAN_DOWN, ButtonName.TEMP_UP, ButtonName.FAN_DOWN, ButtonName.DEFROST_MAX, ButtonName.DEFROST_REAR, ButtonName.DEFROST,
-            ButtonName.UPPER_VENT, ButtonName.LOWER_VENT, ButtonName.VOLUME_UP, ButtonName.VOLUME_DOWN, ButtonName.EJECT, ButtonName.SOURCE, ButtonName.SHUFFLE, ButtonName.REPEAT};    private OnButtonListener onButtonListener;
-
     public SdlService(BaseTransportConfig config, SdlServiceCallback callback){
         this.callback = callback;
         buildSdlManager(config);
@@ -334,7 +328,11 @@ public class SdlService {
      * Attempts to Subscribe to all preset buttons
      */
     private void subscribeToButtons() {
-        onButtonListener = new OnButtonListener() {
+        ButtonName[] buttonNames = {ButtonName.PLAY_PAUSE, ButtonName.SEEKLEFT, ButtonName.SEEKRIGHT, ButtonName.AC_MAX, ButtonName.AC, ButtonName.RECIRCULATE,
+                ButtonName.FAN_UP, ButtonName.FAN_DOWN, ButtonName.TEMP_UP, ButtonName.FAN_DOWN, ButtonName.DEFROST_MAX, ButtonName.DEFROST_REAR, ButtonName.DEFROST,
+                ButtonName.UPPER_VENT, ButtonName.LOWER_VENT, ButtonName.VOLUME_UP, ButtonName.VOLUME_DOWN, ButtonName.EJECT, ButtonName.SOURCE, ButtonName.SHUFFLE, ButtonName.REPEAT};
+
+       OnButtonListener onButtonListener = new OnButtonListener() {
             @Override
             public void onPress(ButtonName buttonName, OnButtonPress buttonPress) {
                 sdlManager.getScreenManager().setTextField1("Subscribed Button Named: " + buttonName + " was pressed");
@@ -357,15 +355,6 @@ public class SdlService {
     }
 
     /**
-     * Attempts to Unsubscribe to all preset Buttons
-     */
-    private void unsubscribeToPresetButtons() {
-        for (ButtonName buttonName : buttonNames) {
-            sdlManager.getScreenManager().removeButtonListener(buttonName, onButtonListener);
-        }
-    }
-
-    /**
      * Will show a sample test message on screen as well as speak a sample test message
      */
     private void showTest(){