Merge branch 'master' into shareOcsV2 (5e2399bd) · Commits · e / os / nextcloud-android-lib

src/com/owncloud/android/lib/common/accounts/AccountUtils.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -297,7 +297,13 @@ public class AccountUtils {

		Uri serverUri = (client.getBaseUri() != null)? client.getBaseUri() : client.getWebdavUri();

		String cookiesString = am.getUserData(account, Constants.KEY_COOKIES);
		String cookiesString = null;
		try {
		cookiesString = am.getUserData(account, Constants.KEY_COOKIES);
		} catch (SecurityException e) {
		Log_OC.e(TAG, e.getMessage());
		}

		if (cookiesString !=null) {
		String[] cookies = cookiesString.split(";");
		if (cookies.length > 0) {

+18 −3

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ package com.owncloud.android.lib.resources.activities.models;

		import com.google.gson.TypeAdapter;
		import com.google.gson.stream.JsonReader;
		import com.google.gson.stream.JsonToken;
		import com.google.gson.stream.JsonWriter;

		import java.io.IOException;
		@@ -51,11 +52,25 @@ public class RichElementTypeAdapter extends TypeAdapter<RichElement> {
		if (count == 0) {
		richElement.setRichSubject(in.nextString());
		} else {
		in.beginObject();
		JsonToken nextType = in.peek();

		switch (nextType) {
		case BEGIN_OBJECT:
		in.beginObject();
		read(richElement, in);

		in.endObject();
		break;

		case BEGIN_ARRAY:
		in.beginArray();
		in.endArray();
		break;

		default:
		// do nothing
		break;
		}

		}
		count++;
		}

+14 −14

Original line number	Diff line number	Diff line
		@@ -24,14 +24,14 @@

		package com.owncloud.android.lib.resources.shares;

		import java.io.Serializable;

		import android.os.Parcel;
		import android.os.Parcelable;

		import com.owncloud.android.lib.common.utils.Log_OC;
		import com.owncloud.android.lib.resources.files.FileUtils;

		import java.io.Serializable;


		/**
		* Contains the data of a Share from the Share API
		@@ -57,32 +57,32 @@ public class OCShare implements Parcelable, Serializable {
		public static final int MAXIMUM_PERMISSIONS_FOR_FILE =
		READ_PERMISSION_FLAG +
		UPDATE_PERMISSION_FLAG +
		SHARE_PERMISSION_FLAG
		;
		SHARE_PERMISSION_FLAG;

		public static final int MAXIMUM_PERMISSIONS_FOR_FOLDER =
		MAXIMUM_PERMISSIONS_FOR_FILE +
		CREATE_PERMISSION_FLAG +
		DELETE_PERMISSION_FLAG
		;
		DELETE_PERMISSION_FLAG;

		public static final int FEDERATED_PERMISSIONS_FOR_FILE_UP_TO_OC9 =
		READ_PERMISSION_FLAG +
		UPDATE_PERMISSION_FLAG
		;
		UPDATE_PERMISSION_FLAG;

		public static final int FEDERATED_PERMISSIONS_FOR_FILE_AFTER_OC9 =
		READ_PERMISSION_FLAG +
		UPDATE_PERMISSION_FLAG +
		SHARE_PERMISSION_FLAG
		;
		CREATE_PERMISSION_FLAG +
		DELETE_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
		;
		DELETE_PERMISSION_FLAG;

		public static final int FEDERATED_PERMISSIONS_FOR_FOLDER_AFTER_OC9 =
		FEDERATED_PERMISSIONS_FOR_FOLDER_UP_TO_OC9 +
		SHARE_PERMISSION_FLAG
		;
		SHARE_PERMISSION_FLAG;

		private long mId;
		private long mFileSource;