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

Unverified Commit da41f323 authored by Andy Scherzinger's avatar Andy Scherzinger Committed by GitHub
Browse files

Merge pull request #157 from nextcloud/externalLinkEmbedding 

Add redirect info to external link
parents 46708db8 29ab07cf

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

+4 −1
Original line number Diff line number Diff line
@@ -34,18 +34,21 @@ public class ExternalLink { 
    public ExternalLinkType type;

    public String name;

    public String url;

    public boolean redirect;



    public ExternalLink() {



    }



    public ExternalLink(Integer id, String iconUrl, String language, ExternalLinkType type, String name, String url) {

    public ExternalLink(Integer id, String iconUrl, String language, ExternalLinkType type, String name, String url, 

                        boolean redirect) {

        this.id = id;

        this.iconUrl = iconUrl;

        this.language = language;

        this.type = type;

        this.name = name;

        this.url = url;

        this.redirect = redirect;

    }

}

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

+8 −1
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ public class ExternalLinksOperation extends RemoteOperation { 
    private static final String NODE_TYPE = "type";

    private static final String NODE_NAME = "name";

    private static final String NODE_URL = "url";

    private static final String NODE_REDIRECT = "redirect";





    @Override
@@ -119,7 +120,13 @@ public class ExternalLinksOperation extends RemoteOperation { 
                            String name = link.getString(NODE_NAME);

                            String url = link.getString(NODE_URL);



                            resultLinks.add(new ExternalLink(id, iconUrl, language, type, name, url));

                            boolean redirect = false;



                            if (link.has(NODE_REDIRECT)) {

                                redirect = link.getInt(NODE_REDIRECT) == 1;

                            }



                            resultLinks.add(new ExternalLink(id, iconUrl, language, type, name, url, redirect));

                        }

                    }