From: David A. Velasco <dvelasco@solidgear.es>
Date: Fri, 3 May 2013 12:25:02 +0000 (+0200)
Subject: Merge branch 'develop' into fixForCrashedSharedContents
X-Git-Tag: oc-android-1.4.3~28^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/65f403bf994bd84d64eea16072b7bec479c0d525?hp=--cc

Merge branch 'develop' into fixForCrashedSharedContents

Conflicts:
	src/com/owncloud/android/Uploader.java
---

65f403bf994bd84d64eea16072b7bec479c0d525
diff --cc src/com/owncloud/android/Uploader.java
index 2a831792,2ee5b4b9..0ff09079
--- a/src/com/owncloud/android/Uploader.java
+++ b/src/com/owncloud/android/Uploader.java
@@@ -42,10 -48,7 +42,9 @@@ import android.database.Cursor
  import android.net.Uri;
  import android.os.Bundle;
  import android.os.Parcelable;
 -import android.provider.MediaStore.Images.Media;
 +import android.provider.MediaStore.Audio;
 +import android.provider.MediaStore.Images;
 +import android.provider.MediaStore.Video;
- import android.util.Log;
  import android.view.View;
  import android.view.Window;
  import android.widget.AdapterView;
@@@ -55,14 -58,7 +54,13 @@@ import android.widget.EditText
  import android.widget.SimpleAdapter;
  import android.widget.Toast;
  
- import com.owncloud.android.authenticator.AccountAuthenticator;
++import com.owncloud.android.authentication.AccountAuthenticator;
 +import com.owncloud.android.datamodel.DataStorageManager;
 +import com.owncloud.android.datamodel.FileDataStorageManager;
 +import com.owncloud.android.datamodel.OCFile;
 +import com.owncloud.android.files.services.FileUploader;
- import com.owncloud.android.network.OwnCloudClientUtils;
 +
- import eu.alefzero.webdav.WebdavClient;
+ import com.owncloud.android.R;
  
  /**
   * This can be used to upload things to an ownCloud instance.
@@@ -86,7 -83,7 +84,6 @@@ public class Uploader extends ListActiv
      private final static int DIALOG_WAITING = 1;
      private final static int DIALOG_NO_STREAM = 2;
      private final static int DIALOG_MULTIPLE_ACCOUNT = 3;
--    //private final static int DIALOG_GET_DIRNAME = 4;
  
      private final static int REQUEST_CODE_SETUP_ACCOUNT = 0;
  
@@@ -96,8 -93,8 +93,6 @@@
          getWindow().requestFeature(Window.FEATURE_NO_TITLE);
          mParents = new Stack<String>();
          mParents.add("");
--        /*if (getIntent().hasExtra(Intent.EXTRA_STREAM)) {
--            prepareStreamsToUpload();*/
          if (prepareStreamsToUpload()) {
              mAccountManager = (AccountManager) getSystemService(Context.ACCOUNT_SERVICE);
              Account[] accounts = mAccountManager.getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE);
