allow username with @, hide search menu item until sherlockactionbar wont put it...

[pub/Android/ownCloud.git] / src / eu / alefzero / owncloud / files / services / FileUploader.java

diff --git a/src/eu/alefzero/owncloud/files/services/FileUploader.java b/src/eu/alefzero/owncloud/files/services/FileUploader.java
index 68ddafb..5760596 100644 (file)
--- a/src/eu/alefzero/owncloud/files/services/FileUploader.java
+++ b/src/eu/alefzero/owncloud/files/services/FileUploader.java
@@ -99,9 +99,6 @@ public class FileUploader extends Service implements OnDatatransferProgressListe
             mRemotePaths = intent.getStringArrayExtra(KEY_REMOTE_FILE);
         }
 
             mRemotePaths = intent.getStringArrayExtra(KEY_REMOTE_FILE);
         }
 

-        for (int i = 0; i < mRemotePaths.length; ++i)
-            mRemotePaths[i] = mRemotePaths[i].replace(' ', '+');
-

         if (mLocalPaths.length != mRemotePaths.length) {
             Log.e(TAG, "Remote paths and local paths are not equal!");
             return Service.START_NOT_STICKY;
         if (mLocalPaths.length != mRemotePaths.length) {
             Log.e(TAG, "Remote paths and local paths are not equal!");
             return Service.START_NOT_STICKY;


@@ -158,7 +155,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 +163,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)) {