From: masensio <masensio@solidgear.es>
Date: Thu, 30 Jan 2014 17:54:54 +0000 (+0100)
Subject: Merge branch 'share_link_show_shared_files' into share_link__new_share
X-Git-Tag: oc-android-1.5.5~58^2~21
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c550c8701bcb477e2d2a6af7c68e5154e5612102?ds=inline

Merge branch 'share_link_show_shared_files' into share_link__new_share
---

c550c8701bcb477e2d2a6af7c68e5154e5612102
diff --cc src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index 7f8ad7e3,3cdf19b0..676e90a2
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@@ -1538,23 -1567,5 +1569,12 @@@ OCFileListFragment.ContainerActivity, F
          setSupportProgressBarIndeterminateVisibility(true);
          
      }
 +
 +    @Override
 +    public void shareFileWithLink(OCFile file) {
 +            CreateShareOperation createShare = new CreateShareOperation(file.getRemotePath(), ShareType.PUBLIC_LINK, "", false, "", 1);
 +            createShare.execute(getAccount(), this, this, mHandler, this);
 +        
 +    }
      
- //    public void enableDisableViewGroup(ViewGroup viewGroup, boolean enabled) {
- //        int childCount = viewGroup.getChildCount();
- //        for (int i = 0; i < childCount; i++) {
- //          View view = viewGroup.getChildAt(i);
- //          view.setEnabled(enabled);
- //          view.setClickable(!enabled);
- //          if (view instanceof ViewGroup) {
- //            enableDisableViewGroup((ViewGroup) view, enabled);
- //          }
- //        }
- //      }
  }