mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-18 23:11:58 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix compile error after lib merges

Browse source 
# Conflicts:
#	src/com/owncloud/android/ui/activity/ShareActivity.java
This commit is contained in:
AndyScherzinger 2016-11-22 21:57:26 +01:00
parent 0f7e51fc37
commit c1c306150f
No known key found for this signature in database
GPG key ID: 6CADC7E3523C308B
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/com/owncloud/android/ui/activity/ShareActivity.java
View file

@ -42,7 +42,6 @@ import com.owncloud.android.operations.CreateShareViaLinkOperation;
import com.owncloud.android.operations.GetSharesForFileOperation;
import com.owncloud.android.operations.UnshareOperation;
import com.owncloud.android.operations.UpdateSharePermissionsOperation;
import com.owncloud.android.providers.UsersAndGroupsSearchProvider;
import com.owncloud.android.ui.dialog.ShareLinkToDialog;
import com.owncloud.android.ui.fragment.EditShareFragment;
import com.owncloud.android.ui.fragment.SearchShareesFragment;
@ -51,6 +50,7 @@ import com.owncloud.android.ui.fragment.ShareFragmentListener;
import com.owncloud.android.utils.ErrorMessageAdapter;
import com.owncloud.android.utils.GetShareWithUsersAsyncTask;
import org.nextcloud.providers.UsersAndGroupsSearchProvider;
import java.util.ArrayList;
@ -154,10 +154,12 @@ public class ShareActivity extends FileActivity
return OCShare.READ_PERMISSION_FLAG; // minimum permissions
} else if (getFile().isFolder()) {
return (isFederated) ? OCShare.FEDERATED_PERMISSIONS_FOR_FOLDER : OCShare.MAXIMUM_PERMISSIONS_FOR_FOLDER;
return (isFederated) ? OCShare.FEDERATED_PERMISSIONS_FOR_FOLDER_UP_TO_OC9 :
OCShare.MAXIMUM_PERMISSIONS_FOR_FOLDER;
} else { // isFile
return (isFederated) ? OCShare.FEDERATED_PERMISSIONS_FOR_FILE : OCShare.MAXIMUM_PERMISSIONS_FOR_FILE;
return (isFederated) ? OCShare.FEDERATED_PERMISSIONS_FOR_FILE_UP_TO_OC9 :
OCShare.MAXIMUM_PERMISSIONS_FOR_FILE;
}
}

3
src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java
View file

@ -479,7 +479,8 @@ public class FileOperationsHelper {
updateShareIntent.putExtra(OperationsService.EXTRA_SHARE_PERMISSIONS, OCShare.CREATE_PERMISSION_FLAG);
} else {
updateShareIntent.
putExtra(OperationsService.EXTRA_SHARE_PERMISSIONS, OCShare.FEDERATED_PERMISSIONS_FOR_FOLDER);
putExtra(OperationsService.EXTRA_SHARE_PERMISSIONS,
OCShare.FEDERATED_PERMISSIONS_FOR_FOLDER_UP_TO_OC9);
}
queueShareIntent(updateShareIntent);