X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/532492bf9bb64d5ea4be2783c1399925ed9dd369..be22e58b398f6bc6e47ecd1695ababa353e2ba3b:/src/com/owncloud/android/Uploader.java

diff --git a/src/com/owncloud/android/Uploader.java b/src/com/owncloud/android/Uploader.java
index d6e7a4ad..6f650d7b 100644
--- a/src/com/owncloud/android/Uploader.java
+++ b/src/com/owncloud/android/Uploader.java
@@ -30,6 +30,7 @@ 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.utils.OwnCloudClientUtils;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
@@ -84,7 +85,7 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
     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 DIALOG_GET_DIRNAME = 4;
 
     private final static int REQUEST_CODE_SETUP_ACCOUNT = 0;
 
@@ -106,7 +107,6 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
                 showDialog(DIALOG_MULTIPLE_ACCOUNT);
             } else {
                 mAccount = accounts[0];
-                setContentView(R.layout.uploader_layout);
                 mStorageManager = new FileDataStorageManager(mAccount, getContentResolver());
                 populateDirectoryList();
             }
@@ -201,6 +201,17 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
                 }
             });
             return builder.create();
+        case DIALOG_NO_STREAM:
+            builder.setIcon(android.R.drawable.ic_dialog_alert);
+            builder.setTitle(R.string.uploader_wrn_no_content_title);
+            builder.setMessage(R.string.uploader_wrn_no_content_text);
+            builder.setCancelable(false);
+            builder.setNegativeButton(R.string.common_cancel, new OnClickListener() {
+                public void onClick(DialogInterface dialog, int which) {
+                    finish();
+                }
+            });
+            return builder.create();
         default:
             throw new IllegalArgumentException("Unknown dialog id: " + id);
         }
@@ -263,9 +274,9 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
             uploadFiles();
 
             break;
-        case android.R.id.button1: // dynamic action for create aditional dir
+        /*case android.R.id.button1: // dynamic action for create aditional dir
             showDialog(DIALOG_GET_DIRNAME);
-            break;
+            break;*/
         default:
             throw new IllegalArgumentException("Wrong element clicked");
         }
@@ -373,8 +384,7 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
 
     public void uploadFiles() {
         try {
-            WebdavClient wdc = new WebdavClient(mAccount, getApplicationContext());
-            wdc.allowSelfsignedCertificates();
+            WebdavClient wdc = OwnCloudClientUtils.createOwnCloudClient(mAccount, getApplicationContext());
 
             // create last directory in path if necessary
             if (mCreateDir) {