Remove Session choice from Setup flow

This does NOT yet remove the ability to choose a different session type, this
can still be done via the Settings at the end, but it does make it less obvious
and likely to be used

Author: kiall

app/src/main/java/ie/macinnes/tvheadend/setup/TvInputSetupActivity.java

@@ -263,89 +263,13 @@ public void run(AccountManagerFuture<Bundle> result) {
         public void onGuidedActionClicked(GuidedAction action) {
             if (ACTION_ID_CONFIRM == action.getId()) {
                 // Move onto the next step
-                GuidedStepFragment fragment = new SessionSelectorFragment();
+                GuidedStepFragment fragment = new SyncingFragment();
                 fragment.setArguments(getArguments());
                 add(getFragmentManager(), fragment);
             }
         }
     }
 
-    public static class SessionSelectorFragment extends BaseGuidedStepFragment {
-        private static final int ACTION_ID_MEDIA_PLAYER = 1;
-        private static final int ACTION_ID_EXO_PLAYER = 2;
-        private static final int ACTION_ID_VLC = 3;
-
-        @NonNull
-        @Override
-        public GuidanceStylist.Guidance onCreateGuidance(Bundle savedInstanceState) {
-            GuidanceStylist.Guidance guidance = new GuidanceStylist.Guidance(
-                    getString(R.string.setup_session_title),
-                    getString(R.string.setup_session_body),
-                    getString(R.string.account_label),
-                    null);
-
-            return guidance;
-        }
-
-        @Override
-        public void onCreateActions(@NonNull List<GuidedAction> actions, Bundle savedInstanceState) {
-            GuidedAction action = new GuidedAction.Builder(getActivity())
-                    .id(ACTION_ID_EXO_PLAYER)
-                    .title(R.string.ExoPlayer_title)
-                    .description(R.string.ExoPlayer_body)
-                    .editable(false)
-                    .build();
-
-            actions.add(action);
-
-            action = new GuidedAction.Builder(getActivity())
-                    .id(ACTION_ID_VLC)
-                    .title(R.string.VLC_title)
-                    .description(R.string.VLC_body)
-                    .editable(false)
-                    .build();
-
-            actions.add(action);
-
-            action = new GuidedAction.Builder(getActivity())
-                    .id(ACTION_ID_MEDIA_PLAYER)
-                    .title(R.string.mediaplayer_title)
-                    .description(R.string.mediaplayer_body)
-                    .editable(false)
-                    .build();
-
-            actions.add(action);
-        }
-
-        @Override
-        public void onGuidedActionClicked(GuidedAction action) {
-            String session;
-
-            if (action.getId() == ACTION_ID_MEDIA_PLAYER) {
-                session = Constants.SESSION_MEDIA_PLAYER;
-            } else if (action.getId() == ACTION_ID_EXO_PLAYER) {
-                session = Constants.SESSION_EXO_PLAYER;
-            } else if (action.getId() == ACTION_ID_VLC) {
-                session = Constants.SESSION_VLC;
-            } else {
-                return;
-            }
-
-            // Store the chosen session type
-            SharedPreferences sharedPreferences = getActivity().getSharedPreferences(
-                    Constants.PREFERENCE_TVHEADEND, Context.MODE_PRIVATE);
-
-            SharedPreferences.Editor editor = sharedPreferences.edit();
-            editor.putString(Constants.KEY_SESSION, session);
-            editor.apply();
-
-            // Move onto the next step
-            GuidedStepFragment fragment = new SyncingFragment();
-            fragment.setArguments(getArguments());
-            add(getFragmentManager(), fragment);
-        }
-    }
-
     public static class SyncingFragment extends BaseGuidedStepFragment implements EpgSyncTask.Listener {
         protected SimpleHtspConnection mConnection;
         protected EpgSyncTask mEpgSyncTask;

app/src/main/java/ie/macinnes/tvheadend/tvinput/TvInputService.java

@@ -57,7 +57,7 @@ public void onCreate() {
         SharedPreferences sharedPreferences = getSharedPreferences(
                 Constants.PREFERENCE_TVHEADEND, Context.MODE_PRIVATE);
 
-        mSessionType = sharedPreferences.getString(Constants.KEY_SESSION, Constants.SESSION_MEDIA_PLAYER);
+        mSessionType = sharedPreferences.getString(Constants.KEY_SESSION, Constants.SESSION_EXO_PLAYER);
 
         mAccountManager = AccountManager.get(this);
         mAccount = AccountUtils.getActiveAccount(this);

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

@@ -18,9 +18,9 @@
 <resources>
     <!-- Video Player Settings -->
     <string-array name="video_player_names">
-        <item>ExoPlayer</item>
-        <item>VLC</item>
-        <item>Media Player</item>
+        <item>ExoPlayer (Recommended)</item>
+        <item>VLC (Deprecated)</item>
+        <item>Media Player (Deprecated)</item>
     </string-array>
 
     <string-array name="video_player_values">

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

@@ -70,19 +70,11 @@ under the License.
     <string name="setup_only_one_account">Only one Tvheadend account is currently supported</string>
     <string name="setup_progress_body">Processing</string>
     <string name="setup_progress_title">Checking your HTSP account</string>
-    <string name="setup_session_body">There are several Session implementations, please choose one</string>
-    <string name="setup_session_title">Session Selector</string>
     <string name="setup_settings_body">Advanced Settings</string>
     <string name="setup_settings_title">Settings</string>
     <string name="setup_sync_body">Just a few seconds please :)</string>
     <string name="setup_sync_title">Syncing Channels and Program data</string>
 
-    <string name="ExoPlayer_body">Google ExoPlayer (Recommended)</string>
-    <string name="ExoPlayer_title">ExoPlayer</string>
-    <string name="mediaplayer_body">Android Media Player (Deprecated)</string>
-    <string name="mediaplayer_title">Media Player</string>
-    <string name="VLC_body">VideoLAN LibVLC (Deprecated)</string>
-    <string name="VLC_title">LibVLC</string>
     <string name="video_unsupported_error">Unsupported Video Track Selected</string>
     <string name="error_unsupported_audio">Unsupported Audio Track Selected</string>
     <string name="error_unsupported_text">Unsupported Text Track Selected</string>

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

@@ -26,7 +26,8 @@
             android:title="Video Player Choice"
             android:dialogTitle="Video Player Choice"
             android:entries="@array/video_player_names"
-            android:entryValues="@array/video_player_values" />
+            android:entryValues="@array/video_player_values"
+            android:defaultValue="SESSION-EXO-PLAYER"/>
     </PreferenceCategory>
 
     <PreferenceCategory android:title="EPG">