the intents now interrogate what the activies support. all video/* types are handled by the video activity

released as 0.7.1

Author: cpg

src/main/java/org/amahi/anywhere/activity/ServerFileAudioActivity.java

@@ -68,7 +68,7 @@
  */
 public class ServerFileAudioActivity extends Activity implements ServiceConnection, MediaController.MediaPlayerControl
 {
-	public static final Set<String> SUPPORTED_FORMATS;
+	private static final Set<String> SUPPORTED_FORMATS;
 
 	static {
 		SUPPORTED_FORMATS = new HashSet<String>(Arrays.asList(
@@ -79,6 +79,10 @@ public class ServerFileAudioActivity extends Activity implements ServiceConnecti
 		));
 	}
 
+	public static boolean supports(String mime_type) {
+		return SUPPORTED_FORMATS.contains(mime_type);
+	}
+
 	private static final class State
 	{
 		private State() {

src/main/java/org/amahi/anywhere/activity/ServerFileImageActivity.java

@@ -55,7 +55,7 @@
  */
 public class ServerFileImageActivity extends Activity implements ViewPager.OnPageChangeListener
 {
-	public static final Set<String> SUPPORTED_FORMATS;
+	private static final Set<String> SUPPORTED_FORMATS;
 
 	static {
 		SUPPORTED_FORMATS = new HashSet<String>(Arrays.asList(
@@ -225,4 +225,8 @@ protected void onPause() {
 
 		BusProvider.getBus().unregister(this);
 	}
+
+	public static boolean supports(String mime_type) {
+		return SUPPORTED_FORMATS.contains(mime_type);
+	}
 }

src/main/java/org/amahi/anywhere/activity/ServerFileVideoActivity.java

@@ -70,18 +70,6 @@ public class ServerFileVideoActivity extends Activity implements ServiceConnecti
 	MediaController.MediaPlayerControl,
 	View.OnSystemUiVisibilityChangeListener
 {
-	public static final Set<String> SUPPORTED_FORMATS;
-
-	static {
-		SUPPORTED_FORMATS = new HashSet<String>(Arrays.asList(
-			"video/avi",
-			"video/divx",
-			"video/mp4",
-			"video/x-matroska",
-			"video/x-m4v"
-		));
-	}
-
 	@Inject
 	ServerClient serverClient;
 
@@ -496,4 +484,10 @@ private void tearDownVideoService() {
 		Intent intent = new Intent(this, VideoService.class);
 		stopService(intent);
 	}
+
+	public static boolean supports(String mime_type) {
+		String type = mime_type.split("/")[0];
+
+		return "video".equals(type);
+	}
 }

src/main/java/org/amahi/anywhere/activity/ServerFileWebActivity.java

@@ -47,7 +47,7 @@
  */
 public class ServerFileWebActivity extends Activity
 {
-	public static final Set<String> SUPPORTED_FORMATS;
+	private static final Set<String> SUPPORTED_FORMATS;
 
 	static {
 		SUPPORTED_FORMATS = new HashSet<String>(Arrays.asList(
@@ -154,6 +154,10 @@ private void tearDownWebResourceState(Bundle state) {
 		getWebView().saveState(state);
 	}
 
+	public static boolean supports(String mime_type) {
+		return SUPPORTED_FORMATS.contains(mime_type);
+	}
+
 	private static final class WebResourceClient extends WebViewClient
 	{
 		private final ServerFileWebActivity activity;

src/main/java/org/amahi/anywhere/util/Intents.java

@@ -104,19 +104,19 @@ public boolean isServerFileSupported(ServerFile file) {
 		private Class<? extends Activity> getServerFileActivity(ServerFile file) {
 			String fileFormat = file.getMime();
 
-			if (ServerFileAudioActivity.SUPPORTED_FORMATS.contains(fileFormat)) {
+			if (ServerFileAudioActivity.supports(fileFormat)) {
 				return ServerFileAudioActivity.class;
 			}
 
-			if (ServerFileImageActivity.SUPPORTED_FORMATS.contains(fileFormat)) {
+			if (ServerFileImageActivity.supports(fileFormat)) {
 				return ServerFileImageActivity.class;
 			}
 
-			if (ServerFileVideoActivity.SUPPORTED_FORMATS.contains(fileFormat)) {
+			if (ServerFileVideoActivity.supports(fileFormat)) {
 				return ServerFileVideoActivity.class;
 			}
 
-			if (ServerFileWebActivity.SUPPORTED_FORMATS.contains(fileFormat)) {
+			if (ServerFileWebActivity.supports(fileFormat)) {
 				return ServerFileWebActivity.class;
 			}