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

Unverified Commit 3ce54743 authored by Tobias Kaminsky's avatar Tobias Kaminsky Committed by GitHub
Browse files

Merge pull request #614 from nextcloud/arrayListInsteadOfList

Use ArrayList instead of List, as some lists are not sortable
parents e55b1479 1883c122
Loading
Loading
Loading
Loading
+7 −6
Original line number Diff line number Diff line
@@ -3,12 +3,13 @@ package com.nextcloud.common;
import java.net.Inet4Address;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;

import okhttp3.Dns;

/**
@@ -16,17 +17,17 @@ import okhttp3.Dns;
 */
public class IPV6PreferringDNS implements Dns {

        private Map<String, List<InetAddress>> cache = new HashMap<>();
    private Map<String, ArrayList<InetAddress>> cache = new HashMap<>();

        @Override
        public List<InetAddress> lookup(String hostname) throws UnknownHostException {
            List<InetAddress> addresses = cache.get(hostname.toLowerCase(Locale.ROOT));
            ArrayList<InetAddress> addresses = cache.get(hostname.toLowerCase(Locale.ROOT));

            if (addresses != null) {
                return addresses;
            }

            addresses = Dns.SYSTEM.lookup(hostname);
            addresses = new ArrayList<>(Dns.SYSTEM.lookup(hostname));
            Collections.sort(addresses, (address1, address2) -> {
                if (address1 instanceof Inet4Address) {
                    return 1;