Fixing null pointers when finding out MIME types from extensions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c656db4..281844b 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -18,7 +18,7 @@
  -->\r
 <manifest package="eu.alefzero.owncloud"\r
     android:versionCode="1"\r
  -->\r
 <manifest package="eu.alefzero.owncloud"\r
     android:versionCode="1"\r

-    android:versionName="0.1.147B" xmlns:android="http://schemas.android.com/apk/res/android">\r
+    android:versionName="0.1.148B" xmlns:android="http://schemas.android.com/apk/res/android">\r

 \r
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />\r
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />\r
 \r
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />\r
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />\r

diff --git a/src/eu/alefzero/owncloud/files/PhotoTakenBroadcastReceiver.java b/src/eu/alefzero/owncloud/files/PhotoTakenBroadcastReceiver.java
index 9314942..c89a825 100644 (file)
--- a/src/eu/alefzero/owncloud/files/PhotoTakenBroadcastReceiver.java
+++ b/src/eu/alefzero/owncloud/files/PhotoTakenBroadcastReceiver.java
@@ -111,7 +111,7 @@ public class PhotoTakenBroadcastReceiver extends BroadcastReceiver {
                         Intent upload_intent = new Intent(context, InstantUploadService.class);
                         Account account = new Account(account_name, AccountAuthenticator.ACCOUNT_TYPE);
                         
                         Intent upload_intent = new Intent(context, InstantUploadService.class);
                         Account account = new Account(account_name, AccountAuthenticator.ACCOUNT_TYPE);
                         

-                        String mimeType;
+                        String mimeType = null;

                         try {
                             mimeType = MimeTypeMap.getSingleton()
                                     .getMimeTypeFromExtension(
                         try {
                             mimeType = MimeTypeMap.getSingleton()
                                     .getMimeTypeFromExtension(


@@ -119,8 +119,9 @@ public class PhotoTakenBroadcastReceiver extends BroadcastReceiver {
                         
                         } catch (IndexOutOfBoundsException e) {
                             Log.e(TAG, "Trying to find out MIME type of a file without extension: " + f.getName());
                         
                         } catch (IndexOutOfBoundsException e) {
                             Log.e(TAG, "Trying to find out MIME type of a file without extension: " + f.getName());

-                            mimeType = "application/octet-stream";

                         }
                         }

+                        if (mimeType == null)
+                            mimeType = "application/octet-stream";

                         
                         upload_intent.putExtra(InstantUploadService.KEY_ACCOUNT, account);
                         upload_intent.putExtra(InstantUploadService.KEY_FILE_PATH, file_path);
                         
                         upload_intent.putExtra(InstantUploadService.KEY_ACCOUNT, account);
                         upload_intent.putExtra(InstantUploadService.KEY_FILE_PATH, file_path);

diff --git a/src/eu/alefzero/owncloud/files/services/FileUploader.java b/src/eu/alefzero/owncloud/files/services/FileUploader.java
index 68ddafb..71c4258 100644 (file)
--- a/src/eu/alefzero/owncloud/files/services/FileUploader.java
+++ b/src/eu/alefzero/owncloud/files/services/FileUploader.java
@@ -158,7 +158,7 @@ public class FileUploader extends Service implements OnDatatransferProgressListe
         
         for (int i = 0; i < mLocalPaths.length; ++i) {
             
         
         for (int i = 0; i < mLocalPaths.length; ++i) {
             

-            String mimeType;
+            String mimeType = null;

             try {
                 mimeType = MimeTypeMap.getSingleton()
                         .getMimeTypeFromExtension(
             try {
                 mimeType = MimeTypeMap.getSingleton()
                         .getMimeTypeFromExtension(


@@ -166,8 +166,9 @@ public class FileUploader extends Service implements OnDatatransferProgressListe
                                     .lastIndexOf('.') + 1));
             } catch (IndexOutOfBoundsException e) {
                 Log.e(TAG, "Trying to find out MIME type of a file without extension: " + mLocalPaths[i]);
                                     .lastIndexOf('.') + 1));
             } catch (IndexOutOfBoundsException e) {
                 Log.e(TAG, "Trying to find out MIME type of a file without extension: " + mLocalPaths[i]);

-                mimeType = "application/octet-stream";

             }
             }

+            if (mimeType == null)
+                mimeType = "application/octet-stream";

             
             mCurrentIndexUpload = i;
             if (wc.putFile(mLocalPaths[i], mRemotePaths[i], mimeType)) {
             
             mCurrentIndexUpload = i;
             if (wc.putFile(mLocalPaths[i], mRemotePaths[i], mimeType)) {

diff --git a/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java b/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
index 533809f..505ff6c 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
+++ b/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
@@ -280,7 +280,7 @@ public class FileDetailFragment extends SherlockFragment implements
                             try {\r
                                 Intent i = new Intent(Intent.ACTION_VIEW);\r
                                 mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(storagePath.substring(storagePath.lastIndexOf('.') + 1));\r
                             try {\r
                                 Intent i = new Intent(Intent.ACTION_VIEW);\r
                                 mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(storagePath.substring(storagePath.lastIndexOf('.') + 1));\r

-                                if (mimeType != mFile.getMimetype()) {\r
+                                if (mimeType != null && !mimeType.equals(mFile.getMimetype())) {\r

                                     i.setDataAndType(Uri.parse("file://"+mFile.getStoragePath()), mimeType);\r
                                     i.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);\r
                                     startActivity(i);\r
                                     i.setDataAndType(Uri.parse("file://"+mFile.getStoragePath()), mimeType);\r
                                     i.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);\r
                                     startActivity(i);\r