From 6b3fb1c2d0810c645cdbc1ceccb82b7424654c58 Mon Sep 17 00:00:00 2001 From: emanuele-f Date: Fri, 25 Jun 2021 09:22:56 +0200 Subject: [PATCH] Fix root domain rule label --- .../remote_capture/fragments/ConnectionsFragment.java | 3 +-- .../emanuelef/remote_capture/model/ConnectionsMatcher.java | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/emanuelef/remote_capture/fragments/ConnectionsFragment.java b/app/src/main/java/com/emanuelef/remote_capture/fragments/ConnectionsFragment.java index a1fdb7a5..dec3e1bb 100644 --- a/app/src/main/java/com/emanuelef/remote_capture/fragments/ConnectionsFragment.java +++ b/app/src/main/java/com/emanuelef/remote_capture/fragments/ConnectionsFragment.java @@ -320,9 +320,8 @@ public class ConnectionsFragment extends Fragment implements ConnectionsListener String rootDomain = Utils.getRootDomain(conn.info); if(!rootDomain.equals(conn.info)) { - String val = "*" + rootDomain; item = menu.findItem(R.id.exclude_root_domain); - item.setTitle(ConnectionsMatcher.getLabel(ctx, ItemType.ROOT_DOMAIN, val)); + item.setTitle(ConnectionsMatcher.getLabel(ctx, ItemType.ROOT_DOMAIN, rootDomain)); item.setVisible(true); } } diff --git a/app/src/main/java/com/emanuelef/remote_capture/model/ConnectionsMatcher.java b/app/src/main/java/com/emanuelef/remote_capture/model/ConnectionsMatcher.java index 34c5718e..d7deb118 100644 --- a/app/src/main/java/com/emanuelef/remote_capture/model/ConnectionsMatcher.java +++ b/app/src/main/java/com/emanuelef/remote_capture/model/ConnectionsMatcher.java @@ -102,8 +102,8 @@ public class ConnectionsMatcher { switch(tp) { case APP: resid = R.string.app_val; break; case IP: resid = R.string.ip_address_val; break; - case HOST: - case ROOT_DOMAIN: resid = R.string.host_val; break; + case ROOT_DOMAIN: value = "*" + value; // fallthrough + case HOST: resid = R.string.host_val; break; case PROTOCOL: resid = R.string.protocol_val; break; default: return "";