From: masensio Date: Fri, 24 Jan 2014 11:22:11 +0000 (+0100) Subject: OC-2490: Show image for shared file in the filelist X-Git-Tag: oc-android-1.5.5~35^2~50 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/b73b968f605f161802f53178be58698313240d4d OC-2490: Show image for shared file in the filelist --- diff --git a/oc_framework/src/com/owncloud/android/oc_framework/operations/remote/OwnCloudServerCheckOperation.java b/oc_framework/src/com/owncloud/android/oc_framework/operations/remote/OwnCloudServerCheckOperation.java index 7de4e79d..4dfdc245 100644 --- a/oc_framework/src/com/owncloud/android/oc_framework/operations/remote/OwnCloudServerCheckOperation.java +++ b/oc_framework/src/com/owncloud/android/oc_framework/operations/remote/OwnCloudServerCheckOperation.java @@ -81,10 +81,10 @@ public class OwnCloudServerCheckOperation extends RemoteOperation { OwnCloudVersion shareServer = new OwnCloudVersion(OCVERSION_SHARED_SUPPORTED); if (mOCVersionString != null) { return mOCVersionString.compareTo(shareServer) >= 0; - } else { - return false; - } - + } + + return false; + } private boolean tryConnection(WebdavClient wc, String urlSt) { diff --git a/src/com/owncloud/android/ui/activity/FileActivity.java b/src/com/owncloud/android/ui/activity/FileActivity.java index 2a822006..09763edf 100644 --- a/src/com/owncloud/android/ui/activity/FileActivity.java +++ b/src/com/owncloud/android/ui/activity/FileActivity.java @@ -253,7 +253,7 @@ public abstract class FileActivity extends SherlockFragmentActivity { public boolean isSharedSupported() { if (getAccount() != null) { AccountManager accountManager = AccountManager.get(this); - return Boolean.getBoolean(accountManager.getUserData(getAccount(), OwnCloudAccount.Constants.KEY_SUPPORTS_SHARE_API)); + return Boolean.parseBoolean(accountManager.getUserData(getAccount(), OwnCloudAccount.Constants.KEY_SUPPORTS_SHARE_API)); } return false; } diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java index 841a5d04..58684432 100644 --- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java +++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java @@ -168,6 +168,13 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter { checkBoxV.setVisibility(View.GONE); view.findViewById(R.id.imageView3).setVisibility(View.GONE); } + + ImageView shareIconV = (ImageView) view.findViewById(R.id.share_indicator); + if (file.isShareByLink()) { + shareIconV.setVisibility(View.VISIBLE); + } else { + shareIconV.setVisibility(View.INVISIBLE); + } } return view;