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 7de4e79..4dfdc24 100644 (file)
--- 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;
         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) {
     }
 
     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 2a82200..09763ed 100644 (file)
--- 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);
     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;
     }
         }
         return false;
     }

diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index 841a5d0..5868443 100644 (file)
--- 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);\r
                view.findViewById(R.id.imageView3).setVisibility(View.GONE);\r
             }\r
                checkBoxV.setVisibility(View.GONE);\r
                view.findViewById(R.id.imageView3).setVisibility(View.GONE);\r
             }\r

+            \r
+            ImageView shareIconV = (ImageView) view.findViewById(R.id.share_indicator);\r
+            if (file.isShareByLink()) {\r
+                shareIconV.setVisibility(View.VISIBLE);\r
+            } else {\r
+                shareIconV.setVisibility(View.INVISIBLE);\r
+            }\r

         }\r
 \r
         return view;\r
         }\r
 \r
         return view;\r