android: Replace deprecated Switch with SwitchCompat

diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileDetailActivity.java b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileDetailActivity.java
index 65d97ba2168db7d28d781d0c96d6a803fb748753..89e999ef7204d21a0ca2af5bcc0f8a0b35ae42ea 100644 (file)
--- a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileDetailActivity.java
+++ b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileDetailActivity.java
@@ -50,7 +50,6 @@ import android.widget.EditText;
 import android.widget.MultiAutoCompleteTextView;
 import android.widget.RelativeLayout;
 import android.widget.Spinner;
-import android.widget.Switch;
 import android.widget.TextView;
 
 import org.strongswan.android.R;
@@ -81,6 +80,7 @@ import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.app.AppCompatDialogFragment;
+import androidx.appcompat.widget.SwitchCompat;
 import androidx.core.text.HtmlCompat;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
@@ -120,12 +120,12 @@ public class VpnProfileDetailActivity extends AppCompatActivity
        private TextInputLayoutHelper mMTUWrap;
        private EditText mPort;
        private TextInputLayoutHelper mPortWrap;
-       private Switch mCertReq;
-       private Switch mUseCrl;
-       private Switch mUseOcsp;
-       private Switch mStrictRevocation;
-       private Switch mRsaPss;
-       private Switch mIPv6Transport;
+       private SwitchCompat mCertReq;
+       private SwitchCompat mUseCrl;
+       private SwitchCompat mUseOcsp;
+       private SwitchCompat mStrictRevocation;
+       private SwitchCompat mRsaPss;
+       private SwitchCompat mIPv6Transport;
        private EditText mNATKeepalive;
        private TextInputLayoutHelper mNATKeepaliveWrap;
        private EditText mIncludedSubnets;
@@ -216,7 +216,7 @@ public class VpnProfileDetailActivity extends AppCompatActivity
                mPortWrap = (TextInputLayoutHelper) findViewById(R.id.port_wrap);
                mNATKeepalive = (EditText)findViewById(R.id.nat_keepalive);
                mNATKeepaliveWrap = (TextInputLayoutHelper) findViewById(R.id.nat_keepalive_wrap);
-               mCertReq = (Switch)findViewById(R.id.cert_req);
+               mCertReq = findViewById(R.id.cert_req);
                mUseCrl = findViewById(R.id.use_crl);
                mUseOcsp = findViewById(R.id.use_ocsp);
                mStrictRevocation= findViewById(R.id.strict_revocation);

diff --git a/src/frontends/android/app/src/main/res/layout/profile_detail_view.xml b/src/frontends/android/app/src/main/res/layout/profile_detail_view.xml
index d5935b42c876906f43500eec64c93ad313385c55..22847e001fb27239eb2869a8803c996b7dbb9f21 100644 (file)
--- a/src/frontends/android/app/src/main/res/layout/profile_detail_view.xml
+++ b/src/frontends/android/app/src/main/res/layout/profile_detail_view.xml
@@ -280,7 +280,7 @@
 
             </org.strongswan.android.ui.widget.TextInputLayoutHelper>
 
-            <Switch
+            <androidx.appcompat.widget.SwitchCompat
                 android:id="@+id/cert_req"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -297,7 +297,7 @@
                 android:textSize="12sp"
                 android:text="@string/profile_cert_req_hint" />
 
-            <Switch
+            <androidx.appcompat.widget.SwitchCompat
                 android:id="@+id/use_ocsp"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -314,7 +314,7 @@
                 android:textSize="12sp"
                 android:text="@string/profile_use_ocsp_hint" />
 
-            <Switch
+            <androidx.appcompat.widget.SwitchCompat
                 android:id="@+id/use_crl"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -331,7 +331,7 @@
                 android:textSize="12sp"
                 android:text="@string/profile_use_crl_hint" />
 
-            <Switch
+            <androidx.appcompat.widget.SwitchCompat
                 android:id="@+id/strict_revocation"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -348,7 +348,7 @@
                 android:textSize="12sp"
                 android:text="@string/profile_strict_revocation_hint" />
 
-            <Switch
+            <androidx.appcompat.widget.SwitchCompat
                 android:id="@+id/rsa_pss"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -365,7 +365,7 @@
                 android:textSize="12sp"
                 android:text="@string/profile_rsa_pss_hint" />
 
-            <Switch
+            <androidx.appcompat.widget.SwitchCompat
                 android:id="@+id/ipv6_transport"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"