Skip to content

Files drop #141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AndyScherzinger merged 11 commits into from
Sep 6, 2016
Merged

Files drop #141

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1ace509
wip
tobiasKaminsky Jul 18, 2016
5890f55
wip
tobiasKaminsky Jul 18, 2016
923d4b6
wip
tobiasKaminsky Jul 20, 2016
e26dc76
wip
tobiasKaminsky Jul 21, 2016
352ea77
wip
tobiasKaminsky Jul 21, 2016
9cf1676
hide file listing switch visibility fix when share link gets deactivated
AndyScherzinger Aug 2, 2016
8c53483
minor formattings
AndyScherzinger Aug 2, 2016
90f5821
show compatibility warning
tobiasKaminsky Sep 5, 2016
de41f95
bump andrid lib to 1.0.7
AndyScherzinger Sep 5, 2016
b8905bd
minor code reformattings and cleanup
AndyScherzinger Sep 6, 2016
ffa3d15
RC1 versioning
AndyScherzinger Sep 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
minor code reformattings and cleanup
  • Loading branch information
@AndyScherzinger
AndyScherzinger committed Sep 6, 2016
commit b8905bdb320f4a93fc3ee3a707d4b001e714a0a1
12 changes: 6 additions & 6 deletions res/layout/share_file_layout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,15 +191,15 @@
</RelativeLayout>

<RelativeLayout
android:id="@+id/shareViaLinkHideListPermissionSection"
android:id="@+id/shareViaLinkHideFileListingPermissionSection"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="invisible"
android:layout_marginBottom="@dimen/standard_half_margin"
android:visibility="invisible"
>

<android.support.v7.widget.SwitchCompat
android:id="@+id/shareViaLinkHideListPermissionSwitch"
android:id="@+id/shareViaLinkFileListingPermissionSwitch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
Expand All @@ -209,13 +209,13 @@
/>

<TextView
android:id="@+id/shareViaLinkHideListPermissionLabel"
android:id="@+id/shareViaLinkFileListingPermissionLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_toLeftOf="@id/shareViaLinkHideListPermissionSwitch"
android:layout_toStartOf="@id/shareViaLinkHideListPermissionSwitch"
android:layout_toLeftOf="@id/shareViaLinkFileListingPermissionSwitch"
android:layout_toStartOf="@id/shareViaLinkFileListingPermissionSwitch"
android:padding="@dimen/standard_half_padding"
android:text="@string/share_via_link_hide_file_listing_permission_label"
android:textColor="@color/black"
Expand Down
15 changes: 4 additions & 11 deletions src/com/owncloud/android/files/FileOperationsHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,23 +405,16 @@ public void setHideFileListingPermissionsToShare(OCShare share, boolean hideFile
updateShareIntent.putExtra(OperationsService.EXTRA_ACCOUNT, mFileActivity.getAccount());
updateShareIntent.putExtra(OperationsService.EXTRA_SHARE_ID, share.getId());

int permission = share.getPermissions();
share.setPermissions(permission);

if(hideFileListing) {
permission = OCShare.CREATE_PERMISSION_FLAG;
if (hideFileListing) {
updateShareIntent.putExtra(OperationsService.EXTRA_SHARE_PERMISSIONS, OCShare.CREATE_PERMISSION_FLAG);
} else {
permission = OCShare.FEDERATED_PERMISSIONS_FOR_FOLDER;
updateShareIntent.
putExtra(OperationsService.EXTRA_SHARE_PERMISSIONS, OCShare.FEDERATED_PERMISSIONS_FOR_FOLDER);
}

updateShareIntent.putExtra(
OperationsService.EXTRA_SHARE_PERMISSIONS,
permission
);
queueShareIntent(updateShareIntent);
}


/**
* @return 'True' if the server supports the Search Users API
*/
Expand Down
Loading