Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c453829 authored by Andy Scherzinger's avatar Andy Scherzinger Committed by GitHub
Browse files

Merge pull request #25 from nextcloud/check_for_unshareable_federated_shares 

Check for unshareable federated shares
parents 64d7734e d79bfe53

src/com/owncloud/android/lib/resources/shares/OCShare.java

+29 −18
Original line number Diff line number Diff line
@@ -41,7 +41,9 @@ import com.owncloud.android.lib.resources.files.FileUtils; 
 */

public class OCShare implements Parcelable, Serializable {



	/** Generated - should be refreshed every time the class changes!! */

    /**

     * Generated - should be refreshed every time the class changes!!

     */

    private static final long serialVersionUID = 4124975224281327921L;



    private static final String TAG = OCShare.class.getSimpleName();
@@ -62,16 +64,25 @@ public class OCShare implements Parcelable, Serializable { 
        CREATE_PERMISSION_FLAG +

        DELETE_PERMISSION_FLAG

    ;

    public static final int FEDERATED_PERMISSIONS_FOR_FILE =

    public static final int FEDERATED_PERMISSIONS_FOR_FILE_UP_TO_OC9 =

        READ_PERMISSION_FLAG +

        UPDATE_PERMISSION_FLAG

    ;

    public static final int FEDERATED_PERMISSIONS_FOR_FOLDER =

    public static final int FEDERATED_PERMISSIONS_FOR_FILE_AFTER_OC9 =

        READ_PERMISSION_FLAG +

        UPDATE_PERMISSION_FLAG +

        SHARE_PERMISSION_FLAG

    ;

    public static final int FEDERATED_PERMISSIONS_FOR_FOLDER_UP_TO_OC9 =

        READ_PERMISSION_FLAG +

        UPDATE_PERMISSION_FLAG +

        CREATE_PERMISSION_FLAG +

        DELETE_PERMISSION_FLAG

    ;

    public static final int FEDERATED_PERMISSIONS_FOR_FOLDER_AFTER_OC9 =

        FEDERATED_PERMISSIONS_FOR_FOLDER_UP_TO_OC9 +

        SHARE_PERMISSION_FLAG

    ;



    private long mId;

    private long mFileSource;

src/com/owncloud/android/lib/resources/status/OwnCloudVersion.java

+7 −2
Original line number Diff line number Diff line
@@ -54,6 +54,8 @@ public class OwnCloudVersion implements Comparable<OwnCloudVersion> { 


    public static final int MINIMUM_VERSION_CAPABILITIES_API = 0x08010000; // 8.1



    private static final int MINIMUM_VERSION_WITH_NOT_RESHAREABLE_FEDERATED = 0x09010000;   // 9.1



    public static final int MINIMUM_VERSION_FOR_SELF_API = 0x0B000200;



    public static final int MINIMUM_VERSION_FOR_SEARCH_API = 0x0C000000;
@@ -164,10 +166,13 @@ public class OwnCloudVersion implements Comparable<OwnCloudVersion> { 
        return (mVersion>= MINIMUM_VERSION_CAPABILITIES_API);

    }



    public boolean isNotReshareableFederatedSupported() {

        return (mVersion >= MINIMUM_VERSION_WITH_NOT_RESHAREABLE_FEDERATED);

    }



    public boolean isSelfSupported() {

        return (mVersion >= MINIMUM_VERSION_FOR_SELF_API);

    }



    public boolean isSearchSupported() {

        return (mVersion >= MINIMUM_VERSION_FOR_SEARCH_API);

    }