From fa8bd286158b710e640227a7ae69ab35e018753f Mon Sep 17 00:00:00 2001
From: emanuele-f <black.silver@hotmail.it>
Date: Wed, 20 Jul 2022 15:31:49 +0200
Subject: [PATCH] Small code changes

---
 .../activities/SettingsActivity.java          | 20 ++++++++++---------
 app/src/main/res/layout/settings_activity.xml |  7 +------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/com/emanuelef/remote_capture/activities/SettingsActivity.java b/app/src/main/java/com/emanuelef/remote_capture/activities/SettingsActivity.java
index 3a397d90..373e1e32 100644
--- a/app/src/main/java/com/emanuelef/remote_capture/activities/SettingsActivity.java
+++ b/app/src/main/java/com/emanuelef/remote_capture/activities/SettingsActivity.java
@@ -193,18 +193,20 @@ public class SettingsActivity extends BaseActivity implements PreferenceFragment
             }
         }
 
+        private boolean validateIp(String value) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)
+                return (InetAddresses.isNumericAddress(value));
+            else {
+                Matcher matcher = Patterns.IP_ADDRESS.matcher(value);
+                return(matcher.matches());
+            }
+        }
+
         @SuppressWarnings("deprecation")
         private void setupUdpExporterPrefs() {
             /* Collector IP validation */
             EditTextPreference mRemoteCollectorIp = requirePreference(Prefs.PREF_COLLECTOR_IP_KEY);
-            mRemoteCollectorIp.setOnPreferenceChangeListener((preference, newValue) -> {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)
-                    return (InetAddresses.isNumericAddress(newValue.toString()));
-                else {
-                    Matcher matcher = Patterns.IP_ADDRESS.matcher(newValue.toString());
-                    return(matcher.matches());
-                }
-            });
+            mRemoteCollectorIp.setOnPreferenceChangeListener((preference, newValue) -> validateIp(newValue.toString()));
 
             /* Collector port validation */
             EditTextPreference mRemoteCollectorPort = requirePreference(Prefs.PREF_COLLECTOR_PORT_KEY);
@@ -404,4 +406,4 @@ public class SettingsActivity extends BaseActivity implements PreferenceFragment
             mVpnExceptions.setVisible(!enabled);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/res/layout/settings_activity.xml b/app/src/main/res/layout/settings_activity.xml
index 2a984496..037145d9 100644
--- a/app/src/main/res/layout/settings_activity.xml
+++ b/app/src/main/res/layout/settings_activity.xml
@@ -8,9 +8,4 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1" />
-
-    <FrameLayout
-        android:id="@+id/adContainer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>