android: Handle errors when fetching profile in more detail

src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileImportActivity.java

@@ -61,6 +61,7 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
+import java.net.UnknownHostException;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
@@ -69,6 +70,8 @@ import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 import java.util.UUID;
 
+import javax.net.ssl.SSLHandshakeException;
+
 public class VpnProfileImportActivity extends AppCompatActivity
 {
 	private static final String PKCS12_INSTALLED = "PKCS12_INSTALLED";
@@ -99,22 +102,22 @@ public class VpnProfileImportActivity extends AppCompatActivity
 	private ViewGroup mRemoteCertificate;
 	private RelativeLayout mRemoteCert;
 
-	private LoaderManager.LoaderCallbacks<String> mProfileLoaderCallbacks = new LoaderManager.LoaderCallbacks<String>()
+	private LoaderManager.LoaderCallbacks<ProfileLoadResult> mProfileLoaderCallbacks = new LoaderManager.LoaderCallbacks<ProfileLoadResult>()
 	{
 		@Override
-		public Loader<String> onCreateLoader(int id, Bundle args)
+		public Loader<ProfileLoadResult> onCreateLoader(int id, Bundle args)
 		{
 			return new ProfileLoader(VpnProfileImportActivity.this, getIntent().getData());
 		}
 
 		@Override
-		public void onLoadFinished(Loader<String> loader, String data)
+		public void onLoadFinished(Loader<ProfileLoadResult> loader, ProfileLoadResult data)
 		{
 			handleProfile(data);
 		}
 
 		@Override
-		public void onLoaderReset(Loader<String> loader)
+		public void onLoaderReset(Loader<ProfileLoadResult> loader)
 		{
 
 		}
@@ -279,16 +282,16 @@ public class VpnProfileImportActivity extends AppCompatActivity
 		}
 	}
 
-	public void handleProfile(String data)
+	public void handleProfile(ProfileLoadResult data)
 	{
 		mProgress.dismiss();
 
 		mProfile = null;
-		if (data != null)
+		if (data != null && data.ThrownException == null)
 		{
 			try
 			{
-				JSONObject obj = new JSONObject(data);
+				JSONObject obj = new JSONObject(data.Profile);
 				mProfile = parseProfile(obj);
 			}
 			catch (JSONException e)
@@ -302,7 +305,38 @@ public class VpnProfileImportActivity extends AppCompatActivity
 		}
 		if (mProfile == null)
 		{
-			Toast.makeText(this, R.string.profile_import_failed, Toast.LENGTH_LONG).show();
+			String error = null;
+			if (data.ThrownException != null)
+			{
+				try
+				{
+					throw data.ThrownException;
+				}
+				catch (FileNotFoundException e)
+				{
+					error = getString(R.string.profile_import_failed_not_found);
+				}
+				catch (UnknownHostException e)
+				{
+					error = getString(R.string.profile_import_failed_host);
+				}
+				catch (SSLHandshakeException e)
+				{
+					error = getString(R.string.profile_import_failed_tls);
+				}
+				catch (Exception e)
+				{
+					e.printStackTrace();
+				}
+			}
+			if (error != null)
+			{
+				Toast.makeText(this, getString(R.string.profile_import_failed_detail, error), Toast.LENGTH_LONG).show();
+			}
+			else
+			{
+				Toast.makeText(this, R.string.profile_import_failed, Toast.LENGTH_LONG).show();
+			}
 			finish();
 			return;
 		}
@@ -529,10 +563,10 @@ public class VpnProfileImportActivity extends AppCompatActivity
 	/**
 	 * Load the JSON-encoded VPN profile from the given URI
 	 */
-	private static class ProfileLoader extends AsyncTaskLoader<String>
+	private static class ProfileLoader extends AsyncTaskLoader<ProfileLoadResult>
 	{
 		private final Uri mUri;
-		private String mData;
+		private ProfileLoadResult mData;
 
 		public ProfileLoader(Context context, Uri uri)
 		{
@@ -541,8 +575,9 @@ public class VpnProfileImportActivity extends AppCompatActivity
 		}
 
 		@Override
-		public String loadInBackground()
+		public ProfileLoadResult loadInBackground()
 		{
+			ProfileLoadResult result = new ProfileLoadResult();
 			InputStream in = null;
 
 			if (ContentResolver.SCHEME_CONTENT.equals(mUri.getScheme()) ||
@@ -554,7 +589,7 @@ public class VpnProfileImportActivity extends AppCompatActivity
 				}
 				catch (FileNotFoundException e)
 				{
-					e.printStackTrace();
+					result.ThrownException = e;
 				}
 			}
 			else
@@ -566,14 +601,14 @@ public class VpnProfileImportActivity extends AppCompatActivity
 				}
 				catch (IOException e)
 				{
-					e.printStackTrace();
+					result.ThrownException = e;
 				}
 			}
 			if (in != null)
 			{
-				return streamToString(in);
+				result.Profile = streamToString(in);
 			}
-			return null;
+			return result;
 		}
 
 		@Override
