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

Commit 21ea3d84 authored by Bartosz Przybylski's avatar Bartosz Przybylski
Browse files

Add meta information as a part of ServerResponse

parent 26bcdf2a

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

0 → 100644
+43 −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 extends Object {

    @SerializedName("status")

    public String status;

    @SerializedName("statuscode")

    public int statusCode;

    @SerializedName("message")

    public String message;

    // TODO(bp): add paging information

}

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

+2 −0
Original line number Diff line number Diff line
@@ -36,4 +36,6 @@ public class OCSResponse<T extends Object> { 
    @SerializedName("data")

    public T data;



    @SerializedName("meta")

    public OCSMeta meta;

}

src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java

+4 −3
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import com.owncloud.android.lib.common.operations.RemoteOperation; 
import com.owncloud.android.lib.common.operations.RemoteOperationResult;

import com.owncloud.android.lib.common.utils.Log_OC;

import com.owncloud.android.lib.ocs.OCSResponse;

import com.owncloud.android.lib.ocs.ServerResponse;

import com.owncloud.android.lib.resources.status.OwnCloudVersion;



import org.apache.commons.httpclient.HttpStatus;
@@ -126,10 +127,10 @@ public class GetRemoteUserInfoOperation extends RemoteOperation { 
                Gson gson = new Gson();

                JsonParser parser = new JsonParser();

                JsonObject respJson = (JsonObject)parser.parse(response);

                Type respType = new TypeToken<OCSResponse<UserInfo>>(){}.getType();

                OCSResponse<UserInfo> ocsResponse = gson.fromJson(respJson, respType);

                Type respType = new TypeToken<ServerResponse<UserInfo>>(){}.getType();

                ServerResponse<UserInfo> ocsResponse = gson.fromJson(respJson, respType);



                UserInfo userInfo = ocsResponse.data;

                UserInfo userInfo = ocsResponse.ocs.data;



                if (userInfo.getId() == null) {

                    if (TextUtils.isEmpty(userID))