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

Unverified Commit 355bcae8 authored by Bartosz Przybylski's avatar Bartosz Przybylski Committed by AndyScherzinger
Browse files

Update UserInfo structure 

Change webpage to website
parent c46cfd6d

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

+7 −7
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ public class UserInfo { 
    public String email;

    public String phone;

    public String address;

    public String webpage;

    public String website;

    public String twitter;

    public Quota quota;
@@ -41,14 +41,14 @@ public class UserInfo { 
    }



    public UserInfo(String id, Boolean enabled, String displayName, String email, String phone, String address,

                    String webpage, String twitter, Quota quota) {

                    String website, String twitter, Quota quota) {

        this.id = id;

        this.enabled = enabled;

        this.displayName = displayName;

        this.email = email;

        this.phone = phone;

        this.address = address;

        this.webpage = webpage;

        this.website = website;

        this.twitter = twitter;

        this.quota = quota;

    }
@@ -93,12 +93,12 @@ public class UserInfo { 
        this.address = address;

    }



    public String getWebpage() {

        return webpage;

    public String getWebsite() {

        return website;

    }



    public void setWebpage(String webpage) {

        this.webpage = webpage;

    public void setWebsite(String website) {

        this.website = website;

    }



    public String getTwitter() {

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

+3 −3
Original line number Diff line number Diff line
@@ -193,11 +193,11 @@ public class GetRemoteUserInfoOperation extends RemoteOperation { 
                if (hasData(respData, NODE_ADDRESS))

                    userInfo.setAddress(respData.getString(NODE_ADDRESS));



                // webpage field name pre NC12

                // webpage is a field name pre NC12

                if (hasData(respData, NODE_WEBSITE))

                    userInfo.setWebpage(respData.getString(NODE_WEBSITE));

                    userInfo.setWebsite(respData.getString(NODE_WEBSITE));

                else if (hasData(respData, NODE_WEBPAGE))

                    userInfo.setWebpage(respData.getString(NODE_WEBPAGE));

                    userInfo.setWebsite(respData.getString(NODE_WEBPAGE));



                if (hasData(respData, NODE_TWITTER))

                    userInfo.setTwitter(respData.getString(NODE_TWITTER));