Added support to OAuth2 'authorization code' grat type: get & save access token,...

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / fragment / FileDetailFragment.java

diff --git a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
index 5197d67..64e3cca 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
+++ b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
@@ -308,8 +308,7 @@ public class FileDetailFragment extends SherlockFragment implements
                     \r
                 } else {\r
                     mLastRemoteOperation = new SynchronizeFileOperation(mFile, null, mStorageManager, mAccount, true, false, getActivity());\r
                     \r
                 } else {\r
                     mLastRemoteOperation = new SynchronizeFileOperation(mFile, null, mStorageManager, mAccount, true, false, getActivity());\r

-                    WebdavClient wc = OwnCloudClientUtils.createOwnCloudClient(mAccount, getSherlockActivity().getApplicationContext());\r
-                    mLastRemoteOperation.execute(wc, this, mHandler);\r
+                    mLastRemoteOperation.execute(mAccount, getSherlockActivity(), this, mHandler);\r

                 \r
                     // update ui \r
                     boolean inDisplayActivity = getActivity() instanceof FileDisplayActivity;\r
                 \r
                     // update ui \r
                     boolean inDisplayActivity = getActivity() instanceof FileDisplayActivity;\r


@@ -423,8 +422,7 @@ public class FileDetailFragment extends SherlockFragment implements
                 mLastRemoteOperation = new RemoveFileOperation( mFile, \r
                                                                 true, \r
                                                                 mStorageManager);\r
                 mLastRemoteOperation = new RemoveFileOperation( mFile, \r
                                                                 true, \r
                                                                 mStorageManager);\r

-                WebdavClient wc = OwnCloudClientUtils.createOwnCloudClient(mAccount, getSherlockActivity().getApplicationContext());\r
-                mLastRemoteOperation.execute(wc, this, mHandler);\r
+                mLastRemoteOperation.execute(mAccount, getSherlockActivity(), this, mHandler);\r

                 \r
                 boolean inDisplayActivity = getActivity() instanceof FileDisplayActivity;\r
                 getActivity().showDialog((inDisplayActivity)? FileDisplayActivity.DIALOG_SHORT_WAIT : FileDetailActivity.DIALOG_SHORT_WAIT);\r
                 \r
                 boolean inDisplayActivity = getActivity() instanceof FileDisplayActivity;\r
                 getActivity().showDialog((inDisplayActivity)? FileDisplayActivity.DIALOG_SHORT_WAIT : FileDetailActivity.DIALOG_SHORT_WAIT);\r


@@ -752,6 +750,7 @@ public class FileDetailFragment extends SherlockFragment implements
     \r
 \r
     // this is a temporary class for sharing purposes, it need to be replaced in transfer service\r
     \r
 \r
     // this is a temporary class for sharing purposes, it need to be replaced in transfer service\r

+    /*\r

     @SuppressWarnings("unused")\r
     private class ShareRunnable implements Runnable {\r
         private String mPath;\r
     @SuppressWarnings("unused")\r
     private class ShareRunnable implements Runnable {\r
         private String mPath;\r


@@ -854,6 +853,7 @@ public class FileDetailFragment extends SherlockFragment implements
             }\r
         }\r
     }\r
             }\r
         }\r
     }\r

+    */\r

     \r
     public void onDismiss(EditNameDialog dialog) {\r
         if (dialog.getResult()) {\r
     \r
     public void onDismiss(EditNameDialog dialog) {\r
         if (dialog.getResult()) {\r


@@ -863,8 +863,7 @@ public class FileDetailFragment extends SherlockFragment implements
                                                             mAccount, \r
                                                             newFilename, \r
                                                             new FileDataStorageManager(mAccount, getActivity().getContentResolver()));\r
                                                             mAccount, \r
                                                             newFilename, \r
                                                             new FileDataStorageManager(mAccount, getActivity().getContentResolver()));\r

-            WebdavClient wc = OwnCloudClientUtils.createOwnCloudClient(mAccount, getSherlockActivity().getApplicationContext());\r
-            mLastRemoteOperation.execute(wc, this, mHandler);\r
+            mLastRemoteOperation.execute(mAccount, getSherlockActivity(), this, mHandler);\r

             boolean inDisplayActivity = getActivity() instanceof FileDisplayActivity;\r
             getActivity().showDialog((inDisplayActivity)? FileDisplayActivity.DIALOG_SHORT_WAIT : FileDetailActivity.DIALOG_SHORT_WAIT);\r
         }\r
             boolean inDisplayActivity = getActivity() instanceof FileDisplayActivity;\r
             getActivity().showDialog((inDisplayActivity)? FileDisplayActivity.DIALOG_SHORT_WAIT : FileDetailActivity.DIALOG_SHORT_WAIT);\r
         }\r