From 5f66e5765f52aab1907939018e40578e939dbc5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Wed, 20 Mar 2013 17:35:39 +0100
Subject: Ready to use with Android JellyBean (api 16)

---
 .classpath                                    |   2 +-
 libs/bcprov-ext-jdk15on-146.jar               | Bin 0 -> 1825975 bytes
 libs/bcprov-ext-jdk15on-147.jar               | Bin 2070477 -> 0 bytes
 project.properties                            |   2 +-
 res/raw/leapkeystore.bks                      | Bin 2871 -> 1437 bytes
 res/raw/leapkeystore_bc147.bks                | Bin 0 -> 2871 bytes
 src/se/leap/leapclient/ConfigHelper.java      |   2 +-
 src/se/leap/leapclient/NewProviderDialog.java |   2 --
 8 files changed, 3 insertions(+), 5 deletions(-)
 create mode 100644 libs/bcprov-ext-jdk15on-146.jar
 delete mode 100644 libs/bcprov-ext-jdk15on-147.jar
 create mode 100644 res/raw/leapkeystore_bc147.bks

diff --git a/.classpath b/.classpath
index 177f415d..e449cbf9 100644
--- a/.classpath
+++ b/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry kind="src" path="gen"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/libs/bcprov-ext-jdk15on-146.jar b/libs/bcprov-ext-jdk15on-146.jar
new file mode 100644
index 00000000..7d8a22e4
Binary files /dev/null and b/libs/bcprov-ext-jdk15on-146.jar differ
diff --git a/libs/bcprov-ext-jdk15on-147.jar b/libs/bcprov-ext-jdk15on-147.jar
deleted file mode 100644
index 22a06b7f..00000000
Binary files a/libs/bcprov-ext-jdk15on-147.jar and /dev/null differ
diff --git a/project.properties b/project.properties
index c4f09d2b..895c9ce2 100644
--- a/project.properties
+++ b/project.properties
@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-17
+target=android-16
diff --git a/res/raw/leapkeystore.bks b/res/raw/leapkeystore.bks
index a6eaf30d..b972172c 100644
Binary files a/res/raw/leapkeystore.bks and b/res/raw/leapkeystore.bks differ
diff --git a/res/raw/leapkeystore_bc147.bks b/res/raw/leapkeystore_bc147.bks
new file mode 100644
index 00000000..a6eaf30d
Binary files /dev/null and b/res/raw/leapkeystore_bc147.bks differ
diff --git a/src/se/leap/leapclient/ConfigHelper.java b/src/se/leap/leapclient/ConfigHelper.java
index 35aec885..c2f6c413 100644
--- a/src/se/leap/leapclient/ConfigHelper.java
+++ b/src/se/leap/leapclient/ConfigHelper.java
@@ -122,7 +122,7 @@ public class ConfigHelper {
 			cf = CertificateFactory.getInstance("X.509");
 			X509Certificate cert =
 					(X509Certificate)cf.generateCertificate(openFileInputStream(filename_to_save));
-			keystore_trusted.setCertificateEntry("provider", cert);
+			keystore_trusted.setCertificateEntry(provider, cert);
 		} catch (CertificateException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
diff --git a/src/se/leap/leapclient/NewProviderDialog.java b/src/se/leap/leapclient/NewProviderDialog.java
index 09e7453a..52453485 100644
--- a/src/se/leap/leapclient/NewProviderDialog.java
+++ b/src/se/leap/leapclient/NewProviderDialog.java
@@ -8,8 +8,6 @@ import android.content.DialogInterface;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
-import android.webkit.WebView.FindListener;
 import android.widget.EditText;
 import android.widget.Toast;
 
-- 
cgit v1.2.3