Set or clear expiration date to protect public link in ShareFileFragment

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / activity / ShareActivity.java

diff --git a/src/com/owncloud/android/ui/activity/ShareActivity.java b/src/com/owncloud/android/ui/activity/ShareActivity.java
index 180b2a0..9c4d33e 100644 (file)
--- a/src/com/owncloud/android/ui/activity/ShareActivity.java
+++ b/src/com/owncloud/android/ui/activity/ShareActivity.java
@@ -78,7 +78,7 @@ public class ShareActivity extends FileActivity
 
         // Load data into the list
         Log_OC.d(TAG, "Refreshing lists on account set");
 
         // Load data into the list
         Log_OC.d(TAG, "Refreshing lists on account set");

-        refreshUsersInLists();
+        refreshSharesFromStorageManager();

 
         // Request for a refresh of the data through the server (starts an Async Task)
         refreshUsersOrGroupsListFromServer();
 
         // Request for a refresh of the data through the server (starts an Async Task)
         refreshUsersOrGroupsListFromServer();


@@ -154,25 +154,28 @@ public class ShareActivity extends FileActivity
         super.onRemoteOperationFinish(operation, result);
 
         if (result.isSuccess()) {
         super.onRemoteOperationFinish(operation, result);
 
         if (result.isSuccess()) {

-            Log_OC.d(TAG, "Refreshing lists on successful sync");
-            refreshUsersInLists();
+            Log_OC.d(TAG, "Refreshing view on successful operation");
+            refreshSharesFromStorageManager();

         }
         }

-

     }
 
     }
 

-    private void refreshUsersInLists() {
+
+    /**
+     * Updates the view, reading data from {@link com.owncloud.android.datamodel.FileDataStorageManager}
+     */
+    private void refreshSharesFromStorageManager() {
+

         ShareFileFragment shareFileFragment = getShareFileFragment();
         ShareFileFragment shareFileFragment = getShareFileFragment();

-        if (shareFileFragment != null) {          // only if added to the view hierarchy!!
-            if (shareFileFragment.isAdded()) {
-                shareFileFragment.refreshUsersOrGroupsListFromDB();
-            }
+        if (shareFileFragment != null
+                && shareFileFragment.isAdded()) {   // only if added to the view hierarchy!!
+            shareFileFragment.refreshUsersOrGroupsListFromDB();
+            shareFileFragment.refreshPublicShareFromDB();

         }
 
         SearchShareesFragment searchShareesFragment = getSearchFragment();
         }
 
         SearchShareesFragment searchShareesFragment = getSearchFragment();

-        if (searchShareesFragment != null) {
-            if (searchShareesFragment.isAdded()) {  // only if added to the view hierarchy!!
-                searchShareesFragment.refreshUsersOrGroupsListFromDB();
-            }
+        if (searchShareesFragment != null &&
+                searchShareesFragment.isAdded()) {  // only if added to the view hierarchy!!
+            searchShareesFragment.refreshUsersOrGroupsListFromDB();

         }
     }
 
         }
     }