From b330f5915dd0f4cb7f8a205254fdd194fe5fa971 Mon Sep 17 00:00:00 2001 From: MZM <78117242+m4rc3lus@users.noreply.github.com> Date: Wed, 17 Nov 2021 23:32:56 +0100 Subject: [PATCH] fix some deprecations (#156) Co-authored-by: mazm --- .../activities/CaptureCtrl.java | 16 ++++++++++++++- .../activities/SettingsActivity.java | 20 +++++++++++++++---- .../adapters/ConnectionsAdapter.java | 8 +++++++- 3 files changed, 38 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/emanuelef/remote_capture/activities/CaptureCtrl.java b/app/src/main/java/com/emanuelef/remote_capture/activities/CaptureCtrl.java index aed8bfa9..7ba64ad5 100644 --- a/app/src/main/java/com/emanuelef/remote_capture/activities/CaptureCtrl.java +++ b/app/src/main/java/com/emanuelef/remote_capture/activities/CaptureCtrl.java @@ -20,12 +20,15 @@ package com.emanuelef.remote_capture.activities; import android.content.Intent; +import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.Looper; import android.util.Log; import android.view.View; import android.view.Window; +import android.view.WindowInsets; +import android.view.WindowInsetsController; import android.view.WindowManager; import android.widget.Button; import android.widget.ImageView; @@ -55,9 +58,20 @@ public class CaptureCtrl extends AppCompatActivity { private CtrlPermissions mPermissions; @Override + @SuppressWarnings("deprecation") protected void onCreate(@Nullable Bundle savedInstanceState) { requestWindowFeature(Window.FEATURE_NO_TITLE); - getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { + final WindowInsetsController insetsController = getWindow().getInsetsController(); + if (insetsController != null) { + insetsController.hide(WindowInsets.Type.statusBars()); + } + } else { + getWindow().setFlags( + WindowManager.LayoutParams.FLAG_FULLSCREEN, + WindowManager.LayoutParams.FLAG_FULLSCREEN + ); + } getWindow().addFlags(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN); super.onCreate(savedInstanceState); 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 32ed34c1..e2ceb96b 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 @@ -21,6 +21,8 @@ package com.emanuelef.remote_capture.activities; import android.content.Intent; import android.content.SharedPreferences; +import android.net.InetAddresses; +import android.os.Build; import android.os.Bundle; import android.text.InputType; import android.util.Patterns; @@ -117,12 +119,17 @@ public class SettingsActivity extends BaseActivity { } } + @SuppressWarnings("deprecation") private void setupUdpExporterPrefs() { /* Collector IP validation */ EditTextPreference mRemoteCollectorIp = findPreference(Prefs.PREF_COLLECTOR_IP_KEY); mRemoteCollectorIp.setOnPreferenceChangeListener((preference, newValue) -> { - Matcher matcher = Patterns.IP_ADDRESS.matcher(newValue.toString()); - return(matcher.matches()); + 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()); + } }); /* Collector port validation */ @@ -182,6 +189,7 @@ public class SettingsActivity extends BaseActivity { // Billing code here } + @SuppressWarnings("deprecation") private void setupSocks5ProxyPrefs() { mProxyPrefs = findPreference("proxy_prefs"); mTlsHelp = findPreference("tls_how_to"); @@ -195,8 +203,12 @@ public class SettingsActivity extends BaseActivity { /* TLS Proxy IP validation */ mSocks5ProxyIp = findPreference(Prefs.PREF_SOCKS5_PROXY_IP_KEY); mSocks5ProxyIp.setOnPreferenceChangeListener((preference, newValue) -> { - Matcher matcher = Patterns.IP_ADDRESS.matcher(newValue.toString()); - return(matcher.matches()); + 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()); + } }); /* TLS Proxy port validation */ diff --git a/app/src/main/java/com/emanuelef/remote_capture/adapters/ConnectionsAdapter.java b/app/src/main/java/com/emanuelef/remote_capture/adapters/ConnectionsAdapter.java index 06189f34..77afdaa6 100644 --- a/app/src/main/java/com/emanuelef/remote_capture/adapters/ConnectionsAdapter.java +++ b/app/src/main/java/com/emanuelef/remote_capture/adapters/ConnectionsAdapter.java @@ -21,6 +21,7 @@ package com.emanuelef.remote_capture.adapters; import android.content.Context; import android.graphics.drawable.Drawable; +import android.os.Build; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -100,6 +101,7 @@ public class ConnectionsAdapter extends RecyclerView.Adapter= Build.VERSION_CODES.M) + statusInd.setTextColor(context.getResources().getColor(color, null)); + else + statusInd.setTextColor(context.getResources().getColor(color)); if(conn.country.isEmpty()) countryCode.setText("");