android: Show remediation instructions instead of log on failure

diff --git a/src/frontends/android/res/values-de/strings.xml b/src/frontends/android/res/values-de/strings.xml
index 6414f11c00527bdf5e991ef672f14e82dbf096e8..7682b3bc7b01f05f66cdc4f68ec725f2f78380f2 100644 (file)
--- a/src/frontends/android/res/values-de/strings.xml
+++ b/src/frontends/android/res/values-de/strings.xml
@@ -90,6 +90,7 @@
     <string name="imc_state_label">Assessment:</string>
     <string name="imc_state_isolate">Eingeschränkt</string>
     <string name="imc_state_block">Fehlgeschlagen</string>
+    <string name="show_remediation_instructions">Korrekturanweisungen anzeigen</string>
 
     <!-- Remediation instructions -->
     <string name="remediation_instructions_title">Korrekturanweisungen</string>

diff --git a/src/frontends/android/res/values-pl/strings.xml b/src/frontends/android/res/values-pl/strings.xml
index 722bc10d3c0cca4c8d7d22c7f3e6e4e29d1f63ab..18f886f3f714a5b68728a003e65ca2b1a364c536 100644 (file)
--- a/src/frontends/android/res/values-pl/strings.xml
+++ b/src/frontends/android/res/values-pl/strings.xml
@@ -90,6 +90,7 @@
     <string name="imc_state_label">Assessment:</string>
     <string name="imc_state_isolate">Restricted</string>
     <string name="imc_state_block">Failed</string>
+    <string name="show_remediation_instructions">View remediation instructions</string>
 
     <!-- Remediation instructions -->
     <string name="remediation_instructions_title">Remediation instructions</string>

diff --git a/src/frontends/android/res/values-ru/strings.xml b/src/frontends/android/res/values-ru/strings.xml
index c82350bdf8f497e2ec06f1ff1becadbfe4a14c1f..fdb72b549119cfabfe53996073045ee1081e9b73 100644 (file)
--- a/src/frontends/android/res/values-ru/strings.xml
+++ b/src/frontends/android/res/values-ru/strings.xml
@@ -87,6 +87,7 @@
     <string name="imc_state_label">Assessment:</string>
     <string name="imc_state_isolate">Restricted</string>
     <string name="imc_state_block">Failed</string>
+    <string name="show_remediation_instructions">View remediation instructions</string>
 
     <!-- Remediation instructions -->
     <string name="remediation_instructions_title">Remediation instructions</string>

diff --git a/src/frontends/android/res/values-ua/strings.xml b/src/frontends/android/res/values-ua/strings.xml
index 3d82008c7231da9b9642c45ed42f30ab805ef30b..7c9e124e323d1a73e427bd05904ca0d7f8e7ffe5 100644 (file)
--- a/src/frontends/android/res/values-ua/strings.xml
+++ b/src/frontends/android/res/values-ua/strings.xml
@@ -88,6 +88,7 @@
     <string name="imc_state_label">Assessment:</string>
     <string name="imc_state_isolate">Restricted</string>
     <string name="imc_state_block">Failed</string>
+    <string name="show_remediation_instructions">View remediation instructions</string>
 
     <!-- Remediation instructions -->
     <string name="remediation_instructions_title">Remediation instructions</string>

diff --git a/src/frontends/android/res/values/strings.xml b/src/frontends/android/res/values/strings.xml
index b275cd5e7ade2d8bf3f1b81ede60fbd1d2d52d2b..94d246416d9de1eb9f8062530665450675bad3b1 100644 (file)
--- a/src/frontends/android/res/values/strings.xml
+++ b/src/frontends/android/res/values/strings.xml
@@ -90,6 +90,7 @@
     <string name="imc_state_label">Assessment:</string>
     <string name="imc_state_isolate">Restricted</string>
     <string name="imc_state_block">Failed</string>
+    <string name="show_remediation_instructions">View remediation instructions</string>
 
     <!-- Remediation instructions -->
     <string name="remediation_instructions_title">Remediation instructions</string>

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 d745d8344aca509014e19a00eac9fa405f0f148d..3219bba7aad1efee0c4a0dcb2178bacff3a970c9 100644 (file)
--- a/src/frontends/android/src/org/strongswan/android/ui/VpnStateFragment.java
+++ b/src/frontends/android/src/org/strongswan/android/ui/VpnStateFragment.java
@@ -17,6 +17,9 @@
 
 package org.strongswan.android.ui;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.strongswan.android.R;
 import org.strongswan.android.data.VpnProfile;
 import org.strongswan.android.logic.VpnStateService;
@@ -24,6 +27,7 @@ import org.strongswan.android.logic.VpnStateService.ErrorState;
 import org.strongswan.android.logic.VpnStateService.State;
 import org.strongswan.android.logic.VpnStateService.VpnStateListener;
 import org.strongswan.android.logic.imc.ImcState;
+import org.strongswan.android.logic.imc.RemediationInstruction;
 
 import android.app.AlertDialog;
 import android.app.Fragment;
@@ -362,17 +366,31 @@ public class VpnStateFragment extends Fragment implements VpnStateListener
 
        private void showErrorDialog(int textid)
        {
+               final List<RemediationInstruction> instructions = mService.getRemediationInstructions();
+               final boolean show_instructions = mImcState == ImcState.BLOCK && !instructions.isEmpty();
+               int text = show_instructions ? R.string.show_remediation_instructions : R.string.show_log;
+
                mErrorDialog = new AlertDialog.Builder(getActivity())
                        .setMessage(getString(R.string.error_introduction) + " " + getString(textid))
                        .setCancelable(false)
-                       .setNeutralButton(R.string.show_log, new DialogInterface.OnClickListener() {
+                       .setNeutralButton(text, new DialogInterface.OnClickListener() {
                                @Override
                                public void onClick(DialogInterface dialog, int which)
                                {
                                        clearError();
                                        dialog.dismiss();
-                                       Intent logIntent = new Intent(getActivity(), LogActivity.class);
-                                       startActivity(logIntent);
+                                       Intent intent;
+                                       if (show_instructions)
+                                       {
+                                               intent = new Intent(getActivity(), RemediationInstructionsActivity.class);
+                                               intent.putParcelableArrayListExtra(RemediationInstructionsFragment.EXTRA_REMEDIATION_INSTRUCTIONS,
+                                                                                                                  new ArrayList<RemediationInstruction>(instructions));
+                                       }
+                                       else
+                                       {
+                                               intent = new Intent(getActivity(), LogActivity.class);
+                                       }
+                                       startActivity(intent);
                                }
                        })
                        .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {