summaryrefslogtreecommitdiff
path: root/src/se/leap/leapclient/ConfigHelper.java
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2013-03-05 21:13:27 +0100
committerParménides GV <parmegv@sdf.org>2013-03-05 21:13:27 +0100
commit5b9e20dca5f70289a2fcdfaa9f45fabd28887726 (patch)
tree120f68ce96a085bb39c568c96847b82996277898 /src/se/leap/leapclient/ConfigHelper.java
parent018eb179f820b09d2e65c5ede1d4a867957bbce4 (diff)
Registering method from ProviderAPI implemented and tested.
M1 is not OK, because errors (with null description, awkward) are received from posting M1 to the server instead of M2. Next step: purge user database from leap_webapp and start testing again.
Diffstat (limited to 'src/se/leap/leapclient/ConfigHelper.java')
-rw-r--r--src/se/leap/leapclient/ConfigHelper.java24
1 files changed, 18 insertions, 6 deletions
diff --git a/src/se/leap/leapclient/ConfigHelper.java b/src/se/leap/leapclient/ConfigHelper.java
index c9810519..41364e96 100644
--- a/src/se/leap/leapclient/ConfigHelper.java
+++ b/src/se/leap/leapclient/ConfigHelper.java
@@ -7,7 +7,6 @@ import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileWriter;
import java.io.IOException;
-import java.io.InputStream;
import java.math.BigInteger;
import org.json.JSONException;
@@ -18,10 +17,14 @@ import android.os.Environment;
import android.util.Log;
public class ConfigHelper {
+
+ public static SharedPreferences shared_preferences;
final static String downloadJsonFilesBundleExtra = "downloadJSONFiles";
final static String downloadNewProviderDotJSON = "downloadNewProviderDotJSON";
- final static String srpAuth = "srpAuth";
+ public static final String srpRegister = "srpRegister";
+ final public static String srpAuth = "srpAuth";
+ final public static String resultKey = "result";
final static String provider_key = "provider";
final static String cert_key = "cert";
final static String eip_service_key = "eip";
@@ -38,12 +41,16 @@ public class ConfigHelper {
final public static BigInteger g = BigInteger.valueOf(2);
final public static int CUSTOM_PROVIDER_ADDED = 0;
- final public static int CORRECTLY_DOWNLOADED_JSON_FILES = 0;
- final public static int INCORRECTLY_DOWNLOADED_JSON_FILES = 0;
+ final public static int CORRECTLY_DOWNLOADED_JSON_FILES = 1;
+ final public static int INCORRECTLY_DOWNLOADED_JSON_FILES = 2;
+ final public static int SRP_AUTHENTICATION_SUCCESSFUL = 3;
+ final public static int SRP_AUTHENTICATION_FAILED = 4;
+ public static final int SRP_REGISTRATION_SUCCESSFUL = 5;
+ public static final int SRP_REGISTRATION_FAILED = 6;
static void saveSharedPref(String shared_preferences_key, JSONObject content) {
- SharedPreferences.Editor shared_preferences_editor = ConfigurationWizard.shared_preferences
+ SharedPreferences.Editor shared_preferences_editor = shared_preferences
.edit();
shared_preferences_editor.putString(shared_preferences_key,
content.toString());
@@ -51,7 +58,7 @@ public class ConfigHelper {
System.out.println("Shared preferences updated: key = "
+ shared_preferences_key
+ " Content = "
- + ConfigurationWizard.shared_preferences.getString(
+ + shared_preferences.getString(
shared_preferences_key, "Default"));
}
@@ -92,4 +99,9 @@ public class ConfigHelper {
}
return input_stream;
}
+
+ public static void setSharedPreferences(
+ SharedPreferences shared_preferences) {
+ ConfigHelper.shared_preferences = shared_preferences;
+ }
}