summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2013-03-20 17:35:39 +0100
committerParménides GV <parmegv@sdf.org>2013-03-20 17:35:39 +0100
commit5f66e5765f52aab1907939018e40578e939dbc5f (patch)
tree32dfbebd42218de628cc89579df5e9296488f151 /src
parentb48c3f63bfbdb0c01950cbd47c41a560afaf4fe2 (diff)
Ready to use with Android JellyBean (api 16)
Diffstat (limited to 'src')
-rw-r--r--src/se/leap/leapclient/ConfigHelper.java2
-rw-r--r--src/se/leap/leapclient/NewProviderDialog.java2
2 files changed, 1 insertions, 3 deletions
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;