From 4dfbe807859c175c0b84444f19e405e0d69ec928 Mon Sep 17 00:00:00 2001 From: RayBa82 Date: Sun, 12 Mar 2017 17:35:07 +0100 Subject: [PATCH] fixed remote numbers if favourites are used --- .../ui/fragments/RemoteNumbers.java | 25 +++++++------------ 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/dvbViewerController/src/main/java/org/dvbviewer/controller/ui/fragments/RemoteNumbers.java b/dvbViewerController/src/main/java/org/dvbviewer/controller/ui/fragments/RemoteNumbers.java index 542be6f..a360fdf 100644 --- a/dvbViewerController/src/main/java/org/dvbviewer/controller/ui/fragments/RemoteNumbers.java +++ b/dvbViewerController/src/main/java/org/dvbviewer/controller/ui/fragments/RemoteNumbers.java @@ -22,7 +22,6 @@ import android.widget.Button; import org.dvbviewer.controller.R; -import org.dvbviewer.controller.entities.DVBViewerPreferences; import org.dvbviewer.controller.ui.base.AbstractRemote; import org.dvbviewer.controller.utils.ActionID; @@ -49,9 +48,6 @@ public class RemoteNumbers extends AbstractRemote { private Button btnNumberForward = null; private View content; - private DVBViewerPreferences prefs; - private boolean useFavs; - private OnRemoteButtonClickListener remoteButtonClickListener; /* (non-Javadoc) * @see android.support.v4.app.Fragment#onCreate(android.os.Bundle) @@ -68,8 +64,6 @@ public void onCreate(Bundle savedInstanceState) { public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); inititalize(); - prefs = new DVBViewerPreferences(getActivity()); - useFavs = prefs.getBoolean(DVBViewerPreferences.KEY_CHANNELS_USE_FAVS, false); } /* (non-Javadoc) @@ -85,7 +79,6 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa /** * Inititalize. * - * @author RayBa * @date 07.04.2013 */ private void inititalize() { @@ -131,31 +124,31 @@ public String getCommand(View v) { String command = ""; switch (v.getId()) { case R.id.ButtonOne: - command = useFavs ? ActionID.CMD_FAV_1 : ActionID.CMD_REMOTE_1; + command = ActionID.CMD_REMOTE_1; break; case R.id.ButtonTwo: - command = useFavs ? ActionID.CMD_FAV_2 : ActionID.CMD_REMOTE_2; + command = ActionID.CMD_REMOTE_2; break; case R.id.ButtonThree: - command = useFavs ? ActionID.CMD_FAV_3 : ActionID.CMD_REMOTE_3; + command = ActionID.CMD_REMOTE_3; break; case R.id.ButtonFour: - command = useFavs ? ActionID.CMD_FAV_4 : ActionID.CMD_REMOTE_4; + command = ActionID.CMD_REMOTE_4; break; case R.id.ButtonFive: - command = useFavs ? ActionID.CMD_FAV_5 : ActionID.CMD_REMOTE_5; + command = ActionID.CMD_REMOTE_5; break; case R.id.ButtonSix: - command = useFavs ? ActionID.CMD_FAV_6 : ActionID.CMD_REMOTE_6; + command = ActionID.CMD_REMOTE_6; break; case R.id.ButtonSeven: - command = useFavs ? ActionID.CMD_FAV_7 : ActionID.CMD_REMOTE_7; + command = ActionID.CMD_REMOTE_7; break; case R.id.ButtonEight: - command = useFavs ? ActionID.CMD_FAV_8 : ActionID.CMD_REMOTE_8; + command = ActionID.CMD_REMOTE_8; break; case R.id.ButtonNine: - command = useFavs ? ActionID.CMD_FAV_9 : ActionID.CMD_REMOTE_9; + command = ActionID.CMD_REMOTE_9; break; case R.id.ButtonZero: command = ActionID.CMD_REMOTE_0;