android: Add a button to install user certificates
Newer Android versions don't provide this option anymore on the selection dialog.
This commit is contained in:
parent
b3cdbe6693
commit
2f1bf11dca
|
@ -43,6 +43,7 @@ import android.view.ViewGroup;
|
|||
import android.widget.AdapterView;
|
||||
import android.widget.AdapterView.OnItemSelectedListener;
|
||||
import android.widget.ArrayAdapter;
|
||||
import android.widget.Button;
|
||||
import android.widget.CheckBox;
|
||||
import android.widget.CompoundButton;
|
||||
import android.widget.CompoundButton.OnCheckedChangeListener;
|
||||
|
@ -145,6 +146,16 @@ public class VpnProfileDetailActivity extends AppCompatActivity
|
|||
private EditText mDnsServers;
|
||||
private TextInputLayoutHelper mDnsServersWrap;
|
||||
|
||||
private final ActivityResultLauncher<Intent> mInstallPKCS12 = registerForActivityResult(
|
||||
new ActivityResultContracts.StartActivityForResult(),
|
||||
result -> {
|
||||
if (result.getResultCode() == RESULT_OK)
|
||||
{
|
||||
mSelectUserCert.performClick();
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
private final ActivityResultLauncher<Intent> mSelectTrustedCertificate = registerForActivityResult(
|
||||
new ActivityResultContracts.StartActivityForResult(),
|
||||
result -> {
|
||||
|
@ -309,6 +320,10 @@ public class VpnProfileDetailActivity extends AppCompatActivity
|
|||
});
|
||||
|
||||
mSelectUserCert.setOnClickListener(new SelectUserCertOnClickListener());
|
||||
((Button)findViewById(R.id.install_user_certificate)).setOnClickListener(v -> {
|
||||
Intent intent = KeyChain.createInstallIntent();
|
||||
mInstallPKCS12.launch(intent);
|
||||
});
|
||||
mSelectUserIdAdapter = new CertificateIdentitiesAdapter(this);
|
||||
mLocalId.setAdapter(mSelectUserIdAdapter);
|
||||
|
||||
|
|
|
@ -123,6 +123,14 @@
|
|||
android:id="@+id/select_user_certificate"
|
||||
layout="@layout/two_line_button" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/install_user_certificate"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="4dp"
|
||||
android:layout_marginRight="4dp"
|
||||
android:text="@string/profile_user_certificate_install" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<TextView
|
||||
|
|
|
@ -75,6 +75,7 @@
|
|||
<string name="profile_user_certificate_label">Benutzer-Zertifikat</string>
|
||||
<string name="profile_user_select_certificate_label">Benutzer-Zertifikat auswählen</string>
|
||||
<string name="profile_user_select_certificate">Wählen Sie ein bestimmtes Benutzer-Zertifikat</string>
|
||||
<string name="profile_user_certificate_install">Benutzer-Zertifikat installieren</string>
|
||||
<string name="profile_ca_label">CA-Zertifikat</string>
|
||||
<string name="profile_ca_auto_label">Automatisch wählen</string>
|
||||
<string name="profile_ca_select_certificate_label">CA-Zertifikat auswählen</string>
|
||||
|
|
|
@ -75,6 +75,7 @@
|
|||
<string name="profile_user_certificate_label">Certyfikat użytkownika</string>
|
||||
<string name="profile_user_select_certificate_label">Wybierz certyfikat użytkownika</string>
|
||||
<string name="profile_user_select_certificate">>Wybierz określony certyfikat użytkownika</string>
|
||||
<string name="profile_user_certificate_install">Install user certificate</string>
|
||||
<string name="profile_ca_label">Certyfikat CA</string>
|
||||
<string name="profile_ca_auto_label">Wybierz automatycznie</string>
|
||||
<string name="profile_ca_select_certificate_label">Wybierz certyfikat CA</string>
|
||||
|
|
|
@ -72,6 +72,7 @@
|
|||
<string name="profile_user_certificate_label">Сертификат пользователя</string>
|
||||
<string name="profile_user_select_certificate_label">Выбрать сертификат пользователя</string>
|
||||
<string name="profile_user_select_certificate">Выбрать сертификат пользователя</string>
|
||||
<string name="profile_user_certificate_install">Install user certificate</string>
|
||||
<string name="profile_ca_label">Сертификат CA</string>
|
||||
<string name="profile_ca_auto_label">Выбрать автоматически</string>
|
||||
<string name="profile_ca_select_certificate_label">Выбрать сертификат CA</string>
|
||||
|
|
|
@ -73,6 +73,7 @@
|
|||
<string name="profile_user_certificate_label">Сертифікат користувача</string>
|
||||
<string name="profile_user_select_certificate_label">Виберіть сертифікат користувача</string>
|
||||
<string name="profile_user_select_certificate">Вибрати спеціальний сертифікат користувача</string>
|
||||
<string name="profile_user_certificate_install">Install user certificate</string>
|
||||
<string name="profile_ca_label">Сертифікат CA</string>
|
||||
<string name="profile_ca_auto_label">Вибрати автоматично</string>
|
||||
<string name="profile_ca_select_certificate_label">Вибрати сертифікат CA</string>
|
||||
|
|
|
@ -72,6 +72,7 @@
|
|||
<string name="profile_user_certificate_label">用户证书</string>
|
||||
<string name="profile_user_select_certificate_label">选择用户证书</string>
|
||||
<string name="profile_user_select_certificate">选择指定的用户证书</string>
|
||||
<string name="profile_user_certificate_install">Install user certificate</string>
|
||||
<string name="profile_ca_label">CA证书</string>
|
||||
<string name="profile_ca_auto_label">自动选择</string>
|
||||
<string name="profile_ca_select_certificate_label">选择CA证书</string>
|
||||
|
|
|
@ -72,6 +72,7 @@
|
|||
<string name="profile_user_certificate_label">用戶憑證</string>
|
||||
<string name="profile_user_select_certificate_label">選擇用戶憑證</string>
|
||||
<string name="profile_user_select_certificate">選擇指定的用戶憑證</string>
|
||||
<string name="profile_user_certificate_install">Install user certificate</string>
|
||||
<string name="profile_ca_label">CA憑證</string>
|
||||
<string name="profile_ca_auto_label">自動選擇</string>
|
||||
<string name="profile_ca_select_certificate_label">選擇CA憑證</string>
|
||||
|
|
|
@ -75,6 +75,7 @@
|
|||
<string name="profile_user_certificate_label">User certificate</string>
|
||||
<string name="profile_user_select_certificate_label">Select user certificate</string>
|
||||
<string name="profile_user_select_certificate">Select a specific user certificate</string>
|
||||
<string name="profile_user_certificate_install">Install user certificate</string>
|
||||
<string name="profile_ca_label">CA certificate</string>
|
||||
<string name="profile_ca_auto_label">Select automatically</string>
|
||||
<string name="profile_ca_select_certificate_label">Select CA certificate</string>
|
||||
|
|
Loading…
Reference in New Issue