diff options
| -rw-r--r-- | .classpath | 2 | ||||
| -rw-r--r-- | libs/bcprov-ext-jdk15on-146.jar | bin | 0 -> 1825975 bytes | |||
| -rw-r--r-- | libs/bcprov-ext-jdk15on-147.jar | bin | 2070477 -> 0 bytes | |||
| -rw-r--r-- | project.properties | 2 | ||||
| -rw-r--r-- | res/raw/leapkeystore.bks | bin | 2871 -> 1437 bytes | |||
| -rw-r--r-- | res/raw/leapkeystore_bc147.bks | bin | 0 -> 2871 bytes | |||
| -rw-r--r-- | src/se/leap/leapclient/ConfigHelper.java | 2 | ||||
| -rw-r--r-- | src/se/leap/leapclient/NewProviderDialog.java | 2 |
8 files changed, 3 insertions, 5 deletions
@@ -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 Binary files differnew file mode 100644 index 00000000..7d8a22e4 --- /dev/null +++ b/libs/bcprov-ext-jdk15on-146.jar diff --git a/libs/bcprov-ext-jdk15on-147.jar b/libs/bcprov-ext-jdk15on-147.jar Binary files differdeleted file mode 100644 index 22a06b7f..00000000 --- a/libs/bcprov-ext-jdk15on-147.jar +++ /dev/null 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 Binary files differindex a6eaf30d..b972172c 100644 --- a/res/raw/leapkeystore.bks +++ b/res/raw/leapkeystore.bks diff --git a/res/raw/leapkeystore_bc147.bks b/res/raw/leapkeystore_bc147.bks Binary files differnew file mode 100644 index 00000000..a6eaf30d --- /dev/null +++ b/res/raw/leapkeystore_bc147.bks 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; |