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

Commit 982fe5fb authored by Elv1zz's avatar Elv1zz Committed by Tobias Kaminsky (Rebase PR Action)
Browse files

Codacy: Try to reduce NPath complexity of method 



The method 'matches(AKMAlias)' has an NPath complexity of 540, current threshold is 200. This is an attempt to reduce the method's complexity.

Signed-off-by: default avatarElv1zz <elv1zz.git@gmail.com>
parent 5198fb74

library/src/main/java/com/owncloud/android/lib/common/network/AdvancedX509KeyManager.java

+18 −12
Original line number Diff line number Diff line
@@ -877,18 +877,8 @@ public class AdvancedX509KeyManager implements X509KeyManager, Application.Activ 
         }

         if (hostname != null && filter.hostname != null && !filter.hostname.equals(hostname)) {

            // Resolve hostname fields to ip addresses

            InetAddress address = null;

            InetAddress filterAddress = null;

            try {

               address = InetAddress.getByName(hostname);

            } catch (UnknownHostException e) {

               Log_OC.w(TAG, "matches: error resolving " + hostname);

            }

            try {

               filterAddress = InetAddress.getByName(filter.hostname);

            } catch (UnknownHostException e) {

               Log_OC.w(TAG, "matches: error resolving " + filter.hostname);

            }

            InetAddress address = getInetAddressByName(hostname);

            InetAddress filterAddress = getInetAddressByName(filter.hostname);

            // If resolution succeeded, compare addresses, otherwise host names

            if ((address == null || !address.equals(filterAddress))) {

               Log_OC.d(TAG, "matches: alias " + this + " (address=" + address + ") does not match hostname " +
@@ -902,6 +892,22 @@ public class AdvancedX509KeyManager implements X509KeyManager, Application.Activ 
         }

         return true;

      }



      /**

       * Try to get the address of a host according to the given hostname.

       *

       * @param hostname The hostname to get the address for.

       * @return The InetAddress instance for the hostname or null if host is unkown.

       */

      private InetAddress getInetAddressByName(String hostname) {

         InetAddress address = null;

         try {

            address = InetAddress.getByName(hostname);

         } catch (UnknownHostException e) {

            Log_OC.w(TAG, "matches: error resolving " + hostname);

         }

         return address;

      }

   }



   private enum KeyType {