@@ -590,7 +625,7 @@ public class VpnProfileImportActivity extends AppCompatActivity
 		}
 
 		@Override
-		public void deliverResult(String data)
+		public void deliverResult(ProfileLoadResult data)
 		{
 			if (isReset())
 			{
@@ -633,6 +668,12 @@ public class VpnProfileImportActivity extends AppCompatActivity
 		}
 	}
 
+	private static class ProfileLoadResult
+	{
+		public String Profile;
+		public Exception ThrownException;
+	}
+
 	/**
 	 * Ask the user to select an available certificate.
 	 */

src/frontends/android/app/src/main/res/values-de/strings.xml

@@ -84,6 +84,10 @@
     <string name="profile_split_tunnelingv6_title">Blockiere IPv6 Verkehr der nicht für das VPN bestimmt ist</string>
     <string name="profile_import">VPN Profile importieren</string>
     <string name="profile_import_failed">VPN Profil-Import fehlgeschlagen</string>
+    <string name="profile_import_failed_detail">VPN Profil-Import fehlgeschlagen: %1$s</string>
+    <string name="profile_import_failed_not_found">Datei nicht gefunden</string>
+    <string name="profile_import_failed_host">Host unbekannt</string>
+    <string name="profile_import_failed_tls">TLS-Handshake fehlgeschlagen</string>
     <string name="profile_import_exists">Dieses VPN Profil existiert bereits, die bestehenden Einstellungen werden ersetzt.</string>
     <string name="profile_cert_import">Zertifikat aus VPN Profil importieren</string>
     <string name="profile_cert_alias">Zertifikat für \"%1$s\"</string>

src/frontends/android/app/src/main/res/values-pl/strings.xml

@@ -84,6 +84,10 @@
     <string name="profile_split_tunnelingv6_title">Block IPv6 traffic not destined for the VPN</string>
     <string name="profile_import">Import VPN profile</string>
     <string name="profile_import_failed">Failed to import VPN profile</string>
+    <string name="profile_import_failed_detail">Failed to import VPN profile: %1$s</string>
+    <string name="profile_import_failed_not_found">File not found</string>
+    <string name="profile_import_failed_host">Host unknown</string>
+    <string name="profile_import_failed_tls">TLS handshake failed</string>
     <string name="profile_import_exists">This VPN profile already exists, its current settings will be replaced.</string>
     <string name="profile_cert_import">Import certificate from VPN profile</string>
     <string name="profile_cert_alias">Certificate for \"%1$s\"</string>

src/frontends/android/app/src/main/res/values-ru/strings.xml

@@ -81,6 +81,10 @@
     <string name="profile_split_tunnelingv6_title">Block IPv6 traffic not destined for the VPN</string>
     <string name="profile_import">Import VPN profile</string>
     <string name="profile_import_failed">Failed to import VPN profile</string>
+    <string name="profile_import_failed_detail">Failed to import VPN profile: %1$s</string>
+    <string name="profile_import_failed_not_found">File not found</string>
+    <string name="profile_import_failed_host">Host unknown</string>
+    <string name="profile_import_failed_tls">TLS handshake failed</string>
     <string name="profile_import_exists">This VPN profile already exists, its current settings will be replaced.</string>
     <string name="profile_cert_import">Import certificate from VPN profile</string>
     <string name="profile_cert_alias">Certificate for \"%1$s\"</string>

src/frontends/android/app/src/main/res/values-ua/strings.xml

@@ -82,6 +82,10 @@
     <string name="profile_split_tunnelingv6_title">Block IPv6 traffic not destined for the VPN</string>
     <string name="profile_import">Import VPN profile</string>
     <string name="profile_import_failed">Failed to import VPN profile</string>
+    <string name="profile_import_failed_detail">Failed to import VPN profile: %1$s</string>
+    <string name="profile_import_failed_not_found">File not found</string>
+    <string name="profile_import_failed_host">Host unknown</string>
+    <string name="profile_import_failed_tls">TLS handshake failed</string>
     <string name="profile_import_exists">This VPN profile already exists, its current settings will be replaced.</string>
     <string name="profile_cert_import">Import certificate from VPN profile</string>
     <string name="profile_cert_alias">Certificate for \"%1$s\"</string>

src/frontends/android/app/src/main/res/values/strings.xml

@@ -84,6 +84,10 @@
     <string name="profile_split_tunnelingv6_title">Block IPv6 traffic not destined for the VPN</string>
     <string name="profile_import">Import VPN profile</string>
     <string name="profile_import_failed">Failed to import VPN profile</string>
+    <string name="profile_import_failed_detail">Failed to import VPN profile: %1$s</string>
+    <string name="profile_import_failed_not_found">File not found</string>
+    <string name="profile_import_failed_host">Host unknown</string>
+    <string name="profile_import_failed_tls">TLS handshake failed</string>
     <string name="profile_import_exists">This VPN profile already exists, its current settings will be replaced.</string>
     <string name="profile_cert_import">Import certificate from VPN profile</string>
     <string name="profile_cert_alias">Certificate for \"%1$s\"</string>