OC-2585: Refresh the share items

diff --git a/res/layout/list_item.xml b/res/layout/list_item.xml
index f301e8d..9a3604c 100644 (file)
--- a/res/layout/list_item.xml
+++ b/res/layout/list_item.xml
@@ -104,7 +104,7 @@
     </LinearLayout>\r
 \r
     <ImageView\r
     </LinearLayout>\r
 \r
     <ImageView\r

-        android:id="@+id/share_indicator"\r
+        android:id="@+id/shareIcon"\r

         android:layout_width="wrap_content"\r
         android:layout_height="wrap_content"\r
         android:layout_gravity="center_vertical"\r
         android:layout_width="wrap_content"\r
         android:layout_height="wrap_content"\r
         android:layout_gravity="center_vertical"\r

diff --git a/src/com/owncloud/android/operations/GetSharedFilesOperation.java b/src/com/owncloud/android/operations/GetSharedFilesOperation.java
index daa172b..4ee4cb6 100644 (file)
--- a/src/com/owncloud/android/operations/GetSharedFilesOperation.java
+++ b/src/com/owncloud/android/operations/GetSharedFilesOperation.java
@@ -23,6 +23,7 @@ import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.datamodel.OCShare;
 import com.owncloud.android.oc_framework.network.webdav.WebdavClient;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.datamodel.OCShare;
 import com.owncloud.android.oc_framework.network.webdav.WebdavClient;

+import com.owncloud.android.oc_framework.operations.OnRemoteOperationListener;

 import com.owncloud.android.oc_framework.operations.RemoteOperation;
 import com.owncloud.android.oc_framework.operations.RemoteOperationResult;
 import com.owncloud.android.oc_framework.operations.ShareRemoteFile;
 import com.owncloud.android.oc_framework.operations.RemoteOperation;
 import com.owncloud.android.oc_framework.operations.RemoteOperationResult;
 import com.owncloud.android.oc_framework.operations.ShareRemoteFile;


@@ -90,5 +91,4 @@ public class GetSharedFilesOperation extends RemoteOperation {
         } 
     }
 
         } 
     }
 

-    

 }
 }

diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index 4aba76b..a698ceb 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -249,11 +249,6 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
             setFile(file);
             setNavigationListWithFolder(file);
             
             setFile(file);
             setNavigationListWithFolder(file);
             

-            /// get the shared files
-            if (isSharedSupported()) {
-                startGetSharedFiles();
-            }
-            

             if (!stateWasRecovered) {
                 Log_OC.e(TAG, "Initializing Fragments in onAccountChanged..");
                 initFragmentsWithFile();
             if (!stateWasRecovered) {
                 Log_OC.e(TAG, "Initializing Fragments in onAccountChanged..");
                 initFragmentsWithFile();


@@ -925,6 +920,11 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
                     && mStorageManager != null
                     ) {  
 
                     && mStorageManager != null
                     ) {  
 

+                /// get the shared files
+                if (isSharedSupported()) {
+                    startGetSharedFiles();
+                }
+                

                 String synchFolderRemotePath = intent.getStringExtra(FileSyncService.SYNC_FOLDER_REMOTE_PATH); 
 
                 OCFile currentFile = (getFile() == null) ? null : mStorageManager.getFileByPath(getFile().getRemotePath());
                 String synchFolderRemotePath = intent.getStringExtra(FileSyncService.SYNC_FOLDER_REMOTE_PATH); 
 
                 OCFile currentFile = (getFile() == null) ? null : mStorageManager.getFileByPath(getFile().getRemotePath());


@@ -1302,6 +1302,10 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
         // TODO
         // Refresh the filelist with the information
         refeshListOfFilesFragment();
         // TODO
         // Refresh the filelist with the information
         refeshListOfFilesFragment();

+//        OCFileListFragment fileListFragment = getListOfFilesFragment();
+//        if (fileListFragment != null) { 
+//            fileListFragment.listDirectory(getCurrentDir());
+//        }      

         
     }
 
         
     }
 


@@ -1520,7 +1524,7 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
         String urlServer = accountMngr.getUserData(getAccount(), OwnCloudAccount.Constants.KEY_OC_BASE_URL);
         
         RemoteOperation getSharedFiles = new GetSharedFilesOperation(urlServer, mStorageManager);
         String urlServer = accountMngr.getUserData(getAccount(), OwnCloudAccount.Constants.KEY_OC_BASE_URL);
         
         RemoteOperation getSharedFiles = new GetSharedFilesOperation(urlServer, mStorageManager);

-        getSharedFiles.execute(getAccount(), this, null, null, this);
+        getSharedFiles.execute(getAccount(), this, this, mHandler, this);

         
     }
     
         
     }
     

diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index 5868443..b96a41b 100644 (file)
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@ -165,11 +165,11 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
                 fileSizeV.setText(DisplayUtils.bytesToHumanReadable(file.getFileLength()));\r
                 lastModV.setVisibility(View.VISIBLE);\r
                 lastModV.setText(DisplayUtils.unixTimeToHumanReadable(file.getModificationTimestamp()));\r
                 fileSizeV.setText(DisplayUtils.bytesToHumanReadable(file.getFileLength()));\r
                 lastModV.setVisibility(View.VISIBLE);\r
                 lastModV.setText(DisplayUtils.unixTimeToHumanReadable(file.getModificationTimestamp()));\r

-               checkBoxV.setVisibility(View.GONE);\r
-               view.findViewById(R.id.imageView3).setVisibility(View.GONE);\r
+                checkBoxV.setVisibility(View.GONE);\r
+                view.findViewById(R.id.imageView3).setVisibility(View.GONE);\r

             }\r
             \r
             }\r
             \r

-            ImageView shareIconV = (ImageView) view.findViewById(R.id.share_indicator);\r
+            ImageView shareIconV = (ImageView) view.findViewById(R.id.shareIcon);\r

             if (file.isShareByLink()) {\r
                 shareIconV.setVisibility(View.VISIBLE);\r
             } else {\r
             if (file.isShareByLink()) {\r
                 shareIconV.setVisibility(View.VISIBLE);\r
             } else {\r