From 1fcaa71291e896a653826fefd8e0d73a9d4ed41d Mon Sep 17 00:00:00 2001
From: Tobias Brunner <tobias@strongswan.org>
Date: Sat, 11 Aug 2012 16:16:45 +0200
Subject: [PATCH] Added a button to the error dialog that allows to view the
 log file

---
 .../strongswan/android/ui/VpnStateFragment.java    | 23 ++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/frontends/android/src/org/strongswan/android/ui/VpnStateFragment.java b/src/frontends/android/src/org/strongswan/android/ui/VpnStateFragment.java
index b86fd18..738ed11 100644
--- a/src/frontends/android/src/org/strongswan/android/ui/VpnStateFragment.java
+++ b/src/frontends/android/src/org/strongswan/android/ui/VpnStateFragment.java
@@ -341,16 +341,31 @@ public class VpnStateFragment extends Fragment implements VpnStateListener
 		mErrorDialog = new AlertDialog.Builder(getActivity())
 			.setMessage(getString(R.string.error_introduction) + " " + getString(textid))
 			.setCancelable(false)
+			.setNeutralButton(R.string.show_log, new DialogInterface.OnClickListener() {
+				@Override
+				public void onClick(DialogInterface dialog, int which)
+				{
+					dialog.dismiss();
+					Intent logIntent = new Intent(getActivity(), LogActivity.class);
+					startActivity(logIntent);
+				}
+			})
 			.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
 				@Override
 				public void onClick(DialogInterface dialog, int id)
-				{	/* clear the error */
-					mError = ErrorState.NO_ERROR;
-					mErrorDialog = null;
-					updateView();
+				{
 					dialog.dismiss();
 				}
 			}).create();
+		mErrorDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
+			@Override
+			public void onDismiss(DialogInterface dialog)
+			{	/* clear the error */
+				mError = ErrorState.NO_ERROR;
+				mErrorDialog = null;
+				updateView();
+			}
+		});
 		mErrorDialog.show();
 	}
 }
-- 
2.7.4