From 7d4072f544712181ff0465575afc79e58296f172 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Mon, 4 Jun 2012 16:01:34 -0700
Subject: [PATCH] Handle the major MS Ofice filetypes

---
 .../com/todoroo/astrid/files/FileMetadata.java       | 12 ++++++++++++
 .../com/todoroo/astrid/files/FilesControlSet.java    |  8 ++++++--
 astrid/res/values/strings-premium.xml                |  6 ++++++
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/astrid/plugin-src/com/todoroo/astrid/files/FileMetadata.java b/astrid/plugin-src/com/todoroo/astrid/files/FileMetadata.java
index 5018367e8..05834979d 100644
--- a/astrid/plugin-src/com/todoroo/astrid/files/FileMetadata.java
+++ b/astrid/plugin-src/com/todoroo/astrid/files/FileMetadata.java
@@ -21,6 +21,18 @@ public class FileMetadata {
     public static final String FILE_TYPE_IMAGE = "image/"; //$NON-NLS-1$
     public static final String FILE_TYPE_PDF = "application/pdf"; //$NON-NLS-1$
 
+    public static final String FILE_TYPE_DOC = "application/msword";  //$NON-NLS-1$
+    public static final String FILE_TYPE_DOCX = "application/vnd.openxmlformats-officedocument.wordprocessingml.document";  //$NON-NLS-1$
+    public static final String FILE_TYPE_PPT = "application/vnd.ms-powerpoint";  //$NON-NLS-1$
+    public static final String FILE_TYPE_PPTX = "application/vnd.openxmlformats-officedocument.presentationml.presentation";  //$NON-NLS-1$
+    public static final String FILE_TYPE_XLS = "application/vnd.ms-excel"; //$NON-NLS-1$
+    public static final String FILE_TYPE_XLSX = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"; //$NON-NLS-1$
+
+    public static final String[] MS_FILETYPES = {
+        FILE_TYPE_DOC, FILE_TYPE_DOCX,
+        FILE_TYPE_XLS, FILE_TYPE_XLSX,
+        FILE_TYPE_PPT, FILE_TYPE_PPTX,
+    };
 
     public static final String FILE_TYPE_OTHER = "application/octet-stream";  //$NON-NLS-1$
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/files/FilesControlSet.java b/astrid/plugin-src/com/todoroo/astrid/files/FilesControlSet.java
index 1a91b18c3..bc1022d29 100644
--- a/astrid/plugin-src/com/todoroo/astrid/files/FilesControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/files/FilesControlSet.java
@@ -260,12 +260,16 @@ public class FilesControlSet extends PopupControlSet {
     }
 
     private void handleActivityNotFound(String fileType) {
+        System.err.println("HANDLING FILE OF TYPE: " + fileType); //$NON-NLS-1$
         if (fileType.startsWith(FileMetadata.FILE_TYPE_AUDIO)) {
             searchMarket("com.clov4r.android.nil", R.string.search_market_audio_title, R.string.search_market_audio); //$NON-NLS-1$
-        } else if (fileType.startsWith(FileMetadata.FILE_TYPE_PDF)) {
+        } else if (fileType.equals(FileMetadata.FILE_TYPE_PDF)) {
             searchMarket("com.adobe.reader", R.string.search_market_pdf_title, R.string.search_market_pdf); //$NON-NLS-1$
+        } else if (AndroidUtilities.indexOf(FileMetadata.MS_FILETYPES, fileType) >= 0) {
+            searchMarket("com.dataviz.docstogo", R.string.search_market_ms_title, R.string.search_market_ms); //$NON-NLS-1$
         } else {
-            //
+            DialogUtilities.okDialog(activity, activity.getString(R.string.file_type_unhandled_title),
+                    0, activity.getString(R.string.file_type_unhandled), null);
         }
     }
 
diff --git a/astrid/res/values/strings-premium.xml b/astrid/res/values/strings-premium.xml
index d2018b00c..b27baab61 100644
--- a/astrid/res/values/strings-premium.xml
+++ b/astrid/res/values/strings-premium.xml
@@ -23,6 +23,12 @@
 
     <string name="search_market_pdf">No PDF reader was found. Would you like to download a PDF reader from the Android Market?</string>
     <string name="search_market_pdf_title">No PDF reader found</string>
+
+    <string name="search_market_ms">No MS Office reader was found. Would you like to download an MS Office reader from the Android Market?</string>
+    <string name="search_market_ms_title">No MS Office reader found</string>
+    
+    <string name="file_type_unhandled">Sorry! No application was found to handle this file type.</string>
+    <string name="file_type_unhandled_title">No application found</string>
     
     <string name="file_prefix_image">Image</string>
     <string name="file_prefix_voice">Voice</string>