@@@ -333,92 -355,47 +328,97 @@@
  
      public void uploadFiles() {
          try {
-             WebdavClient webdav = OwnCloudClientUtils.createOwnCloudClient(mAccount, getApplicationContext());
++            //WebdavClient webdav = OwnCloudClientUtils.createOwnCloudClient(mAccount, getApplicationContext());
 +
 +            ArrayList<String> local = new ArrayList<String>();
 +            ArrayList<String> remote = new ArrayList<String>();
 +            
+             /* TODO - mCreateDir can never be true at this moment; we will replace wdc.createDirectory by CreateFolderOperation when that is fixed 
+             WebdavClient wdc = OwnCloudClientUtils.createOwnCloudClient(mAccount, getApplicationContext());
              // create last directory in path if necessary
              if (mCreateDir) {
-                 webdav.createDirectory(mUploadPath);
+                 wdc.createDirectory(mUploadPath);
              }
+             */
 -
 -            String[] local = new String[mStreamsToUpload.size()], remote = new String[mStreamsToUpload.size()];
 -
 -            for (int i = 0; i < mStreamsToUpload.size(); ++i) {
 -                Uri uri = (Uri) mStreamsToUpload.get(i);
 -                if (uri.getScheme().equals("content")) {
 -                    Cursor c = getContentResolver().query((Uri) mStreamsToUpload.get(i),
 -                                                      CONTENT_PROJECTION,
 -                                                      null,
 -                                                      null,
 -                                                      null);
 -
 -                    if (!c.moveToFirst())
 -                        continue;
 -
 -                    final String display_name = c.getString(c.getColumnIndex(Media.DISPLAY_NAME)),
 -                                data = c.getString(c.getColumnIndex(Media.DATA));
 -                    local[i] = data;
 -                    remote[i] = mUploadPath + display_name;
 -                } else if (uri.getScheme().equals("file")) {
 -                    final File file = new File(Uri.decode(uri.toString()).replace(uri.getScheme() + "://", ""));
 -                    local[i] = file.getAbsolutePath();
 -                    remote[i] = mUploadPath + file.getName();
++            
 +            // this checks the mimeType 
 +            for (Parcelable mStream : mStreamsToUpload) {
 +                
 +                Uri uri = (Uri) mStream;
 +                if (uri !=null) {
 +                    if (uri.getScheme().equals("content")) {
 +                        
 +                       String mimeType = getContentResolver().getType(uri);
 +                       
 +                       if (mimeType.contains("image")) {
 +                           String[] CONTENT_PROJECTION = { Images.Media.DATA, Images.Media.DISPLAY_NAME, Images.Media.MIME_TYPE, Images.Media.SIZE};
 +                           Cursor c = getContentResolver().query(uri, CONTENT_PROJECTION, null, null, null);
 +                           c.moveToFirst();
 +                           int index = c.getColumnIndex(Images.Media.DATA);
 +                           String data = c.getString(index);
 +                           local.add(data);
 +                           remote.add(mUploadPath + c.getString(c.getColumnIndex(Images.Media.DISPLAY_NAME)));
 +                       
 +                       }
 +                       else if (mimeType.contains("video")) {
 +                           String[] CONTENT_PROJECTION = { Video.Media.DATA, Video.Media.DISPLAY_NAME, Video.Media.MIME_TYPE, Video.Media.SIZE, Video.Media.DATE_MODIFIED };
 +                           Cursor c = getContentResolver().query(uri, CONTENT_PROJECTION, null, null, null);
 +                           c.moveToFirst();
 +                           int index = c.getColumnIndex(Video.Media.DATA);
 +                           String data = c.getString(index);
 +                           local.add(data);
 +                           remote.add(mUploadPath + c.getString(c.getColumnIndex(Video.Media.DISPLAY_NAME)));
 +                          
 +                       }
 +                       else if (mimeType.contains("audio")) {
 +                           String[] CONTENT_PROJECTION = { Audio.Media.DATA, Audio.Media.DISPLAY_NAME, Audio.Media.MIME_TYPE, Audio.Media.SIZE };
 +                           Cursor c = getContentResolver().query(uri, CONTENT_PROJECTION, null, null, null);
 +                           c.moveToFirst();
 +                           int index = c.getColumnIndex(Audio.Media.DATA);
 +                           String data = c.getString(index);
 +                           local.add(data);
 +                           remote.add(mUploadPath + c.getString(c.getColumnIndex(Audio.Media.DISPLAY_NAME)));
 +                        
 +                       }
 +                       else {
 +                           String filePath = Uri.decode(uri.toString()).replace(uri.getScheme() + "://", "");
 +                           // cut everything whats before mnt. It occured to me that sometimes apps send their name into the URI
 +                           if (filePath.contains("mnt")) {
 +                              String splitedFilePath[] = filePath.split("/mnt");
 +                              filePath = splitedFilePath[1];
 +                           }
 +                           final File file = new File(filePath);
 +                           local.add(file.getAbsolutePath());
 +                           remote.add(mUploadPath + file.getName());
 +                       }
 +                        
 +                    } else if (uri.getScheme().equals("file")) {
 +                        String filePath = Uri.decode(uri.toString()).replace(uri.getScheme() + "://", "");
 +                        if (filePath.contains("mnt")) {
 +                           String splitedFilePath[] = filePath.split("/mnt");
 +                           filePath = splitedFilePath[1];
 +                        }
 +                        final File file = new File(filePath);
 +                        local.add(file.getAbsolutePath());
 +                        remote.add(mUploadPath + file.getName());
 +                    }
 +                    else {
 +                        throw new SecurityException();
 +                    }
                  }
 -
 -            }
 +                else {
 +                    throw new SecurityException();
 +                }
 +           
              Intent intent = new Intent(getApplicationContext(), FileUploader.class);
              intent.putExtra(FileUploader.KEY_UPLOAD_TYPE, FileUploader.UPLOAD_MULTIPLE_FILES);
 -            intent.putExtra(FileUploader.KEY_LOCAL_FILE, local);
 -            intent.putExtra(FileUploader.KEY_REMOTE_FILE, remote);
 +            intent.putExtra(FileUploader.KEY_LOCAL_FILE, local.toArray(new String[local.size()]));
 +            intent.putExtra(FileUploader.KEY_REMOTE_FILE, remote.toArray(new String[remote.size()]));
              intent.putExtra(FileUploader.KEY_ACCOUNT, mAccount);
              startService(intent);
              finish();
 +            }
+             
          } catch (SecurityException e) {
              String message = String.format(getString(R.string.uploader_error_forbidden_content), getString(R.string.app_name));
              Toast.makeText(this, message, Toast.LENGTH_LONG).show();