From: David A. Velasco <dvelasco@solidgear.es>
Date: Fri, 3 Aug 2012 09:39:08 +0000 (+0200)
Subject: Fixed crashed when the user tries to upload to ownCloud some content for wich the... 
X-Git-Tag: oc-android-1.4.3~213
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/532492bf9bb64d5ea4be2783c1399925ed9dd369?ds=sidebyside

Fixed crashed when the user tries to upload to ownCloud some content for wich the client does not have enough permissions; such as a contact.
---

diff --git a/res/values/strings.xml b/res/values/strings.xml
index c482937e..e559afed 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -57,6 +57,7 @@
     <string name="uploader_wrn_no_account_text">There are no ownCloud accounts on your device. Please setup an account first.</string>
     <string name="uploader_wrn_no_account_setup_btn_text">Setup</string>
     <string name="uploader_wrn_no_account_quit_btn_text">Quit</string>
+    <string name="uploader_error_forbidden_content">ownCloud is not allowed to access the shared content</string>
     <string name="uploader_info_uploading">Uploading</string>
     <string name="uploader_btn_create_dir_text">Create directory for upload</string>
     <string name="filedetails_select_file">Tap on a file to display additional information.</string>
diff --git a/src/com/owncloud/android/Uploader.java b/src/com/owncloud/android/Uploader.java
index 718911d3..d6e7a4ad 100644
--- a/src/com/owncloud/android/Uploader.java
+++ b/src/com/owncloud/android/Uploader.java
@@ -56,6 +56,8 @@ import android.widget.AdapterView.OnItemClickListener;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.SimpleAdapter;
+import android.widget.Toast;
+
 import com.owncloud.android.R;
 import eu.alefzero.webdav.WebdavClient;
 
@@ -370,46 +372,51 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
     }
 
     public void uploadFiles() {
-        WebdavClient wdc = new WebdavClient(mAccount, getApplicationContext());
-        wdc.allowSelfsignedCertificates();
+        try {
+            WebdavClient wdc = new WebdavClient(mAccount, getApplicationContext());
+            wdc.allowSelfsignedCertificates();
 
-        // create last directory in path if nessesary
-        if (mCreateDir) {
-            wdc.createDirectory(mUploadPath);
-        }
+            // create last directory in path if necessary
+            if (mCreateDir) {
+                wdc.createDirectory(mUploadPath);
+            }
 
-        String[] local = new String[mStreamsToUpload.size()], remote = new String[mStreamsToUpload.size()];
+            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),
+            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();
-            }
+                    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();
+                }
+
+            }
+            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_ACCOUNT, mAccount);
+            startService(intent);
+            finish();
+            
+        } catch (SecurityException e) {
+            Toast.makeText(this, getString(R.string.uploader_error_forbidden_content), Toast.LENGTH_LONG).show();
         }
-        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_ACCOUNT, mAccount);
-        startService(intent);
-        finish();
     }
 
 }