ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

android: Replace deprecated Switch with SwitchCompat

This commit is contained in:
Tobias Brunner 2021-07-13 15:11:07 +02:00
parent 26354d0aba
commit b3cdbe6693
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileDetailActivity.java
View File

@ -50,7 +50,6 @@ import android.widget.EditText;
import android.widget.MultiAutoCompleteTextView; import android.widget.MultiAutoCompleteTextView;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import android.widget.Spinner; import android.widget.Spinner;
import android.widget.Switch;
import android.widget.TextView; import android.widget.TextView;
import org.strongswan.android.R; import org.strongswan.android.R;
@ -81,6 +80,7 @@ import androidx.activity.result.contract.ActivityResultContracts;
import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatDialogFragment; import androidx.appcompat.app.AppCompatDialogFragment;
import androidx.appcompat.widget.SwitchCompat;
import androidx.core.text.HtmlCompat; import androidx.core.text.HtmlCompat;
import androidx.localbroadcastmanager.content.LocalBroadcastManager; import androidx.localbroadcastmanager.content.LocalBroadcastManager;
@ -120,12 +120,12 @@ public class VpnProfileDetailActivity extends AppCompatActivity
private TextInputLayoutHelper mMTUWrap; private TextInputLayoutHelper mMTUWrap;
private EditText mPort; private EditText mPort;
private TextInputLayoutHelper mPortWrap; private TextInputLayoutHelper mPortWrap;
private Switch mCertReq; private SwitchCompat mCertReq;
private Switch mUseCrl; private SwitchCompat mUseCrl;
private Switch mUseOcsp; private SwitchCompat mUseOcsp;
private Switch mStrictRevocation; private SwitchCompat mStrictRevocation;
private Switch mRsaPss; private SwitchCompat mRsaPss;
private Switch mIPv6Transport; private SwitchCompat mIPv6Transport;
private EditText mNATKeepalive; private EditText mNATKeepalive;
private TextInputLayoutHelper mNATKeepaliveWrap; private TextInputLayoutHelper mNATKeepaliveWrap;
private EditText mIncludedSubnets; private EditText mIncludedSubnets;
@ -216,7 +216,7 @@ public class VpnProfileDetailActivity extends AppCompatActivity
mPortWrap = (TextInputLayoutHelper) findViewById(R.id.port_wrap); mPortWrap = (TextInputLayoutHelper) findViewById(R.id.port_wrap);
mNATKeepalive = (EditText)findViewById(R.id.nat_keepalive); mNATKeepalive = (EditText)findViewById(R.id.nat_keepalive);
mNATKeepaliveWrap = (TextInputLayoutHelper) findViewById(R.id.nat_keepalive_wrap); 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); mUseCrl = findViewById(R.id.use_crl);
mUseOcsp = findViewById(R.id.use_ocsp); mUseOcsp = findViewById(R.id.use_ocsp);
mStrictRevocation= findViewById(R.id.strict_revocation); mStrictRevocation= findViewById(R.id.strict_revocation);

12
src/frontends/android/app/src/main/res/layout/profile_detail_view.xml
View File

@ -280,7 +280,7 @@
</org.strongswan.android.ui.widget.TextInputLayoutHelper> </org.strongswan.android.ui.widget.TextInputLayoutHelper>
<Switch <androidx.appcompat.widget.SwitchCompat
android:id="@+id/cert_req" android:id="@+id/cert_req"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -297,7 +297,7 @@
android:textSize="12sp" android:textSize="12sp"
android:text="@string/profile_cert_req_hint" /> android:text="@string/profile_cert_req_hint" />
<Switch <androidx.appcompat.widget.SwitchCompat
android:id="@+id/use_ocsp" android:id="@+id/use_ocsp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -314,7 +314,7 @@
android:textSize="12sp" android:textSize="12sp"
android:text="@string/profile_use_ocsp_hint" /> android:text="@string/profile_use_ocsp_hint" />
<Switch <androidx.appcompat.widget.SwitchCompat
android:id="@+id/use_crl" android:id="@+id/use_crl"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -331,7 +331,7 @@
android:textSize="12sp" android:textSize="12sp"
android:text="@string/profile_use_crl_hint" /> android:text="@string/profile_use_crl_hint" />
<Switch <androidx.appcompat.widget.SwitchCompat
android:id="@+id/strict_revocation" android:id="@+id/strict_revocation"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -348,7 +348,7 @@
android:textSize="12sp" android:textSize="12sp"
android:text="@string/profile_strict_revocation_hint" /> android:text="@string/profile_strict_revocation_hint" />
<Switch <androidx.appcompat.widget.SwitchCompat
android:id="@+id/rsa_pss" android:id="@+id/rsa_pss"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -365,7 +365,7 @@
android:textSize="12sp" android:textSize="12sp"
android:text="@string/profile_rsa_pss_hint" /> android:text="@string/profile_rsa_pss_hint" />
<Switch <androidx.appcompat.widget.SwitchCompat
android:id="@+id/ipv6_transport" android:id="@+id/ipv6_transport"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"