Merge pull request #113 from nextcloud/enhancement/use_gson (460a9bf0) · Commits · e / os / nextcloud-android-lib

src/com/owncloud/android/lib/common/Quota.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,8 @@
		*/
		package com.owncloud.android.lib.common;

		import com.google.gson.annotations.SerializedName;

		import org.parceler.Parcel;

		/**
		@@ -27,10 +29,15 @@ import org.parceler.Parcel;

		@Parcel
		public class Quota {
		@SerializedName("free")
		public long free;
		@SerializedName("used")
		public long used;
		@SerializedName("total")
		public long total;
		@SerializedName("quota")
		public long quota;
		@SerializedName("relative")
		public double relative;

		public Quota() {

src/com/owncloud/android/lib/common/UserInfo.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,8 @@
		*/
		package com.owncloud.android.lib.common;

		import com.google.gson.annotations.SerializedName;

		import org.parceler.Parcel;

		/**
		@@ -27,14 +29,23 @@ import org.parceler.Parcel;

		@Parcel
		public class UserInfo {
		@SerializedName("id")
		public String id;
		@SerializedName("enabled")
		public Boolean enabled;
		@SerializedName(value = "display-name", alternate = {"displayname"})
		public String displayName;
		@SerializedName("email")
		public String email;
		@SerializedName("phone")
		public String phone;
		@SerializedName("address")
		public String address;
		@SerializedName(value = "website", alternate = {"webpage"})
		public String website;
		@SerializedName("twitter")
		public String twitter;
		@SerializedName("quota")
		public Quota quota;

		public UserInfo() {

src/com/owncloud/android/lib/ocs/OCSMeta.java

0 → 100644

+55 −0

Original line number	Diff line number	Diff line
		/* ownCloud Android Library is available under MIT license
		* Copyright (C) 2018 Bartosz Przybylski
		* Copyright (C) 2018 Nextcloud GmbH
		*
		* Permission is hereby granted, free of charge, to any person obtaining a copy
		* of this software and associated documentation files (the "Software"), to deal
		* in the Software without restriction, including without limitation the rights
		* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
		* copies of the Software, and to permit persons to whom the Software is
		* furnished to do so, subject to the following conditions:
		*
		* The above copyright notice and this permission notice shall be included in
		* all copies or substantial portions of the Software.
		*
		* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
		* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
		* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
		* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
		* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
		* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
		* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
		* THE SOFTWARE.
		*
		*/

		package com.owncloud.android.lib.ocs;

		import com.google.gson.annotations.SerializedName;

		/**
		* A meta class which is a part of OCS response from server
		*
		* @author Bartosz Przybylski
		*/
		public class OCSMeta {
		@SerializedName("status")
		public String status;
		@SerializedName("statuscode")
		public int statusCode;
		@SerializedName("message")
		public String message;
		// TODO(bp): add paging information

		public String getStatus() {
		return status;
		}

		public int getStatusCode() {
		return statusCode;
		}

		public String getMessage() {
		return message;
		}
		}

src/com/owncloud/android/lib/ocs/OCSResponse.java

0 → 100644

+49 −0

Original line number	Diff line number	Diff line
		/* ownCloud Android Library is available under MIT license
		* Copyright (C) 2018 Bartosz Przybylski
		* Copyright (C) 2018 Nextcloud GmbH
		*
		* Permission is hereby granted, free of charge, to any person obtaining a copy
		* of this software and associated documentation files (the "Software"), to deal
		* in the Software without restriction, including without limitation the rights
		* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
		* copies of the Software, and to permit persons to whom the Software is
		* furnished to do so, subject to the following conditions:
		*
		* The above copyright notice and this permission notice shall be included in
		* all copies or substantial portions of the Software.
		*
		* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
		* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
		* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
		* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
		* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
		* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
		* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
		* THE SOFTWARE.
		*
		*/
		package com.owncloud.android.lib.ocs;

		import com.google.gson.annotations.SerializedName;

		/**
		* Wrapper for server OCS response
		*
		* @author Bartosz Przybylski
		*/
		public class OCSResponse<T extends Object> {

		@SerializedName("data")
		public T data;

		@SerializedName("meta")
		public OCSMeta meta;

		public T getData() {
		return data;
		}

		public OCSMeta getMeta() {
		return meta;
		}
		}

src/com/owncloud/android/lib/ocs/ServerResponse.java

0 → 100644

+42 −0

Original line number	Diff line number	Diff line
		/* ownCloud Android Library is available under MIT license
		* Copyright (C) 2018 Bartosz Przybylski
		* Copyright (C) 2018 Nextcloud GmbH
		*
		* Permission is hereby granted, free of charge, to any person obtaining a copy
		* of this software and associated documentation files (the "Software"), to deal
		* in the Software without restriction, including without limitation the rights
		* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
		* copies of the Software, and to permit persons to whom the Software is
		* furnished to do so, subject to the following conditions:
		*
		* The above copyright notice and this permission notice shall be included in
		* all copies or substantial portions of the Software.
		*
		* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
		* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
		* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
		* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
		* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
		* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
		* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
		* THE SOFTWARE.
		*
		*/

		package com.owncloud.android.lib.ocs;

		import com.google.gson.annotations.SerializedName;

		/**
		* Wrapper for server response
		*
		* @author Bartosz Przybylski
		*/
		public class ServerResponse<T extends Object> {
		@SerializedName("ocs")
		public OCSResponse<T> ocs;

		public OCSResponse<T> getOcs() {
		return ocs;
		}
		}