summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2015-04-22 12:29:04 +0200
committerParménides GV <parmegv@sdf.org>2015-04-22 12:29:04 +0200
commit7d6d55cb62fcdc1e3a36f2634f0399b2d77db263 (patch)
tree8728c5416b29ca4b66438eb64d06f974f0117e37 /app
parente2b289726f3c1813f9fafecc94bc61a70dbdb899 (diff)
Initialize ca fingerprint, avoiding nullpointer
Danger on defaults to true in debug build
Diffstat (limited to 'app')
-rw-r--r--app/src/debug/java/se/leap/bitmaskclient/ConfigurationWizard.java2
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/Provider.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/src/debug/java/se/leap/bitmaskclient/ConfigurationWizard.java b/app/src/debug/java/se/leap/bitmaskclient/ConfigurationWizard.java
index 8910891a..aac53a07 100644
--- a/app/src/debug/java/se/leap/bitmaskclient/ConfigurationWizard.java
+++ b/app/src/debug/java/se/leap/bitmaskclient/ConfigurationWizard.java
@@ -236,7 +236,7 @@ public class ConfigurationWizard extends Activity
}
private void onItemSelectedLogic() {
- boolean danger_on = preferences.getBoolean(ProviderItem.DANGER_ON, false);
+ boolean danger_on = preferences.getBoolean(ProviderItem.DANGER_ON, true);
setUpProvider(danger_on);
}
diff --git a/app/src/main/java/se/leap/bitmaskclient/Provider.java b/app/src/main/java/se/leap/bitmaskclient/Provider.java
index 54bfcc19..a030927d 100644
--- a/app/src/main/java/se/leap/bitmaskclient/Provider.java
+++ b/app/src/main/java/se/leap/bitmaskclient/Provider.java
@@ -32,7 +32,7 @@ public final class Provider implements Parcelable {
private JSONObject definition; // Represents our Provider's provider.json
private URL main_url;
- private String certificate_pin;
+ private String certificate_pin = "";
final public static String
API_URL = "api_uri",