changed the station shortcut icon for Android O - the old one did not look good

Author: y20k

app/src/main/java/org/y20k/transistor/PlayerService.java

@@ -522,19 +522,17 @@ private void startPlayback() {
     /* Stops playback */
     private void stopPlayback(boolean dismissNotification) {
         // check for null - can happen after a crash during playback
-        if (mStation == null || !mExoPlayer.getPlayWhenReady() || mSession== null) {
-            LogHelper.e(LOG_TAG, "Stopping playback. Station is null.");
+        if (mStation == null || mExoPlayer == null || !mExoPlayer.getPlayWhenReady() || mSession == null) {
+            LogHelper.e(LOG_TAG, "Stopping playback. An error occurred. Station is probably NULL.");
             saveAppState();
             // send local broadcast: playback stopped
             Intent intent = new Intent();
             intent.setAction(ACTION_PLAYBACK_STATE_CHANGED);
             intent.putExtra(EXTRA_ERROR_OCCURED, true);
             LocalBroadcastManager.getInstance(this).sendBroadcast(intent);
-
+            // stop player service
             stopSelf();
             return;
-        } else {
-            LogHelper.v(LOG_TAG, "Stopping playback. Station name:" + mStation.getStationName());
         }
 
         // set and save state
@@ -554,6 +552,7 @@ private void stopPlayback(boolean dismissNotification) {
         // stop playback
         mExoPlayer.setPlayWhenReady(false); // todo empty buffer
         mExoPlayer.stop();
+        LogHelper.v(LOG_TAG, "Stopping playback. Station name:" + mStation.getStationName());
 
         // give up audio focus
         giveUpAudioFocus();

app/src/main/java/org/y20k/transistor/core/Station.java

@@ -362,7 +362,6 @@ private ContentType getContentType(Uri streamUri) {
             // determine content type of remote file
             URL streamURL = new URL(streamUri.toString());
             return getContentType(streamURL);
-
         } catch (MalformedURLException e) {
             e.printStackTrace();
             return null;
@@ -533,12 +532,15 @@ public void writePlaylistFile(File folder) {
     /* Fetches station image from the internet */
     public Bitmap fetchImageFile(URL stationURL) {
 
-        LogHelper.v(LOG_TAG, "fetching favicon: " + mStationImageFile.toString());
+        // check image file and url for null
+        if (mStationImageFile == null || stationURL == null) {
+            LogHelper.e(LOG_TAG, "Unable to fetch favicon.");
+            return null;
+        }
 
-        //
+        // initialize stationImage to NULL
         Bitmap stationImage = null;
 
-
         // Get favicon address
         String host = stationURL.getHost();
         if (!host.startsWith("www")) {
@@ -548,6 +550,7 @@ public Bitmap fetchImageFile(URL stationURL) {
         String faviconUrlString = "http://" + host + "/favicon.ico";
 
         // Try to get image from favicon location
+        LogHelper.v(LOG_TAG, "fetching favicon " + mStationImageFile.toString() + "from " + faviconUrlString);
         try {
             // open connection
             HttpURLConnection connection = (HttpURLConnection)(new URL(faviconUrlString).openConnection());
@@ -687,6 +690,7 @@ public int getBitrate() {
         return mBitrate;
     }
 
+
     /* Setter for playlist file object of station */
     public void setStationPlaylistFile(File folder) {
         if (mStationName != null) {
@@ -695,6 +699,8 @@ public void setStationPlaylistFile(File folder) {
             // construct location of m3u playlist file from station name and folder
             String fileLocation = folder.toString() + "/" + stationNameCleaned + ".m3u";
             mStationPlaylistFile = new File(fileLocation);
+        } else {
+            mStationPlaylistFile = null;
         }
     }
 
@@ -709,6 +715,7 @@ public void setStationImageFile(File folder) {
             mStationImageFile = new File(fileLocation);
             mStationImageSize = mStationImageFile.length();
         } else {
+            mStationImageFile = null;
             mStationImageSize = 0;
         }
     }

app/src/main/java/org/y20k/transistor/helpers/ShortcutHelper.java

@@ -106,18 +106,22 @@ private Intent createShortcutIntent (Station station) {
 
     /* Create shortcut icon */
     private Bitmap createShortcutIcon(Station station) {
-        ImageHelper imageHelper;
         Bitmap stationImage;
-
         if (station.getStationImageFile().exists()) {
             // use station image
             stationImage = BitmapFactory.decodeFile(station.getStationImageFile().toString());
         } else {
             stationImage = null;
         }
-        imageHelper = new ImageHelper(stationImage, mContext);
 
-        return imageHelper.createShortcut(192);
+        ImageHelper imageHelper = new ImageHelper(stationImage, mContext);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            // only return the station image
+            return imageHelper.getInputImage();
+        } else {
+            // return station image in circular frame
+            return imageHelper.createShortcut(192);
+        }
     }
 
 }

build.gradle

@@ -21,8 +21,8 @@ allprojects {
     }
     project.ext {
         applicationId = 'org.y20k.transistor'
-        versionCode = 42
-        versionName = '2.3.0 (Kooks)'
+        versionCode = 43
+        versionName = '2.3.1 (Kooks)'
         minSdkVersion = 19
         compileSdkVersion = 26
         targetSdkVersion = 26