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

Commit cf3baa6c authored by David A. Velasco's avatar David A. Velasco
Browse files

Merge pull request #111 from owncloud/federated_sharing 

Support for federated sharing
parents 1007a805 996660b8

.travis.yml

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ env: 
  - secure: gPCBnpGLA2sdSMtfhT+/InThmXNEU8XrrS54uuIP8iXBLvVe0yZrNl76GbMosV0ry3YtDngsmsbHwRjPPb0+3mTTdAqZ60HHzGaNPgEm6b5t0t4bpJ3LW9osLZsuf9jRsI2LD66zxblaMrK2+8hN/dUrj707ijsZHp3SPSQJ6g8=

  - secure: AnxLVarfwM7IhJ7Sca35USyRlFHFvlcBhWTt2TVDcyQ+ldDyb+U6IWXFK0Yy82QP0ZH/RCLu7FnmHK/rKG0BHNRt1Ymco1VkTQql0MZcHXP+4IKgEvgJyUn1TqYj+hSVmM6lgTA+QUjZYGSfwU8mhUFiU7644ZTdTe6ALdqa+v8=

  - secure: ezKyZbb3q1Phcv/vJntuJe0C2req+Hp4/C+tFZIWZ3o8wRO9jVI3bnED9TWQyQOOT0SoRYjJ5zqp0UcEOGCzPeWFO6bA7RWp+zA/R9sziLNcVWMVv3WXnuClQjPBHJeXRnP7YmNjxDmSfV97a14dk5d9LgJZYliTDepH4dLsxro=

  - secure: HV8REF7bB1i6cBEe4YCZvjgTf6tGiptAPzp9qZXGUH9Lxh6yUjYMXXP8flDaIFcE2JuAakW6P4SPr7/SQ+X4f8/84cNhmU1I+6Y1nG37WvelRHQVslOUDbl1TNUnynYZ+ybkb3BtrQvggCGMdQKvGZXYiggFhN/TWuDo0c7Q2Ro=

  matrix:

  - ANDROID_TARGET=android-23 ANDROID_ABI=armeabi-v7a

addons:

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

+8 −7
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ public class GetRemoteShareesOperation extends RemoteOperation{ 


    // Arguments - constant values

    private static final String VALUE_FORMAT = "json";

    private static final String VALUE_ITEM_TYPE = "search";         //  to get the server search for users / groups

    private static final String VALUE_ITEM_TYPE = "file";         //  to get the server search for users / groups





    // JSON Node names
@@ -87,15 +87,12 @@ public class GetRemoteShareesOperation extends RemoteOperation{ 
    private static final String NODE_EXACT = "exact";

    private static final String NODE_USERS = "users";

    private static final String NODE_GROUPS = "groups";

    private static final String NODE_REMOTES = "remotes";

    public static final String NODE_VALUE = "value";

    public static final String PROPERTY_LABEL = "label";

    public static final String PROPERTY_SHARE_TYPE = "shareType";

    public static final String PROPERTY_SHARE_WITH = "shareWith";



    // Result types

    public static final Byte USER_TYPE = 0;

    public static final Byte GROUP_TYPE = 1;



    private String mSearchString;

    private int mPage;

    private int mPerPage;
@@ -146,17 +143,21 @@ public class GetRemoteShareesOperation extends RemoteOperation{ 
                JSONObject respExact = respData.getJSONObject(NODE_EXACT);

                JSONArray respExactUsers = respExact.getJSONArray(NODE_USERS);

                JSONArray respExactGroups = respExact.getJSONArray(NODE_GROUPS);

                JSONArray respExactRemotes = respExact.getJSONArray(NODE_REMOTES);

                JSONArray respPartialUsers = respData.getJSONArray(NODE_USERS);

                JSONArray respPartialGroups = respData.getJSONArray(NODE_GROUPS);

                JSONArray respPartialRemotes = respData.getJSONArray(NODE_REMOTES);

                JSONArray[] jsonResults = {

                        respExactUsers,

                        respExactGroups,

                        respExactRemotes,

                        respPartialUsers,

                        respPartialGroups

                        respPartialGroups,

                        respPartialRemotes

                };



                ArrayList<Object> data = new ArrayList<Object>(); // For result data

                for (int i=0; i<4; i++) {

                for (int i=0; i<6; i++) {

                    for(int j=0; j< jsonResults[i].length(); j++){

                        JSONObject jsonResult = jsonResults[i].getJSONObject(j);

                        data.add(jsonResult);

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

+10 −0
Original line number Diff line number Diff line
@@ -62,6 +62,16 @@ public class OCShare implements Parcelable, Serializable { 
            CREATE_PERMISSION_FLAG +

            DELETE_PERMISSION_FLAG

    ;

    public static final int FEDERATED_PERMISSIONS_FOR_FILE =

            READ_PERMISSION_FLAG +

            UPDATE_PERMISSION_FLAG

    ;

    public static final int FEDERATED_PERMISSIONS_FOR_FOLDER =

            READ_PERMISSION_FLAG +

            UPDATE_PERMISSION_FLAG +

            CREATE_PERMISSION_FLAG +

            DELETE_PERMISSION_FLAG

    ;



    private long mId;

    private long mFileSource;

test_client/custom_rules.xml

+14 −0
Original line number Diff line number Diff line
@@ -15,6 +15,20 @@ 
			</then>

		</if>

		

		<!-- Replace OC server URL 2 if set in environment -->

		<if>

			<condition>

				<isset property="env.OCTEST_SERVER_BASE_URL_2" />

			</condition>

			<then>

				<replaceregexp

					file="res/values/setup.xml"

					match='("server_base_url_2"&gt;)\s*(&lt;)'

					replace="\1${env.OCTEST_SERVER_BASE_URL_2}\2"

					byline="true" />

			</then>

		</if>

		

		<!-- Replace test username if set in environment -->

		<if>

			<condition>

test_client/res/values/setup.xml

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
<resources>

    <string name="build_number"></string>

    <string name="server_base_url"></string>

    <string name="server_base_url_2"></string>

    <string name="username"></string>

    <string name="password"></string>

    <string name ="user_agent">Mozilla/5.0 (Android) ownCloud test project</string>