diff options
| author | Parménides GV <parmegv@sdf.org> | 2013-06-29 13:01:07 +0200 | 
|---|---|---|
| committer | Sean Leonard <meanderingcode@aetherislands.net> | 2013-07-12 11:45:46 -0600 | 
| commit | 713078d3348017dd8c229ee52701c2c1b69bd85d (patch) | |
| tree | 5536d5f7c4ad257e9112e6a846d3c35bfd9a8ec7 /src | |
| parent | 755633af514c8f425f936bc5185815175397937c (diff) | |
Shows certificate error message.
If a download didn't occurr due to an IOException, we assume it was for
an SSL error and notify the user telling him/her that LEAP provider is
not trusted.
Diffstat (limited to 'src')
| -rw-r--r-- | src/se/leap/leapclient/ProviderAPI.java | 6 | 
1 files changed, 3 insertions, 3 deletions
| diff --git a/src/se/leap/leapclient/ProviderAPI.java b/src/se/leap/leapclient/ProviderAPI.java index b9cbdf2..1bc1149 100644 --- a/src/se/leap/leapclient/ProviderAPI.java +++ b/src/se/leap/leapclient/ProviderAPI.java @@ -371,7 +371,7 @@ public class ProviderAPI extends IntentService {  			if(provider_url != null && danger_on) {  				json_file_content = getStringFromProviderWithoutValidate(provider_url);  			} -			displayToast(R.string.malformed_url); +			displayToast(R.string.certificate_error);  		} catch (Exception e) {  			if(provider_url != null && danger_on) {  				json_file_content = getStringFromProviderWithoutValidate(provider_url); @@ -405,7 +405,7 @@ public class ProviderAPI extends IntentService {  			urlConnection.setHostnameVerifier(hostnameVerifier);  			json_string = new Scanner(urlConnection.getInputStream()).useDelimiter("\\A").next();  		} catch (MalformedURLException e) { -			Toast.makeText(getApplicationContext(), R.string.malformed_url, Toast.LENGTH_LONG).show(); +			displayToast(R.string.malformed_url);  		} catch (IOException e) {  			json_string = getStringFromProviderWithCACertAdded(string_url);  		} @@ -469,7 +469,7 @@ public class ProviderAPI extends IntentService {  		} catch (IOException e) {  			// The downloaded certificate doesn't validate our https connection.  			json_file_content = getStringFromProviderIgnoringCertificate(url); -			Toast.makeText(getApplicationContext(), R.string.malformed_url, Toast.LENGTH_LONG).show(); +			displayToast(R.string.certificate_error);  		} catch (KeyStoreException e) {  			// TODO Auto-generated catch block  			e.printStackTrace(); | 
