From c3d73145c746419d23ec1a337b62506c4ef70fcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Mon, 15 Apr 2013 17:52:19 +0200
Subject: Added one "else if" that I missed during merge.

Next step: understand why ca.cert from bitmask is not being downloaded
correctly.
---
 src/se/leap/leapclient/ConfigurationWizard.java | 3 +--
 src/se/leap/leapclient/LeapHttpClient.java      | 1 -
 src/se/leap/leapclient/ProviderAPI.java         | 2 ++
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/se/leap/leapclient/ConfigurationWizard.java b/src/se/leap/leapclient/ConfigurationWizard.java
index 5b93cbbe..a61acfaa 100644
--- a/src/se/leap/leapclient/ConfigurationWizard.java
+++ b/src/se/leap/leapclient/ConfigurationWizard.java
@@ -17,7 +17,6 @@ import android.app.Fragment;
 import android.app.FragmentManager;
 import android.app.FragmentTransaction;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.content.res.AssetManager;
 import android.os.Bundle;
 import android.os.Handler;
@@ -58,7 +57,7 @@ public class ConfigurationWizard extends Activity
         
         setContentView(R.layout.activity_configuration_wizard);
         
-        ConfigHelper.setSharedPreferences(getSharedPreferences(ConfigHelper.PREFERENCES_KEY,MODE_PRIVATE));
+        ConfigHelper.setSharedPreferences(getSharedPreferences(ConfigHelper.PREFERENCES_KEY, MODE_PRIVATE));
         
         loadPreseededProviders();
         
diff --git a/src/se/leap/leapclient/LeapHttpClient.java b/src/se/leap/leapclient/LeapHttpClient.java
index 51b76b2c..d1908c34 100644
--- a/src/se/leap/leapclient/LeapHttpClient.java
+++ b/src/se/leap/leapclient/LeapHttpClient.java
@@ -1,6 +1,5 @@
 package se.leap.leapclient;
 
-import java.io.InputStream;
 import java.security.KeyStore;
 
 import org.apache.http.conn.ClientConnectionManager;
diff --git a/src/se/leap/leapclient/ProviderAPI.java b/src/se/leap/leapclient/ProviderAPI.java
index 6b09eb9d..ec131aaa 100644
--- a/src/se/leap/leapclient/ProviderAPI.java
+++ b/src/se/leap/leapclient/ProviderAPI.java
@@ -48,6 +48,8 @@ public class ProviderAPI extends IntentService {
 				receiver.send(ConfigHelper.INCORRECTLY_DOWNLOADED_JSON_FILES, Bundle.EMPTY);
 			else
 				receiver.send(ConfigHelper.CORRECTLY_DOWNLOADED_JSON_FILES, Bundle.EMPTY);
+		}
+		else if ((task = task_for.getBundleExtra(ConfigHelper.downloadNewProviderDotJSON)) != null) {
 			if(downloadJsonFilesBundleExtra(task))
 				receiver.send(ConfigHelper.CORRECTLY_DOWNLOADED_JSON_FILES, Bundle.EMPTY);
 			else
-- 
cgit v1.2.3