Singleton didn't work (worth a try though ^^) - Make a new constructor

[pub/Android/ownCloud.git] / src / eu / alefzero / owncloud / Uploader.java

diff --git a/src/eu/alefzero/owncloud/Uploader.java b/src/eu/alefzero/owncloud/Uploader.java
index 757f803..fcb22a2 100644 (file)
--- a/src/eu/alefzero/owncloud/Uploader.java
+++ b/src/eu/alefzero/owncloud/Uploader.java
@@ -28,15 +28,15 @@ import java.util.Vector;
 import android.accounts.Account;\r
 import android.accounts.AccountManager;\r
 import android.app.AlertDialog;\r
 import android.accounts.Account;\r
 import android.accounts.AccountManager;\r
 import android.app.AlertDialog;\r

+import android.app.AlertDialog.Builder;\r

 import android.app.Dialog;\r
 import android.app.ListActivity;\r
 import android.app.ProgressDialog;\r
 import android.app.Dialog;\r
 import android.app.ListActivity;\r
 import android.app.ProgressDialog;\r

-import android.app.AlertDialog.Builder;\r

 import android.content.Context;\r
 import android.content.DialogInterface;\r
 import android.content.Context;\r
 import android.content.DialogInterface;\r

-import android.content.Intent;\r

 import android.content.DialogInterface.OnCancelListener;\r
 import android.content.DialogInterface.OnClickListener;\r
 import android.content.DialogInterface.OnCancelListener;\r
 import android.content.DialogInterface.OnClickListener;\r

+import android.content.Intent;\r

 import android.database.Cursor;\r
 import android.net.Uri;\r
 import android.os.Bundle;\r
 import android.database.Cursor;\r
 import android.net.Uri;\r
 import android.os.Bundle;\r


@@ -46,21 +46,15 @@ import android.util.Log;
 import android.view.View;\r
 import android.view.Window;\r
 import android.widget.AdapterView;\r
 import android.view.View;\r
 import android.view.Window;\r
 import android.widget.AdapterView;\r

+import android.widget.AdapterView.OnItemClickListener;\r

 import android.widget.Button;\r
 import android.widget.EditText;\r
 import android.widget.Button;\r
 import android.widget.EditText;\r

-import android.widget.ListView;\r

 import android.widget.SimpleAdapter;\r
 import android.widget.SimpleAdapter;\r

-import android.widget.SimpleCursorAdapter;\r
-import android.widget.AdapterView.OnItemClickListener;\r
-import android.widget.Toast;\r

 import eu.alefzero.owncloud.authenticator.AccountAuthenticator;\r
 import eu.alefzero.owncloud.datamodel.DataStorageManager;\r
 import eu.alefzero.owncloud.datamodel.FileDataStorageManager;\r
 import eu.alefzero.owncloud.datamodel.OCFile;\r
 import eu.alefzero.owncloud.authenticator.AccountAuthenticator;\r
 import eu.alefzero.owncloud.datamodel.DataStorageManager;\r
 import eu.alefzero.owncloud.datamodel.FileDataStorageManager;\r
 import eu.alefzero.owncloud.datamodel.OCFile;\r

-import eu.alefzero.owncloud.db.ProviderMeta;\r
-import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;\r

 import eu.alefzero.owncloud.files.services.FileUploader;\r
 import eu.alefzero.owncloud.files.services.FileUploader;\r

-import eu.alefzero.owncloud.utils.OwnCloudVersion;\r

 import eu.alefzero.webdav.WebdavClient;\r
 \r
 /**\r
 import eu.alefzero.webdav.WebdavClient;\r
 \r
 /**\r


@@ -74,7 +68,6 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
 \r
     private Account mAccount;\r
     private AccountManager mAccountManager;\r
 \r
     private Account mAccount;\r
     private AccountManager mAccountManager;\r

-    private String mUsername, mPassword;\r

     private Stack<String> mParents;\r
     private ArrayList<Parcelable> mStreamsToUpload;\r
     private boolean mCreateDir;\r
     private Stack<String> mParents;\r
     private ArrayList<Parcelable> mStreamsToUpload;\r
     private boolean mCreateDir;\r


@@ -298,8 +291,6 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
     }\r
 \r
     private void populateDirectoryList() {\r
     }\r
 \r
     private void populateDirectoryList() {\r

-        mUsername = mAccount.name.substring(0, mAccount.name.indexOf('@'));\r
-        mPassword = mAccountManager.getPassword(mAccount);\r

         setContentView(R.layout.uploader_layout);\r
 \r
         String full_path = "";\r
         setContentView(R.layout.uploader_layout);\r
 \r
         String full_path = "";\r


@@ -378,15 +369,7 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
     }\r
 \r
     public void uploadFiles() {\r
     }\r
 \r
     public void uploadFiles() {\r

-        OwnCloudVersion ocv = new OwnCloudVersion(mAccountManager.getUserData(mAccount,\r
-                AccountAuthenticator.KEY_OC_VERSION));\r
-        String base_url = mAccountManager.getUserData(mAccount, AccountAuthenticator.KEY_OC_BASE_URL);\r
-        String webdav_path = AccountUtils.getWebdavPath(ocv);\r
-        Uri oc_uri = Uri.parse(base_url + webdav_path);\r
-\r
-        WebdavClient wdc = new WebdavClient(oc_uri);\r
-        wdc.setCredentials(mUsername, mPassword);\r
-        wdc.allowSelfsignedCertificates();\r
+        WebdavClient wdc = new WebdavClient(mAccount, getApplicationContext());\r

 \r
         // create last directory in path if nessesary\r
         if (mCreateDir) {\r
 \r
         // create last directory in path if nessesary\r
         if (mCreateDir) {\r