Merge branch 'share_link__unshare_file' into wide_scope_library_clean_up

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / preview / PreviewImageActivity.java

diff --git a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
index e0b1071..ece3991 100644 (file)
--- a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
+++ b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
@@ -45,10 +45,10 @@ import com.owncloud.android.files.services.FileDownloader;
 import com.owncloud.android.files.services.FileUploader;
 import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
 import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
-import com.owncloud.android.lib.operations.common.OnRemoteOperationListener;
-import com.owncloud.android.lib.operations.common.RemoteOperation;
-import com.owncloud.android.lib.operations.common.RemoteOperationResult;
-import com.owncloud.android.lib.operations.common.RemoteOperationResult.ResultCode;
+import com.owncloud.android.lib.common.operations.OnRemoteOperationListener;
+import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.operations.CreateShareOperation;
 import com.owncloud.android.operations.UnshareLinkOperation;
 import com.owncloud.android.ui.activity.FileActivity;
@@ -172,8 +172,8 @@ public class PreviewImageActivity extends FileActivity implements FileFragment.C
             OCFile file = getStorageManager().getFileByPath(getFile().getRemotePath());
             if (file != null) {
                 setFile(file);
-                invalidateOptionsMenu();
             }
+            invalidateOptionsMenu();
         } else if  (result.getCode() == ResultCode.SHARE_NOT_FOUND) {
             backToDisplayActivity();
         }
@@ -185,8 +185,8 @@ public class PreviewImageActivity extends FileActivity implements FileFragment.C
             OCFile file = getStorageManager().getFileByPath(getFile().getRemotePath());
             if (file != null) {
                 setFile(file);
-                invalidateOptionsMenu();
             }
+            invalidateOptionsMenu();
         }
     }