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

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

Reduce NPath complexity of AKMAlias.matches 



This should reduce NPath complexity of `AKMAlias.matches` method without changing its behavior. This was verified using the previously added unit test that should cover all relevant cases.

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

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

+11 −12
Original line number Diff line number Diff line
@@ -755,15 +755,9 @@ public class AdvancedX509KeyManager 
       * Exception: both hostname fields are resolved to an ip address before comparing if possible.

       */

      public boolean matches(@NonNull AKMAlias filter) {

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

            Log_OC.d(TAG, "matches: alias " + this + " does not match type " + filter.type);

            return false;

         }

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

            Log_OC.d(TAG, "matches: alias " + this + " does not match original alias " + filter.alias);

            return false;

         }

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

         boolean matches = isNullOrEqual(filter.type, type, "matches: alias " + this + " does not match type " + filter.type);

         matches &= isNullOrEqual(filter.alias, alias, "matches: alias " + this + " does not match original alias " + filter.alias);

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

            // Resolve hostname fields to ip addresses

            InetAddress address = getInetAddressByName(hostname);

            InetAddress filterAddress = getInetAddressByName(filter.hostname);
@@ -771,11 +765,16 @@ public class AdvancedX509KeyManager 
            if ((address == null || !address.equals(filterAddress))) {

               Log_OC.d(TAG, "matches: alias " + this + " (address=" + address + ") does not match hostname " +

                       filter.hostname + " (address=" + filterAddress + ")");

               return false;

               matches = false;

            }

         }

         matches &= isNullOrEqual(filter.port, port, "matches: alias " + this + " does not match port " + filter.port);

         return matches;

      }

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

            Log_OC.d(TAG, "matches: alias " + this + " does not match port " + filter.port);



      private boolean isNullOrEqual(Object a, Object b, String message) {

         if (a != null && !a.equals(b)) {

            Log_OC.d(TAG, message);

            return false;

         }

         return true;