Fixed bug which caused player to crash when clicking FM 'save channel' button when the board was initialised. Closes #18

Author: freshollie

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId 'com.freshollie.monkeyboard.keystoneradio'
         minSdkVersion 16
         targetSdkVersion 27
-        versionCode 113
-        versionName "2.1.4-beta"
+        versionCode 114
+        versionName "2.1.5-beta"
         setProperty("archivesBaseName", "$versionName")
     }
     buildTypes {
@@ -26,7 +26,7 @@ android {
 // Currently disabled due to the addition of constraint layout, please make manually
 task generateVerticalLayout(type: Exec) {
     workingDir '.'
-    // Update this with your python
+    // Update this with your python binary
     commandLine "python", "$rootDir/app/build_tools/make_vertical_layout.py"
     doLast{
         if (execResult.exitValue != 0) {

app/src/main/java/com/freshollie/monkeyboard/keystoneradio/playback/RadioPlayerService.java

@@ -57,15 +57,15 @@ public class RadioPlayerService extends Service implements AudioManager.OnAudioF
     public final static String ACTION_SEARCH_BACKWARDS =
             "com.freshollie.monkeyboard.keystoneradio.playback.radioplayerservice.action.SEARCH_BACKWARDS";
     public final static String ACTION_NEXT =
-            "com.freshollie..monkeyboard.keystoneradio.playback.radioplayerservice.action.NEXT";
+            "com.freshollie.monkeyboard.keystoneradio.playback.radioplayerservice.action.NEXT";
     public final static String ACTION_PREVIOUS =
-            "com.freshollie..monkeyboard.keystoneradio.playback.radioplayerservice.action.PREVIOUS";
+            "com.freshollie.monkeyboard.keystoneradio.playback.radioplayerservice.action.PREVIOUS";
     public final static String ACTION_STOP =
-            "com.freshollie..monkeyboard.keystoneradio.playback.radioplayerservice.action.STOP";
+            "com.freshollie.monkeyboard.keystoneradio.playback.radioplayerservice.action.STOP";
     public final static String ACTION_PLAY =
-            "com.freshollie..monkeyboard.keystoneradio.playback.radioplayerservice.action.PLAY";
+            "com.freshollie.monkeyboard.keystoneradio.playback.radioplayerservice.action.PLAY";
     public final static String ACTION_PAUSE =
-            "com.freshollie..monkeyboard.keystoneradio.playback.radioplayerservice.action.PAUSE";
+            "com.freshollie.monkeyboard.keystoneradio.playback.radioplayerservice.action.PAUSE";
 
     public final static String ACTION_SET_RADIO_MODE = "";
 
@@ -509,12 +509,12 @@ private void saveFmStationList() {
     }
 
     public boolean saveCurrentFmStation() {
-        RadioStation radioStationCopy = new RadioStation();
-        radioStationCopy.setName(currentFmRadioStation.getName());
-        radioStationCopy.setGenreId(currentFmRadioStation.getGenreId());
-        radioStationCopy.setFrequency(currentFmRadioStation.getFrequency());
-
         if (currentFmRadioStation != null) {
+            RadioStation radioStationCopy = new RadioStation();
+            radioStationCopy.setName(currentFmRadioStation.getName());
+            radioStationCopy.setGenreId(currentFmRadioStation.getGenreId());
+            radioStationCopy.setFrequency(currentFmRadioStation.getFrequency());
+
             for (RadioStation station: fmRadioStations) {
                 if (((station.getFrequency()) / 100) * 100
                         == ((radioStationCopy.getFrequency()) / 100) * 100) {

app/src/main/java/com/freshollie/monkeyboard/keystoneradio/ui/PlayerActivity.java

@@ -440,22 +440,35 @@ public void onStopTrackingTouch(SeekBar seekBar) {
         });
 
         fmSeekBar.setVisibility(modeSwitch.isChecked() ? View.VISIBLE: View.GONE);
+
+        // Add channel FAB is used to save FM channels to the FM channel list
         addChannelFab.setVisibility(modeSwitch.isChecked() ? View.VISIBLE: View.GONE);
         addChannelFab.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 if (playerBound) {
+                    // If we are not in delete mode this is a save command
                     if (stationListAdapter != null && !stationListAdapter.isDeleteMode()) {
-                        if (playerService.saveCurrentFmStation()) {
+                        // If there is no current station, we cannot save it
+                        if (playerService.getCurrentStation() == null) {
+                            Snackbar.make(
+                                    stationListRecyclerView,
+                                    R.string.cannot_save_station_text,
+                                    Snackbar.LENGTH_SHORT
+                            ).show();
+                        } else if (playerService.saveCurrentFmStation()) {
+                            // We were able to save a new station, so update the list
                             updateStationList(playerService.getRadioMode());
                         } else {
+                            // Otherwise make a snackbar to show we couldn't save this station
                             Snackbar.make(
                                     stationListRecyclerView,
                                     R.string.channel_already_exists_message,
                                     Snackbar.LENGTH_SHORT
                             ).show();
                         }
                     } else {
+                        // As we are in delete mode, this command closes delete mode
                         stationListAdapter.closeDeleteMode();
                     }
                 }

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

@@ -52,7 +52,7 @@
     <string name="settings_icon_description">Settings</string>
 
     <string name="about_category_title">About</string>
-    <string name="about_text">Written by Oliver Bell, 2017\nGPL 3.0 Open Source \nhttp://github.com/freshollie/monkeyboard-radio-android/</string>
+    <string name="about_text">Written by Oliver Bell, 2018\nGPLv3.0 Open Source \nhttp://github.com/freshollie/monkeyboard-radio-android/</string>
 
     <string name="program_datarate_placeholder">%1$d Kbps</string>
 
@@ -75,7 +75,10 @@
     <string name="RADIO_MODE_KEY">radio_mode</string>
     <string name="fm_frequency_placeholder">%s MHz</string>
     <string name="remove_station_description">Remove this channel</string>
+
+    <string name="cannot_save_station_text">Unable to save unknown station</string>
     <string name="channel_already_exists_message">Channel already saved</string>
+
     <string name="pref_dab_mode_enabled_key">dab_mode_enabled</string>
     <string name="pref_dab_mode_enabled_title">DAB mode</string>
     <string name="pref_dab_mode_enabled_summary_on">Enabled</string>
@@ -101,7 +104,6 @@
     <string name="fm">FM</string>
 
 
-
     <string-array name="STATION_GENRES">
         <item /> <!--0 is Nothing-->
         <item>News</item>