X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/ac685690a2bf019d2978082debe62ec6aea0a69f..106a2324e113d997db71f00a63ecda3ad828f098:/src/com/owncloud/android/ui/preview/PreviewImageFragment.java diff --git a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java index 0cf09226..df0fb7aa 100644 --- a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java +++ b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java @@ -286,11 +286,7 @@ public class PreviewImageFragment extends FileFragment { public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { case R.id.action_share_file: { - mContainerActivity.getFileOperationsHelper().shareFileWithLink(getFile()); - return true; - } - case R.id.action_unshare_file: { - mContainerActivity.getFileOperationsHelper().unshareFileWithLink(getFile()); + mContainerActivity.getFileOperationsHelper().showShareFile(getFile()); return true; } case R.id.action_open_file_with: { @@ -311,7 +307,7 @@ public class PreviewImageFragment extends FileFragment { return true; } case R.id.action_sync_file: { - mContainerActivity.getFileOperationsHelper().syncFile(getFile(), true); + mContainerActivity.getFileOperationsHelper().syncFile(getFile()); return true; } case R.id.action_favorite_file:{ @@ -332,7 +328,6 @@ public class PreviewImageFragment extends FileFragment { mContainerActivity.showDetails(getFile()); } - @Override public void onResume() { super.onResume(); @@ -476,7 +471,7 @@ public class PreviewImageFragment extends FileFragment { @Override protected void onCancelled(LoadImage result) { - if (result.bitmap != null) { + if (result != null && result.bitmap != null) { result.bitmap.recycle(); } }