Merge pull request #744 from daneren2005/edge

Edge

7 files changed, 86 insertions, 14 deletions

diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/NowPlayingFragment.java b/app/src/main/java/github/daneren2005/dsub/fragments/NowPlayingFragment.java
index 985b7bec..f55dbe1d 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/NowPlayingFragment.java
+++ b/app/src/main/java/github/daneren2005/dsub/fragments/NowPlayingFragment.java
@@ -522,7 +522,7 @@ public class NowPlayingFragment extends SubsonicFragment implements OnGestureLis
 			menu.removeItem(R.id.menu_equalizer);
 		}
 
-		if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && isRemoteEnabled) {
+		if(Build.VERSION.SDK_INT < Build.VERSION_CODES.M || isRemoteEnabled) {
 			playbackSpeedButton.setVisibility(View.GONE);
 		} else {
 			playbackSpeedButton.setVisibility(View.VISIBLE);
diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/SelectInternetRadioStationFragment.java b/app/src/main/java/github/daneren2005/dsub/fragments/SelectInternetRadioStationFragment.java
index 16082cbd..c39e9f61 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/SelectInternetRadioStationFragment.java
+++ b/app/src/main/java/github/daneren2005/dsub/fragments/SelectInternetRadioStationFragment.java
@@ -18,10 +18,18 @@
 */
 package github.daneren2005.dsub.fragments;
 
+import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 
+import java.io.BufferedInputStream;
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -37,6 +45,8 @@ import github.daneren2005.dsub.util.Util;
 import github.daneren2005.dsub.view.UpdateView;
 
 public class SelectInternetRadioStationFragment extends SelectRecyclerFragment<InternetRadioStation> {
+	private static final String TAG = SelectInternetRadioStationFragment.class.getSimpleName();
+
 	@Override
 	public int getOptionsMenu() {
 		return R.menu.abstract_top_menu;
@@ -67,6 +77,7 @@ public class SelectInternetRadioStationFragment extends SelectRecyclerFragment<I
 					return null;
 				}
 
+				getStreamFromPlaylist(item);
 				downloadService.download(item);
 				return null;
 			}
@@ -94,6 +105,40 @@ public class SelectInternetRadioStationFragment extends SelectRecyclerFragment<I
 		return false;
 	}
 
+	private void getStreamFromPlaylist(InternetRadioStation internetRadioStation) {
+		if(internetRadioStation.getStreamUrl() != null && (internetRadioStation.getStreamUrl().indexOf(".m3u") != -1 || internetRadioStation.getStreamUrl().indexOf(".pls") != -1)) {
+			try {
+				URL url = new URL(internetRadioStation.getStreamUrl());
+				HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+
+				try {
+					BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream()));
+					String line;
+					while((line = in.readLine()) != null) {
+						// Not blank line or comment
+						if(line.length() > 0 && line.indexOf('#') != 0) {
+							if(internetRadioStation.getStreamUrl().indexOf(".m3u") != -1) {
+								internetRadioStation.setStreamUrl(line);
+								break;
+							} else {
+								if(line.indexOf("File1=") == 0) {
+									internetRadioStation.setStreamUrl(line.replace("File1=", ""));
+								} else if(line.indexOf("Title1=") == 0) {
+									internetRadioStation.setTitle(line.replace("Title1=", ""));
+								}
+							}
+						}
+					}
+				} finally {
+					connection.disconnect();
+				}
+			} catch (Exception e) {
+				Log.e(TAG, "Failed to get stream data from playlist");
+			}
+
+		}
+	}
+
 	private void displayInternetRadioStationInfo(final InternetRadioStation station) {
 		List<Integer> headers = new ArrayList<>();
 		List<String> details = new ArrayList<>();
diff --git a/app/src/main/java/github/daneren2005/dsub/service/ChromeCastController.java b/app/src/main/java/github/daneren2005/dsub/service/ChromeCastController.java
index c2007139..2df290cf 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/ChromeCastController.java
+++ b/app/src/main/java/github/daneren2005/dsub/service/ChromeCastController.java
@@ -41,6 +41,7 @@ import github.daneren2005.dsub.domain.MusicDirectory;
 import github.daneren2005.dsub.domain.PlayerState;
 import github.daneren2005.dsub.domain.RemoteControlState;
 import github.daneren2005.dsub.util.Constants;
+import github.daneren2005.dsub.util.EnvironmentVariables;
 import github.daneren2005.dsub.util.FileUtil;
 import github.daneren2005.dsub.util.Util;
 import github.daneren2005.dsub.util.compat.CastCompat;
@@ -465,14 +466,14 @@ public class ChromeCastController extends RemoteController {
 
 		void launchApplication() {
 			try {
-				Cast.CastApi.launchApplication(apiClient, CastCompat.APPLICATION_ID, false).setResultCallback(resultCallback);
+				Cast.CastApi.launchApplication(apiClient, EnvironmentVariables.CAST_APPLICATION_ID, false).setResultCallback(resultCallback);
 			} catch (Exception e) {
 				Log.e(TAG, "Failed to launch application", e);
 			}
 		}
 		void reconnectApplication() {
 			try {
-				Cast.CastApi.joinApplication(apiClient, CastCompat.APPLICATION_ID, sessionId).setResultCallback(resultCallback);
+				Cast.CastApi.joinApplication(apiClient, EnvironmentVariables.CAST_APPLICATION_ID, sessionId).setResultCallback(resultCallback);
 			} catch (Exception e) {
 				Log.e(TAG, "Failed to reconnect application", e);
 			}
diff --git a/app/src/main/java/github/daneren2005/dsub/util/BackgroundTask.java b/app/src/main/java/github/daneren2005/dsub/util/BackgroundTask.java
index 31e83200..2b0c6279 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/BackgroundTask.java
+++ b/app/src/main/java/github/daneren2005/dsub/util/BackgroundTask.java
@@ -27,6 +27,7 @@ import java.util.List;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import org.xmlpull.v1.XmlPullParserException;
 
@@ -54,6 +55,7 @@ public abstract class BackgroundTask<T> implements ProgressListener {
 	private static final Collection<Thread> threads = Collections.synchronizedCollection(new ArrayList<Thread>());
 	protected static final BlockingQueue<BackgroundTask.Task> queue = new LinkedBlockingQueue<BackgroundTask.Task>(10);
 	private static Handler handler = null;
+	private static AtomicInteger currentlyRunning = new AtomicInteger(0);
 	static {
 		try {
 			handler = new Handler(Looper.getMainLooper());
@@ -71,6 +73,11 @@ public abstract class BackgroundTask<T> implements ProgressListener {
 				threads.add(thread);
 				thread.start();
 			}
+		} else if(currentlyRunning.get() >= threads.size()) {
+			Log.w(TAG, "Emergency add new thread: " + (threads.size() + 1));
+			Thread thread = new Thread(new TaskRunnable(), String.format("BackgroundTask_%d", threads.size()));
+			threads.add(thread);
+			thread.start();
 		}
 		if(handler == null) {
 			try {
@@ -304,22 +311,30 @@ public abstract class BackgroundTask<T> implements ProgressListener {
 		@Override
 		public void run() {
 			Looper.prepare();
+			final Thread currentThread = Thread.currentThread();
 			while(running) {
 				try {
 					Task task = queue.take();
+					currentlyRunning.incrementAndGet();
 					task.execute();
 				} catch(InterruptedException stop) {
 					Log.e(TAG, "Thread died");
 					running = false;
-					threads.remove(Thread.currentThread());
 				} catch(Throwable t) {
 					Log.e(TAG, "Unexpected crash in BackgroundTask thread", t);
+					running = false;
 				}
+
+				currentlyRunning.decrementAndGet();
+			}
+
+			if(threads.contains(currentThread)) {
+				threads.remove(currentThread);
 			}
 		}
 	}
 
-	public static interface OnCancelListener {
+	public interface OnCancelListener {
 		void onCancel();
 	}
 }
diff --git a/app/src/main/java/github/daneren2005/dsub/util/EnvironmentVariables.java b/app/src/main/java/github/daneren2005/dsub/util/EnvironmentVariables.java
index d8046d1b..710d5232 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/EnvironmentVariables.java
+++ b/app/src/main/java/github/daneren2005/dsub/util/EnvironmentVariables.java
@@ -17,4 +17,5 @@ package github.daneren2005.dsub.util;
 
 public final class EnvironmentVariables {
 	public static final String PASTEBIN_DEV_KEY = "";
+	public static final String CAST_APPLICATION_ID = "";
 }
diff --git a/app/src/main/java/github/daneren2005/dsub/util/Notifications.java b/app/src/main/java/github/daneren2005/dsub/util/Notifications.java
index 0d4a0f9c..d6a92b07 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/Notifications.java
+++ b/app/src/main/java/github/daneren2005/dsub/util/Notifications.java
@@ -99,7 +99,12 @@ public final class Notifications {
 				public void run() {
 					downloadService.stopForeground(true);
 					showDownloadingNotification(context, downloadService, handler, downloadService.getCurrentDownloading(), downloadService.getBackgroundDownloads().size());
-					downloadService.startForeground(NOTIFICATION_ID_PLAYING, notification);
+
+					try {
+						downloadService.startForeground(NOTIFICATION_ID_PLAYING, notification);
+					} catch(Exception e) {
+						Log.e(TAG, "Failed to start notifications after stopping foreground download");
+					}
 				}
 			});
 		} else {
@@ -107,13 +112,22 @@ public final class Notifications {
 				@Override
 				public void run() {
 					if (playing) {
-						downloadService.startForeground(NOTIFICATION_ID_PLAYING, notification);
+						try {
+							downloadService.startForeground(NOTIFICATION_ID_PLAYING, notification);
+						} catch(Exception e) {
+							Log.e(TAG, "Failed to start notifications while playing");
+						}
 					} else {
 						playShowing = false;
 						persistentPlayingShowing = true;
 						NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
 						downloadService.stopForeground(false);
-						notificationManager.notify(NOTIFICATION_ID_PLAYING, notification);
+
+						try {
+							notificationManager.notify(NOTIFICATION_ID_PLAYING, notification);
+						} catch(Exception e) {
+							Log.e(TAG, "Failed to start notifications while paused");
+						}
 					}
 				}
 			});
diff --git a/app/src/main/java/github/daneren2005/dsub/util/compat/CastCompat.java b/app/src/main/java/github/daneren2005/dsub/util/compat/CastCompat.java
index ab64bca9..415106db 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/compat/CastCompat.java
+++ b/app/src/main/java/github/daneren2005/dsub/util/compat/CastCompat.java
@@ -23,13 +23,9 @@ import com.google.android.gms.cast.CastMediaControlIntent;
 import github.daneren2005.dsub.service.ChromeCastController;
 import github.daneren2005.dsub.service.DownloadService;
 import github.daneren2005.dsub.service.RemoteController;
+import github.daneren2005.dsub.util.EnvironmentVariables;
 
-/**
- * Created by owner on 2/9/14.
- */
 public final class CastCompat {
-	public static final String APPLICATION_ID =  "5F85EBEB";
-
 	static {
 		try {
 			Class.forName("com.google.android.gms.cast.CastDevice");
@@ -52,6 +48,6 @@ public final class CastCompat {
 	}
 
 	public static String getCastControlCategory() {
-		return CastMediaControlIntent.categoryForCast(APPLICATION_ID);
+		return CastMediaControlIntent.categoryForCast(EnvironmentVariables.CAST_APPLICATION_ID);
 	}
 }