From: Tobias Brunner <tobias@strongswan.org>
Date: Fri, 30 May 2014 15:34:49 +0000 (+0200)
Subject: android: Set action when using TrustedCertificatesActivity to select a certificate
X-Git-Tag: 5.2.1dr1~117^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c841b1f34eb589876ff9db0cbc5787895f56aef;p=thirdparty%2Fstrongswan.git

android: Set action when using TrustedCertificatesActivity to select a certificate
---

diff --git a/src/frontends/android/src/org/strongswan/android/ui/TrustedCertificatesActivity.java b/src/frontends/android/src/org/strongswan/android/ui/TrustedCertificatesActivity.java
index 3ee3781964..eab290f834 100644
--- a/src/frontends/android/src/org/strongswan/android/ui/TrustedCertificatesActivity.java
+++ b/src/frontends/android/src/org/strongswan/android/ui/TrustedCertificatesActivity.java
@@ -31,6 +31,8 @@ import android.view.MenuItem;
 
 public class TrustedCertificatesActivity extends Activity implements TrustedCertificateListFragment.OnTrustedCertificateSelectedListener
 {
+	public static final String SELECT_CERTIFICATE = "org.strongswan.android.action.SELECT_CERTIFICATE";
+
 	@Override
 	public void onCreate(Bundle savedInstanceState)
 	{
diff --git a/src/frontends/android/src/org/strongswan/android/ui/VpnProfileDetailActivity.java b/src/frontends/android/src/org/strongswan/android/ui/VpnProfileDetailActivity.java
index 6cc6b0c020..74158cd81a 100644
--- a/src/frontends/android/src/org/strongswan/android/ui/VpnProfileDetailActivity.java
+++ b/src/frontends/android/src/org/strongswan/android/ui/VpnProfileDetailActivity.java
@@ -147,6 +147,7 @@ public class VpnProfileDetailActivity extends Activity
 			public void onClick(View v)
 			{
 				Intent intent = new Intent(VpnProfileDetailActivity.this, TrustedCertificatesActivity.class);
+				intent.setAction(TrustedCertificatesActivity.SELECT_CERTIFICATE);
 				startActivityForResult(intent, SELECT_TRUSTED_CERTIFICATE);
 			}
 		});