Make these classes use the account selection from the preferences screen

diff --git a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
index a754628..f726fd9 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@ -38,6 +38,7 @@ import android.widget.ArrayAdapter;
 import android.widget.EditText;\r
 import eu.alefzero.owncloud.R;\r
 import eu.alefzero.owncloud.authenticator.AccountAuthenticator;\r
 import android.widget.EditText;\r
 import eu.alefzero.owncloud.R;\r
 import eu.alefzero.owncloud.authenticator.AccountAuthenticator;\r

+import eu.alefzero.owncloud.authenticator.AuthUtils;\r

 import eu.alefzero.owncloud.datamodel.OCFile;\r
 import eu.alefzero.owncloud.ui.fragment.FileList;\r
 import eu.alefzero.webdav.WebdavClient;\r
 import eu.alefzero.owncloud.datamodel.OCFile;\r
 import eu.alefzero.owncloud.ui.fragment.FileList;\r
 import eu.alefzero.webdav.WebdavClient;\r


@@ -66,6 +67,7 @@ public class FileDisplayActivity extends android.support.v4.app.FragmentActivity
   protected Dialog onCreateDialog(int id, Bundle args) {\r
     final AlertDialog.Builder builder = new Builder(this);\r
     final EditText dirName = new EditText(getBaseContext());\r
   protected Dialog onCreateDialog(int id, Bundle args) {\r
     final AlertDialog.Builder builder = new Builder(this);\r
     final EditText dirName = new EditText(getBaseContext());\r

+    final Account a = AuthUtils.getCurrentOwnCloudAccount(this);\r

     builder.setView(dirName);\r
     builder.setTitle(R.string.uploader_info_dirname);\r
     \r
     builder.setView(dirName);\r
     builder.setTitle(R.string.uploader_info_dirname);\r
     \r


@@ -76,18 +78,14 @@ public class FileDisplayActivity extends android.support.v4.app.FragmentActivity
           dialog.cancel();\r
           return;\r
         }\r
           dialog.cancel();\r
           return;\r
         }\r

-        AccountManager am = (AccountManager) getSystemService(ACCOUNT_SERVICE);\r
-        // following account choosing is incorrect and needs to be replaced\r
-        // with some sort of session mechanism\r
-        Account a = am.getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE)[0];\r
-\r
+        \r

         String path = "";\r
         for (int i = mDirectories.getCount()-2; i >= 0; --i) {\r
           path += "/" + mDirectories.getItem(i);\r
         }\r
         OCFile parent = new OCFile(getContentResolver(), a, path+"/");\r
         path += "/" + s + "/";\r
         String path = "";\r
         for (int i = mDirectories.getCount()-2; i >= 0; --i) {\r
           path += "/" + mDirectories.getItem(i);\r
         }\r
         OCFile parent = new OCFile(getContentResolver(), a, path+"/");\r
         path += "/" + s + "/";\r

-        Thread thread = new Thread(new DirectoryCreator(path, a, am));\r
+        Thread thread = new Thread(new DirectoryCreator(path, a));\r

         thread.start();\r
         OCFile.createNewFile(getContentResolver(), a, path, 0, 0, 0, "DIR", parent.getFileId()).save();\r
         \r
         thread.start();\r
         OCFile.createNewFile(getContentResolver(), a, path, 0, 0, 0, "DIR", parent.getFileId()).save();\r
         \r


@@ -200,10 +198,10 @@ public class FileDisplayActivity extends android.support.v4.app.FragmentActivity
     private Account mAccount;\r
     private AccountManager mAm;\r
     \r
     private Account mAccount;\r
     private AccountManager mAm;\r
     \r

-    public DirectoryCreator(String targetPath, Account account, AccountManager am) {\r
+    public DirectoryCreator(String targetPath, Account account) {\r

       mTargetPath = targetPath;\r
       mAccount = account;\r
       mTargetPath = targetPath;\r
       mAccount = account;\r

-      mAm = am;\r
+      mAm = (AccountManager) getSystemService(ACCOUNT_SERVICE);\r

     }\r
     \r
     @Override\r
     }\r
     \r
     @Override\r

diff --git a/src/eu/alefzero/owncloud/ui/fragment/FileList.java b/src/eu/alefzero/owncloud/ui/fragment/FileList.java
index c71d9bf..bb60093 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/fragment/FileList.java
+++ b/src/eu/alefzero/owncloud/ui/fragment/FileList.java
@@ -22,8 +22,6 @@ import java.util.Stack;
 import java.util.Vector;\r
 \r
 import android.accounts.Account;\r
 import java.util.Vector;\r
 \r
 import android.accounts.Account;\r

-import android.accounts.AccountManager;\r
-import android.app.Service;\r

 import android.content.ContentProviderOperation;\r
 import android.content.Intent;\r
 import android.os.Bundle;\r
 import android.content.ContentProviderOperation;\r
 import android.content.Intent;\r
 import android.os.Bundle;\r


@@ -33,7 +31,7 @@ import android.util.Log;
 import android.view.View;\r
 import android.widget.AdapterView;\r
 import eu.alefzero.owncloud.R;\r
 import android.view.View;\r
 import android.widget.AdapterView;\r
 import eu.alefzero.owncloud.R;\r

-import eu.alefzero.owncloud.authenticator.AccountAuthenticator;\r
+import eu.alefzero.owncloud.authenticator.AuthUtils;\r

 import eu.alefzero.owncloud.datamodel.OCFile;\r
 import eu.alefzero.owncloud.ui.FragmentListView;\r
 import eu.alefzero.owncloud.ui.activity.FileDetailActivity;\r
 import eu.alefzero.owncloud.datamodel.OCFile;\r
 import eu.alefzero.owncloud.ui.FragmentListView;\r
 import eu.alefzero.owncloud.ui.activity.FileDetailActivity;\r


@@ -47,7 +45,6 @@ import eu.alefzero.owncloud.ui.adapter.FileListListAdapter;
  */\r
 public class FileList extends FragmentListView {\r
   private Account mAccount;\r
  */\r
 public class FileList extends FragmentListView {\r
   private Account mAccount;\r

-  private AccountManager mAccountManager;\r

   private Stack<String> mDirNames;\r
   private Vector<OCFile> mFiles;\r
 \r
   private Stack<String> mDirNames;\r
   private Vector<OCFile> mFiles;\r
 \r


@@ -59,8 +56,7 @@ public class FileList extends FragmentListView {
   public void onCreate(Bundle savedInstanceState) {\r
     super.onCreate(savedInstanceState);\r
 \r
   public void onCreate(Bundle savedInstanceState) {\r
     super.onCreate(savedInstanceState);\r
 \r

-    mAccountManager = (AccountManager)getActivity().getSystemService(Service.ACCOUNT_SERVICE);\r
-    mAccount = mAccountManager.getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE)[0];\r
+    mAccount = AuthUtils.getCurrentOwnCloudAccount(getActivity());\r

     populateFileList();\r
     //addContact(mAccount, "Bartek Przybylski", "czlowiek");\r
   }\r
     populateFileList();\r
     //addContact(mAccount, "Bartek Przybylski", "czlowiek");\r
   }\r