From 0f9d4dc225a0f101b52e55ff1921cc89f1ac1917 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Thu, 31 May 2012 18:39:51 -0700
Subject: [PATCH] Better recovery attempts when encountering unknown filetypes

---
 .../src/com/todoroo/aacenc/RecognizerApi.java | 66 ++++---------------
 .../todoroo/astrid/files/FilesControlSet.java |  2 +-
 astrid/res/values/strings-premium.xml         |  1 +
 3 files changed, 14 insertions(+), 55 deletions(-)

diff --git a/android-aac-enc/src/com/todoroo/aacenc/RecognizerApi.java b/android-aac-enc/src/com/todoroo/aacenc/RecognizerApi.java
index 64c35a9ca..5afadec9d 100644
--- a/android-aac-enc/src/com/todoroo/aacenc/RecognizerApi.java
+++ b/android-aac-enc/src/com/todoroo/aacenc/RecognizerApi.java
@@ -12,6 +12,7 @@ import android.content.DialogInterface;
 import android.content.DialogInterface.OnCancelListener;
 import android.content.Intent;
 import android.media.MediaPlayer;
+import android.net.Uri;
 import android.os.Bundle;
 import android.speech.RecognitionListener;
 import android.speech.RecognizerIntent;
@@ -56,20 +57,24 @@ public class RecognizerApi implements RecognitionListener {
     	this.mListener = listener;
     }
 
-    public static void play(String file) {
+    public static void play(Activity activity, String file, String type, int errId) {
         MediaPlayer mediaPlayer = new MediaPlayer();
 
         try {
             mediaPlayer.setDataSource(file);
             mediaPlayer.prepare();
             mediaPlayer.start();
-        } catch (IllegalArgumentException e) {
-            throw new RuntimeException(e);
-        } catch (IllegalStateException e) {
-            throw new RuntimeException(e);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
+        } catch (Exception e) {
+            try {
+                Intent intent = new Intent(Intent.ACTION_VIEW);
+                intent.setDataAndType(Uri.fromFile(new File(file)), type);
+                activity.startActivity(intent);
+            } catch (Exception e2) {
+                Toast.makeText(activity, errId, Toast.LENGTH_LONG);
+            }
         }
+        
+        
 
         //Toast.makeText(context, "Playing Audio", Toast.LENGTH_LONG).show();
     }
@@ -219,51 +224,4 @@ public class RecognizerApi implements RecognitionListener {
     public void onRmsChanged(float arg0) {
     }
     
-    public static class Main extends Activity implements RecognizerApiListener {
-    	private RecognizerApi api;
-    	
-    	private static final String M4A_FILE = "/sdcard/audio.m4a";
-    	
-    	/** Called when the activity is first created. */
-        @Override
-        public void onCreate(Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-            
-            api = new RecognizerApi(this);
-            
-            setContentView(R.layout.main);
-
-            findViewById(R.id.write).setOnClickListener(new OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    api.start();
-                }
-            });
-
-            findViewById(R.id.play).setOnClickListener(new OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    api.play(M4A_FILE);
-                }
-            });
-
-        }
-        
-        @Override
-        protected void onDestroy() {
-        	super.onDestroy();
-        	api.destroy();
-        }
-        
-        @Override
-        public void onSpeechResult(String result) {
-        	((TextView)findViewById(R.id.text)).setText(result);
-        	api.convert(M4A_FILE);
-        }
-        
-        @Override
-        public void onSpeechError(int error) {
-        	// TODO Auto-generated method stub
-        }
-    }
 }
\ No newline at end of file
diff --git a/astrid/plugin-src/com/todoroo/astrid/files/FilesControlSet.java b/astrid/plugin-src/com/todoroo/astrid/files/FilesControlSet.java
index 0078e3714..8cd774bfa 100644
--- a/astrid/plugin-src/com/todoroo/astrid/files/FilesControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/files/FilesControlSet.java
@@ -160,7 +160,7 @@ public class FilesControlSet extends PopupControlSet {
             view.setOnClickListener(new OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    RecognizerApi.play(m.getValue(FileMetadata.FILE_PATH));
+                    RecognizerApi.play(activity, m.getValue(FileMetadata.FILE_PATH), m.getValue(FileMetadata.FILE_TYPE), R.string.audio_err_playback);
                 }
             });
         } else if (fileType.startsWith(FileMetadata.FILE_TYPE_IMAGE)) {
diff --git a/astrid/res/values/strings-premium.xml b/astrid/res/values/strings-premium.xml
index a4acab3b5..d4d4e0e96 100644
--- a/astrid/res/values/strings-premium.xml
+++ b/astrid/res/values/strings-premium.xml
@@ -16,6 +16,7 @@
     <string name="audio_speak_now">Speak Now!</string>
     <string name="audio_encoding">Encoding...</string>
     <string name="audio_err_encoding">Error encoding audio</string>
+    <string name="audio_err_playback">Sorry, the system does not support this type of audio file</string>
     
     <string name="file_prefix_image">Image</string>
     <string name="file_prefix_voice">Voice</string>