Merge branch 'develop'0.5.1

35 files changed, 2648 insertions, 117 deletions

diff --git a/app/build.gradle b/app/build.gradle
index d59533ea..4795488d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'android'
 
 android {
     compileSdkVersion 19
-    buildToolsVersion "19.0.1"
+    buildToolsVersion "19.0.3"
 
     defaultConfig {
         minSdkVersion 14
@@ -12,28 +12,41 @@ android {
         testInstrumentationRunner "android.test.InstrumentationTestRunner"
     }
 
+    signingConfigs {
+        release {
+		storeFile project.hasProperty('storeFileProperty') ? file(storeFileProperty) : null
+		storePassword project.hasProperty('storePasswordProperty') ?  storePasswordProperty : ""
+		keyAlias project.hasProperty('keyAliasProperty') ?  keyAliasProperty : ""
+		keyPassword project.hasProperty('keyPasswordProperty') ?  keyPasswordProperty : ""
+	}
+    }
+
     buildTypes {
         release {
-            runProguard false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+            //runProguard true
+	    signingConfig signingConfigs.release.isSigningReady() ? signingConfigs.release : signingConfigs.debug
         }
     }
 
     lintOptions {
-    		abortOnError false
+      abortOnError false
     }
-
+    
     sourceSets {
-    	main
-	{
+    	main {
 	  assets.srcDirs = ['assets', 'ovpnlibs/assets']
 	  jniLibs.srcDirs = ['ovpnlibs/jniLibs']
 	  jni.srcDirs = [] //disable automatic ndk-build
+        }
+	debug {
+ 	  assets.srcDirs = ['src/debug/assets']
 	}
     }
-}
+
+    check.dependsOn connectedCheck
+ }
 
 dependencies {
     androidTestCompile 'com.android.support:support-v4:+'
     androidTestCompile 'com.jayway.android.robotium:robotium-solo:4.3.1'
-}
+}
\ No newline at end of file
diff --git a/app/openvpn/.gitignore b/app/openvpn/.gitignore
index a04afff7..6a69be43 100644
--- a/app/openvpn/.gitignore
+++ b/app/openvpn/.gitignore
@@ -25,7 +25,6 @@ aclocal.m4
 autodefs.h
 autom4te.cache
 config.guess
-config.h
 config.h.in
 config.log
 config.status
diff --git a/app/openvpn/config.h b/app/openvpn/config.h
new file mode 100644
index 00000000..0d86c1d9
--- /dev/null
+++ b/app/openvpn/config.h
@@ -0,0 +1,618 @@
+/* config.h.  Generated from config.h.in by configure.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+
+/* DISABLE PERSISTEN TUN */
+#undef TUNSETPERSIST
+
+/* Enable deferred authentication */
+#define CONFIGURE_DEF_AUTH 1
+
+/* Enable internal packet filter */
+#undef CONFIGURE_PF //1
+
+/* enable iproute2 support */
+#undef CONFIG_FEATURE_IPROUTE 
+
+/* Use memory debugging function in OpenSSL */
+/* #undef CRYPTO_MDEBUG */
+
+/* Use dmalloc memory debugging library */
+/* #undef DMALLOC */
+
+/* Dimension to use for empty array declaration */
+#define EMPTY_ARRAY_SIZE 0
+
+/* Enable client capability only */
+#define ENABLE_CLIENT_ONLY 1
+
+/* Enable client/server capability */
+#define ENABLE_CLIENT_SERVER 1
+
+/* Enable debugging support */
+#define ENABLE_DEBUG 1
+
+/* Enable internal fragmentation support */
+#define ENABLE_FRAGMENT 1
+
+/* Enable HTTP proxy support */
+#define ENABLE_HTTP_PROXY 1
+
+/* Enable management server capability */
+#define ENABLE_MANAGEMENT 1
+
+/* Enable multi-homed UDP server capability */
+#define ENABLE_MULTIHOME 0
+
+/* Allow --askpass and --auth-user-pass passwords to be read from a file */
+#define ENABLE_PASSWORD_SAVE 1
+
+/* Enable TCP Server port sharing */
+#define ENABLE_PORT_SHARE 1
+
+/* Enable smaller executable size */
+/* #undef ENABLE_SMALL */
+
+/* Enable Socks proxy support */
+#define ENABLE_SOCKS 1
+
+/* Define to 1 if you have the `accept' function. */
+#define HAVE_ACCEPT 1
+
+/* Define to 1 if you have the <arpa/inet.h> header file. */
+#define HAVE_ARPA_INET_H 1
+
+/* Define to 1 if you have the `bind' function. */
+#define HAVE_BIND 1
+
+/* Define to 1 if you have the `chdir' function. */
+#define HAVE_CHDIR 1
+
+/* Define to 1 if you have the `chroot' function. */
+#define HAVE_CHROOT 1
+
+/* Define to 1 if you have the `chsize' function. */
+/* #undef HAVE_CHSIZE */
+
+/* struct cmsghdr needed for extended socket error support */
+#define HAVE_CMSGHDR 1
+
+/* Define to 1 if you have the `connect' function. */
+#define HAVE_CONNECT 1
+
+/* Define to 1 if your compiler supports GNU GCC-style variadic macros */
+#define HAVE_CPP_VARARG_MACRO_GCC 1 
+
+/* Define to 1 if your compiler supports ISO C99 variadic macros */
+#define HAVE_CPP_VARARG_MACRO_ISO 1
+
+/* Define to 1 if you have the `ctime' function. */
+#define HAVE_CTIME 1
+
+/* Define to 1 if you have the <ctype.h> header file. */
+#define HAVE_CTYPE_H 1
+
+/* Define to 1 if you have the `daemon' function. */
+#define HAVE_DAEMON 1
+
+/* Define to 1 if you have the `dup' function. */
+#define HAVE_DUP 1
+
+/* Define to 1 if you have the `dup2' function. */
+#define HAVE_DUP2 1
+
+/* Define to 1 if you have the `ENGINE_cleanup' function. */
+#define HAVE_ENGINE_CLEANUP 0
+
+/* Define to 1 if you have the `ENGINE_load_builtin_engines' function. */
+#define HAVE_ENGINE_LOAD_BUILTIN_ENGINES 0
+
+/* Define to 1 if you have the `ENGINE_register_all_complete' function. */
+#define HAVE_ENGINE_REGISTER_ALL_COMPLETE 0
+
+/* epoll_create function is defined */
+#define HAVE_EPOLL_CREATE 1
+
+/* Define to 1 if you have the <errno.h> header file. */
+#define HAVE_ERRNO_H 1
+
+/* Define to 1 if you have the <err.h> header file. */
+#define HAVE_ERR_H 1
+
+/* Define to 1 if you have the `EVP_CIPHER_CTX_set_key_length' function. */
+#define HAVE_EVP_CIPHER_CTX_SET_KEY_LENGTH 1
+
+/* Define to 1 if you have the `execve' function. */
+#define HAVE_EXECVE 1
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#define HAVE_FCNTL_H 1
+
+/* Define to 1 if you have the `flock' function. */
+#define HAVE_FLOCK 1
+
+/* Define to 1 if you have the `fork' function. */
+#define HAVE_FORK 1
+
+/* Define to 1 if you have the `ftruncate' function. */
+#define HAVE_FTRUNCATE 1
+
+/* Define to 1 if you have the `getgrnam' function. */
+#define HAVE_GETGRNAM 1
+
+/* Define to 1 if you have the `gethostbyname' function. */
+#define HAVE_GETHOSTBYNAME 1
+
+/* Define to 1 if you have the `getpass' function. */
+/* #define HAVE_GETPASS 1 */
+
+/* Define to 1 if you have the `getpeereid' function. */
+/* #undef HAVE_GETPEEREID */
+
+/* Define to 1 if you have the `getpeername' function. */
+#define HAVE_GETPEERNAME 1
+
+/* Define to 1 if you have the `getpid' function. */
+#define HAVE_GETPID 1
+
+/* Define to 1 if you have the `getpwnam' function. */
+#define HAVE_GETPWNAM 1
+
+/* Define to 1 if you have the `getsockname' function. */
+#define HAVE_GETSOCKNAME 1
+
+/* Define to 1 if you have the `getsockopt' function. */
+#define HAVE_GETSOCKOPT 1
+
+/* Define to 1 if you have the `gettimeofday' function. */
+#define HAVE_GETTIMEOFDAY 1
+
+/* Define to 1 if you have the <grp.h> header file. */
+#define HAVE_GRP_H 1
+
+/* Define to 1 if you have the `inet_ntoa' function. */
+#define HAVE_INET_NTOA 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* struct in_pktinfo needed for IP_PKTINFO support */
+#define HAVE_IN_PKTINFO 1
+
+/* struct iovec needed for IPv6 support */
+#define HAVE_IOVEC 1
+
+/* struct iphdr needed for IPv6 support */
+#define HAVE_IPHDR 1
+
+/* Define to 1 if you have the <linux/errqueue.h> header file. */
+#define HAVE_LINUX_ERRQUEUE_H 1 
+
+/* Define to 1 if you have the <linux/if_tun.h> header file. */
+#define HAVE_LINUX_IF_TUN_H 1
+
+/* Define to 1 if you have the <linux/sockios.h> header file. */
+#define HAVE_LINUX_SOCKIOS_H 1
+
+/* Define to 1 if you have the <linux/types.h> header file. */
+#define HAVE_LINUX_TYPES_H 1
+
+/* Define to 1 if you have the `listen' function. */
+#define HAVE_LISTEN 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the `memset' function. */
+#define HAVE_MEMSET 1
+
+/* Define to 1 if you have the `mlockall' function. */
+/* #define HAVE_MLOCKALL 1*/
+
+/* struct msghdr needed for extended socket error support */
+#define HAVE_MSGHDR 1
+
+/* Define to 1 if you have the <netdb.h> header file. */
+#define HAVE_NETDB_H 1
+
+/* Define to 1 if you have the <netinet/if_ether.h> header file. */
+#define HAVE_NETINET_IF_ETHER_H 1
+
+/* Define to 1 if you have the <netinet/in.h> header file. */
+#define HAVE_NETINET_IN_H 1
+
+/* Define to 1 if you have the <netinet/in_systm.h> header file. */
+#define HAVE_NETINET_IN_SYSTM_H 1
+
+/* Define to 1 if you have the <netinet/ip.h> header file. */
+#define HAVE_NETINET_IP_H 1
+
+/* Define to 1 if you have the <netinet/tcp.h> header file. */
+#define HAVE_NETINET_TCP_H 1
+
+/* Define to 1 if you have the <net/if.h> header file. */
+#define HAVE_NET_IF_H 1
+
+/* Define to 1 if you have the <net/if_tun.h> header file. */
+/* #undef HAVE_NET_IF_TUN_H */
+
+/* Define to 1 if you have the <net/tun/if_tun.h> header file. */
+/* #undef HAVE_NET_TUN_IF_TUN_H */
+
+/* Define to 1 if you have the `nice' function. */
+#define HAVE_NICE 1
+
+/* Define to 1 if you have the `openlog' function. */
+#define HAVE_OPENLOG 1
+
+/* Define to 1 if you have the <openssl/engine.h> header file. */
+#define HAVE_OPENSSL_ENGINE_H 0
+
+/* Define to 1 if you have the `poll' function. */
+#define HAVE_POLL 1
+
+/* Define if you have POSIX threads libraries and header files. */
+/* #undef HAVE_PTHREAD */
+
+/* Define to 1 if you have the `putenv' function. */
+#define HAVE_PUTENV 1
+
+/* Define to 1 if you have the <pwd.h> header file. */
+#define HAVE_PWD_H 1
+
+/* Define to 1 if you have the `readv' function. */
+#define HAVE_READV 1
+
+/* Define to 1 if you have the `recv' function. */
+#define HAVE_RECV 1
+
+/* Define to 1 if you have the `recvfrom' function. */
+#define HAVE_RECVFROM 1
+
+/* Define to 1 if you have the `recvmsg' function. */
+#define HAVE_RECVMSG 1
+
+/* Define to 1 if you have the <resolv.h> header file. */
+#define HAVE_RESOLV_H 1
+
+/* Indicates if res_init is available */
+#define HAVE_RES_INIT 1
+
+/* Define to 1 if you have the `select' function. */
+#define HAVE_SELECT 1
+
+/* Define to 1 if you have the `send' function. */
+#define HAVE_SEND 1
+
+/* Define to 1 if you have the `sendmsg' function. */
+#define HAVE_SENDMSG 1
+
+/* Define to 1 if you have the `sendto' function. */
+#define HAVE_SENDTO 1
+
+/* SELinux support */
+/* #undef HAVE_SETCON */
+
+/* Define to 1 if you have the `setgid' function. */
+#define HAVE_SETGID 1
+
+/* Define to 1 if you have the `setgroups' function. */
+#define HAVE_SETGROUPS 1
+
+/* Define to 1 if you have the `setsid' function. */
+#define HAVE_SETSID 1
+
+/* Define to 1 if you have the `setsockopt' function. */
+#define HAVE_SETSOCKOPT 1
+
+/* Define to 1 if you have the `setuid' function. */
+#define HAVE_SETUID 1
+
+/* Define to 1 if you have the <signal.h> header file. */
+#define HAVE_SIGNAL_H 1
+
+/* Define to 1 if you have the `socket' function. */
+#define HAVE_SOCKET 1
+
+/* struct sock_extended_err needed for extended socket error support */
+#define HAVE_SOCK_EXTENDED_ERR 1
+
+/* Define to 1 if you have the `stat' function. */
+#define HAVE_STAT 1
+
+/* Define to 1 if you have the <stdarg.h> header file. */
+#define HAVE_STDARG_H 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdio.h> header file. */
+#define HAVE_STDIO_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the `strdup' function. */
+#define HAVE_STRDUP 1
+
+/* Define to 1 if you have the `strerror' function. */
+#define HAVE_STRERROR 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <stropts.h> header file. */
+#define HAVE_STROPTS_H 1
+
+/* Define to 1 if you have the `syslog' function. */
+ #define HAVE_SYSLOG 1
+
+/* Define to 1 if you have the <syslog.h> header file. */
+#define HAVE_SYSLOG_H 1
+
+/* Define to 1 if you have the `system' function. */
+#define HAVE_SYSTEM 1
+
+/* Define to 1 if you have the <sys/epoll.h> header file. */
+#define HAVE_SYS_EPOLL_H 1
+
+/* Define to 1 if you have the <sys/file.h> header file. */
+#define HAVE_SYS_FILE_H 1
+
+/* Define to 1 if you have the <sys/ioctl.h> header file. */
+#define HAVE_SYS_IOCTL_H 1
+
+/* Define to 1 if you have the <sys/mman.h> header file. */
+#define HAVE_SYS_MMAN_H 1
+
+/* Define to 1 if you have the <sys/poll.h> header file. */
+#define HAVE_SYS_POLL_H 1
+
+/* Define to 1 if you have the <sys/socket.h> header file. */
+#define HAVE_SYS_SOCKET_H 1
+
+/* Define to 1 if you have the <sys/sockio.h> header file. */
+/* #undef HAVE_SYS_SOCKIO_H */
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#define HAVE_SYS_TIME_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <sys/uio.h> header file. */
+#define HAVE_SYS_UIO_H 1
+
+/* Define to 1 if you have the <sys/un.h> header file. */
+#define HAVE_SYS_UN_H 1
+
+/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
+#define HAVE_SYS_WAIT_H 1
+
+/* Define to 1 if you have the `time' function. */
+#define HAVE_TIME 1
+
+/* struct tun_pi needed for IPv6 support */
+#define HAVE_TUN_PI 1
+
+/* Define to 1 if you have the `umask' function. */
+#define HAVE_UMASK 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to 1 if you have the `unlink' function. */
+#define HAVE_UNLINK 1
+
+/* Define to 1 if you have the `vfork' function. */
+#define HAVE_VFORK 1
+
+/* Define to 1 if you have the <vfork.h> header file. */
+/* #undef HAVE_VFORK_H */
+
+/* Define to 1 if you have the `vsnprintf' function. */
+#define HAVE_VSNPRINTF 1
+
+/* Define to 1 if `fork' works. */
+#define HAVE_WORKING_FORK 1
+
+/* Define to 1 if `vfork' works. */
+#define HAVE_WORKING_VFORK 1
+
+/* Define to 1 if you have the `writev' function. */
+#define HAVE_WRITEV 1
+
+/* Path to ifconfig tool */
+#define IFCONFIG_PATH "/system/xbin/ifconfig"
+
+/* Path to iproute tool */
+#define IPROUTE_PATH "ip"
+
+/* Use lzo/ directory prefix for LZO header files (for LZO 2.0) */
+#define LZO_HEADER_DIR 1
+
+/* LZO version number */
+#define LZO_VERSION_NUM "2"
+
+/* Name of package */
+#define PACKAGE "openvpn"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "openvpn-users@lists.sourceforge.net"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "OpenVPN"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "OpenVPN 2.3_rc1+dspatch3"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "openvpn"
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "2.3_beta1"
+
+/* Define to the necessary symbol if this constant uses a non-standard name on
+   your system. */
+/* #undef PTHREAD_CREATE_JOINABLE */
+
+/* Define as the return type of signal handlers (`int' or `void'). */
+#define RETSIGTYPE void
+
+/* Path to route tool */
+#define ROUTE_PATH "/system/xbin/route"
+
+/* The size of `unsigned int', as computed by sizeof. */
+#define SIZEOF_UNSIGNED_INT 4
+
+/* The size of `unsigned long', as computed by sizeof. */
+#define SIZEOF_UNSIGNED_LONG 4
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Enable strict options check between peers */
+/* #undef STRICT_OPTIONS_CHECK */
+
+/* The TAP-Win32 id defined in tap-win32/SOURCES */
+#define TAP_ID "tap0901"
+
+/* The TAP-Win32 version number is defined in tap-win32/SOURCES */
+#define TAP_WIN32_MIN_MAJOR 9
+
+/* The TAP-Win32 version number is defined in tap-win32/SOURCES */
+#define TAP_WIN32_MIN_MINOR 1
+
+/* A string representing our target */
+#define TARGET_ALIAS TARGET_ABI
+
+/* Are we running on Mac OS X? */
+/* #undef TARGET_DARWIN */
+
+/* Are we running on DragonFlyBSD? */
+/* #undef TARGET_DRAGONFLY */
+
+/* Are we running on FreeBSD? */
+/* #undef TARGET_FREEBSD */
+
+/* Are we running on Android Linux? */
+/* TARGET_LINUX is not enable since the TARGET_XXX options mainly 
+   control different tun/tap, ifconfig behaviour and Android VpnProvider
+   is very different from Linux */
+#define TARGET_ANDROID
+
+/* Are we running on Linux? */
+/* #define TARGET_LINUX 1 */
+
+/* Are we running NetBSD? */
+/* #undef TARGET_NETBSD */
+
+/* Are we running on OpenBSD? */
+/* #undef TARGET_OPENBSD */
+
+/* Are we running on Solaris? */
+/* #undef TARGET_SOLARIS */
+
+/* Are we running WIN32? */
+/* #undef TARGET_WIN32 */
+
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+#define TIME_WITH_SYS_TIME 1
+
+/* Win32 builtin */
+/* #undef UF */
+
+/* Use OpenSSL crypto library */
+#define USE_CRYPTO 1
+
+/* Use libdl for dynamic library loading */
+#define USE_LIBDL 1
+
+/* Use LoadLibrary to load DLLs on Windows */
+/* #undef USE_LOAD_LIBRARY */
+
+/* Use LZO compression library */
+#define ENABLE_LZO 1
+
+/* Enable PKCS11 capability */
+/* #undef USE_PKCS11 */
+
+/* Use pthread-based multithreading */
+/* #undef USE_PTHREAD */
+
+/* Use OpenSSL SSL library */
+#define ENABLE_SSL 1
+#define USE_SSL 1
+#define ENABLE_CRYPTO 1
+#define ENABLE_CRYPTO_OPENSSL 1
+
+/* Use valgrind memory debugging library */
+/* #undef USE_VALGRIND */
+
+/* Version number of package */
+#define VERSION "2.1.4"
+
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE 1
+#endif
+
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #undef const */
+
+/* Define to `int' if <sys/types.h> doesn't define. */
+/* #undef gid_t */
+
+/* Some systems don't define in_addr_t */
+/* #undef in_addr_t */
+
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
+/* #undef inline */
+#endif
+
+/* Define to `long int' if <sys/types.h> does not define. */
+/* #undef off_t */
+
+/* Define to `int' if <sys/types.h> does not define. */
+/* #undef pid_t */
+
+/* Define to `unsigned int' if <sys/types.h> does not define. */
+/* #undef size_t */
+
+/* type to use in place of socklen_t if not defined */
+/* #undef socklen_t */
+
+/* Define to `int' if <sys/types.h> doesn't define. */
+/* #undef uid_t */
+
+/* 16-bit unsigned type */
+/* #undef uint16_t */
+
+/* 32-bit unsigned type */
+/* #undef uint32_t */
+
+/* 8-bit unsigned type */
+/* #undef uint8_t */
+
+/* Define as `fork' if `vfork' does not work. */
+/* #undef vfork */
+
+/* Define to empty if the keyword `volatile' does not work. Warning: valid
+   code using `volatile' can become incorrect without. Disable with care. */
+/* #undef volatile */
+
+// New version
+#define HAVE_INET_NTOP 1
+#define HAVE_INET_PTON 1
+#define HAVE_LZO_LZOUTIL_H 1
+#define HAVE_LZO_LZO1X_H 1
+#define HAVE_SYS_TIME_H 1
+#define HAVE_TIME_H 1
diff --git a/app/ovpnlibs/assets/minivpn.armeabi b/app/ovpnlibs/assets/minivpn.armeabi
new file mode 100755
index 00000000..5c1865b1
--- /dev/null
+++ b/app/ovpnlibs/assets/minivpn.armeabi
diff --git a/app/ovpnlibs/assets/minivpn.armeabi-v7a b/app/ovpnlibs/assets/minivpn.armeabi-v7a
new file mode 100755
index 00000000..cb506b63
--- /dev/null
+++ b/app/ovpnlibs/assets/minivpn.armeabi-v7a
diff --git a/app/ovpnlibs/assets/minivpn.mips b/app/ovpnlibs/assets/minivpn.mips
new file mode 100755
index 00000000..6c8a3f5e
--- /dev/null
+++ b/app/ovpnlibs/assets/minivpn.mips
diff --git a/app/ovpnlibs/assets/minivpn.x86 b/app/ovpnlibs/assets/minivpn.x86
new file mode 100755
index 00000000..a80bb27a
--- /dev/null
+++ b/app/ovpnlibs/assets/minivpn.x86
diff --git a/app/src/androidTest/java/se/leap/bitmaskclient/test/testConfigurationWizard.java b/app/src/androidTest/java/se/leap/bitmaskclient/test/testConfigurationWizard.java
index 847d8cdd..8ddfbc57 100644
--- a/app/src/androidTest/java/se/leap/bitmaskclient/test/testConfigurationWizard.java
+++ b/app/src/androidTest/java/se/leap/bitmaskclient/test/testConfigurationWizard.java
@@ -46,7 +46,7 @@ public class testConfigurationWizard extends ActivityInstrumentationTestCase2<Co
 	
 	public void testAddNewProvider() {
 		solo.clickOnActionBarItem(R.id.new_provider);
-		solo.enterText(0, "dev.bitmask.net");
+		solo.enterText(0, "calyx.net");
 		solo.clickOnCheckBox(0);
 		solo.clickOnText(solo.getString(R.string.save));
 		added_providers = added_providers+1;
diff --git a/app/src/androidTest/java/se/leap/bitmaskclient/test/testDashboard.java b/app/src/androidTest/java/se/leap/bitmaskclient/test/testDashboard.java
index 269f1d18..bbc3e97d 100644
--- a/app/src/androidTest/java/se/leap/bitmaskclient/test/testDashboard.java
+++ b/app/src/androidTest/java/se/leap/bitmaskclient/test/testDashboard.java
@@ -50,14 +50,14 @@ public class testDashboard extends ActivityInstrumentationTestCase2<Dashboard> {
 		if(!solo.waitForText(getActivity().getString(R.string.eip_state_not_connected)))
 		    fail();
 		
-		ConnectionManager.setMobileDataEnabled(false, solo.getCurrentActivity().getApplicationContext());
+		/*ConnectionManager.setMobileDataEnabled(false, solo.getCurrentActivity().getApplicationContext());
 		
 		solo.clickOnView(solo.getView(R.id.eipSwitch));
 		if(!solo.waitForText(getActivity().getString(R.string.eip_status_start_pending)))
 			fail();
 		if(!solo.waitForText(getActivity().getString(R.string.state_nonetwork)))
 			fail();
-		
+		*/
 	}
 	
     public void testLogInAndOut() {
diff --git a/app/src/debug/AndroidManifest.xml b/app/src/debug/AndroidManifest.xml
new file mode 100644
index 00000000..4c648a5f
--- /dev/null
+++ b/app/src/debug/AndroidManifest.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- if you want to run test, this permissions are needed. Gradle will get rid of them once we implement it. --> 
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />    
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+
+</manifest>
diff --git a/app/src/debug/assets/urls/cdev.bitmask.net.url b/app/src/debug/assets/urls/cdev.bitmask.net.url
new file mode 100644
index 00000000..4ceca5ee
--- /dev/null
+++ b/app/src/debug/assets/urls/cdev.bitmask.net.url
@@ -0,0 +1,3 @@
+{
+	"main_url" : "https://cdev.bitmask.net/"
+}
\ No newline at end of file
diff --git a/app/src/debug/assets/urls/dev.bitmask.net.url b/app/src/debug/assets/urls/dev.bitmask.net.url
new file mode 100644
index 00000000..a1e53f69
--- /dev/null
+++ b/app/src/debug/assets/urls/dev.bitmask.net.url
@@ -0,0 +1,3 @@
+{

+	"main_url" : "https://dev.bitmask.net/"

+}
\ No newline at end of file
diff --git a/app/src/main/java/se/leap/bitmaskclient/ConfigurationWizard.java b/app/src/debug/java/se/leap/bitmaskclient/ConfigurationWizard.java
index f0aac40b..cf013f3a 100644
--- a/app/src/main/java/se/leap/bitmaskclient/ConfigurationWizard.java
+++ b/app/src/debug/java/se/leap/bitmaskclient/ConfigurationWizard.java
@@ -49,6 +49,7 @@ import android.widget.ProgressBar;
 import android.widget.RelativeLayout;

 import android.widget.TextView;

 import java.io.IOException;

+import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Iterator;

@@ -80,10 +81,11 @@ implements ProviderListFragment.Callbacks, NewProviderDialogInterface, ProviderD
 	final public static String TAG = "se.leap.bitmaskclient.ConfigurationWizard";

 	final public static String TYPE_OF_CERTIFICATE = "type_of_certificate";

 	final public static String ANON_CERTIFICATE = "anon_certificate";

-	final public static String AUTHED_CERTIFICATE = "authed_certificate";

+        final public static String AUTHED_CERTIFICATE = "authed_certificate";

 

 	final protected static String PROVIDER_SET = "PROVIDER SET";

 	final protected static String SERVICES_RETRIEVED = "SERVICES RETRIEVED";

+    final protected static String ASSETS_URL_FOLDER = "urls";
     

     public ProviderAPIResultReceiver providerAPI_result_receiver;

     private ProviderAPIBroadcastReceiver_Update providerAPI_broadcast_receiver_update;
@@ -353,34 +355,46 @@ implements ProviderListFragment.Callbacks, NewProviderDialogInterface, ProviderD
         return listItem.getMeasuredHeight();

 }

 	

-    /**

-     * Loads providers data from url file contained in the project 

-     * @return true if the file was read correctly

-     */

-    private boolean loadPreseededProviders() {

-    	boolean loaded_preseeded_providers = false;

-        AssetManager asset_manager = getAssets();

-        String[] urls_filepaths = null;

-		try {

-			String url_files_folder = "urls";

-			//TODO Put that folder in a better place (also inside the "for")

-			urls_filepaths = asset_manager.list(url_files_folder); 

-			String provider_name = "";

-	        for(String url_filepath : urls_filepaths)

-	        {

-	        	boolean custom = false;

-	        	provider_name = url_filepath.subSequence(0, url_filepath.indexOf(".")).toString();

-	        	if(ProviderListContent.ITEMS.isEmpty()) //TODO I have to implement a way of checking if a provider new or is already present in that ITEMS list

-	        		ProviderListContent.addItem(new ProviderItem(provider_name, asset_manager.open(url_files_folder + "/" + url_filepath)));
-	        	loaded_preseeded_providers = true;

-	        }

-		} catch (IOException e) {

-			loaded_preseeded_providers = false;

-		}

-		

-		return loaded_preseeded_providers;

-	}

-	

+    /**
+     * Loads providers data from url files contained in the assets folder
+     * @return true if the files were correctly read
+     */
+    private boolean loadPreseededProviders() {
+    	boolean loaded_preseeded_providers = false;
+        String[] urls_filepaths = null;
+	try {
+	    //TODO Put that folder in a better place (also inside the "for")
+	    urls_filepaths = getAssets().list(ASSETS_URL_FOLDER); 
+	    String provider_name = "";
+	    for(String url_filepath : urls_filepaths) {
+		provider_name = url_filepath.subSequence(0, url_filepath.lastIndexOf(".")).toString();
+		String provider_main_url = extractProviderMainUrlFromAssetsFile(ASSETS_URL_FOLDER + "/" + url_filepath);
+		if(getId(provider_main_url).isEmpty())
+		    ProviderListContent.addItem(new ProviderItem(provider_name, provider_main_url));
+		loaded_preseeded_providers = true;

+	    }
+	} catch (IOException e) {
+	    loaded_preseeded_providers = false;
+	}
+	
+	return loaded_preseeded_providers;
+    }
+
+    private String extractProviderMainUrlFromAssetsFile(String filepath) {
+	String provider_main_url = "";
+	try {	    
+	    InputStream input_stream_file_contents = getAssets().open(filepath);
+	    byte[] urls_file_bytes = new byte[input_stream_file_contents.available()];
+	    input_stream_file_contents.read(urls_file_bytes);
+	    String urls_file_content = new String(urls_file_bytes);
+	    JSONObject file_contents = new JSONObject(urls_file_content);
+	    provider_main_url = file_contents.getString(Provider.MAIN_URL);
+	} catch (JSONException e) {
+	} catch (IOException e) {
+	}
+	return provider_main_url;
+    }
+    
 	/**

 	 * Asks ProviderAPI to download an anonymous (anon) VPN certificate.

 	 */

diff --git a/app/src/main/java/se/leap/bitmaskclient/NewProviderDialog.java b/app/src/debug/java/se/leap/bitmaskclient/NewProviderDialog.java
index cf09c64b..cf09c64b 100644
--- a/app/src/main/java/se/leap/bitmaskclient/NewProviderDialog.java
+++ b/app/src/debug/java/se/leap/bitmaskclient/NewProviderDialog.java
diff --git a/app/src/main/java/se/leap/bitmaskclient/ProviderAPI.java b/app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java
index 75ef511d..9f4b8d27 100644
--- a/app/src/main/java/se/leap/bitmaskclient/ProviderAPI.java
+++ b/app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java
@@ -467,7 +467,7 @@ public class ProviderAPI extends IntentService {
 			broadcast_progress(progress++);
 			CA_CERT_DOWNLOADED = true;
 			if(!PROVIDER_JSON_DOWNLOADED)
-				current_download = getAndSetProviderJson(last_provider_main_url); 
+				current_download = getAndSetProviderJson(last_provider_main_url, last_danger_on);
 			if(PROVIDER_JSON_DOWNLOADED || (current_download.containsKey(RESULT_KEY) && current_download.getBoolean(RESULT_KEY))) {
 				broadcast_progress(progress++);
 				PROVIDER_JSON_DOWNLOADED = true;
@@ -518,11 +518,11 @@ public class ProviderAPI extends IntentService {
 		return result;
 	}
 	
-	private Bundle getAndSetProviderJson(String provider_main_url) {
+	private Bundle getAndSetProviderJson(String provider_main_url, boolean danger_on) {
 		Bundle result = new Bundle();
 
 		if(setting_up_provider) {
-			String provider_dot_json_string = downloadWithProviderCA(provider_main_url + "/provider.json", true);
+			String provider_dot_json_string = downloadWithCommercialCA(provider_main_url + "/provider.json", danger_on);
 
 			try {
 				JSONObject provider_json = new JSONObject(provider_dot_json_string);
diff --git a/app/src/main/java/se/leap/bitmaskclient/ProviderDetailFragment.java b/app/src/debug/java/se/leap/bitmaskclient/ProviderDetailFragment.java
index c067ce2b..c067ce2b 100644
--- a/app/src/main/java/se/leap/bitmaskclient/ProviderDetailFragment.java
+++ b/app/src/debug/java/se/leap/bitmaskclient/ProviderDetailFragment.java
diff --git a/app/src/main/java/se/leap/bitmaskclient/ProviderListContent.java b/app/src/debug/java/se/leap/bitmaskclient/ProviderListContent.java
index e1ca4f9a..8c8fb69f 100644
--- a/app/src/main/java/se/leap/bitmaskclient/ProviderListContent.java
+++ b/app/src/debug/java/se/leap/bitmaskclient/ProviderListContent.java
@@ -61,36 +61,10 @@ public class ProviderListContent {
 		final public static String DANGER_ON = "danger_on";

 		private String provider_main_url;

 		private String name;
-

-		/**

-		 * @param name of the provider

-		 * @param urls_file_input_stream file input stream linking with the assets url file

-		 * @param custom if it's a new provider entered by the user or not

-		 * @param danger_on if the user trusts completely the new provider

-		 */

-		public ProviderItem(String name, InputStream urls_file_input_stream) {

-

-			try {

-				byte[] urls_file_bytes = new byte[urls_file_input_stream.available()];

-				urls_file_input_stream.read(urls_file_bytes);

-				String urls_file_content = new String(urls_file_bytes);

-				JSONObject file_contents = new JSONObject(urls_file_content);
-				provider_main_url = file_contents.getString(Provider.MAIN_URL);

-				this.name = name;

-			} catch (JSONException e) {

-				// TODO Auto-generated catch block

-				e.printStackTrace();

-			} catch (IOException e) {

-				// TODO Auto-generated catch block

-				e.printStackTrace();

-			}

-		}

-

+
 		/**

 		 * @param name of the provider

 		 * @param provider_main_url used to download provider.json file of the provider

-		 * @param provider_json already downloaded

-		 * @param custom if it's a new provider entered by the user or not

 		 */
 		public ProviderItem(String name, String provider_main_url) {

 			this.name = name;

diff --git a/app/src/main/res/layout-xlarge/new_provider_dialog.xml b/app/src/debug/res/layout-xlarge/new_provider_dialog.xml
index fc7d84ab..fc7d84ab 100644
--- a/app/src/main/res/layout-xlarge/new_provider_dialog.xml
+++ b/app/src/debug/res/layout-xlarge/new_provider_dialog.xml
diff --git a/app/src/main/res/layout/new_provider_dialog.xml b/app/src/debug/res/layout/new_provider_dialog.xml
index 19b8f442..19b8f442 100644
--- a/app/src/main/res/layout/new_provider_dialog.xml
+++ b/app/src/debug/res/layout/new_provider_dialog.xml
diff --git a/app/src/debug/res/values/strings.xml b/app/src/debug/res/values/strings.xml
new file mode 100644
index 00000000..3e568115
--- /dev/null
+++ b/app/src/debug/res/values/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="danger_checkbox">Skip security check</string>
+</resources>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c1f13ba6..0c6d0b3f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -17,19 +17,12 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="se.leap.bitmaskclient"
-    android:versionCode="74"
-    android:versionName="0.5" >
+    android:versionCode="77"
+    android:versionName="0.5.1" >
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-
-    <!-- if you want to run test, this permissions are needed. Gradle will get rid of them once we implement it. --> 
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />    
-    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
-    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <!-- <uses-permission android:name="com.android.vending.BILLING" /> -->
 
     <uses-sdk
@@ -50,7 +43,16 @@
             </intent-filter>
         </service>
 	<service android:name="se.leap.bitmaskclient.ProviderAPI" android:enabled="true"/>
-		
+	
+        <receiver
+            android:name="se.leap.bitmaskclient.OnBootReceiver"
+            android:enabled="true"
+            android:permission="android.permission.RECEIVE_BOOT_COMPLETED" >
+          <intent-filter>
+            <action android:name="android.intent.action.BOOT_COMPLETED" />
+          </intent-filter>
+        </receiver>
+	
         <activity
             android:name="se.leap.openvpn.LaunchVPN"
             android:label="@string/vpn_launch_title" >
diff --git a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
index b388b84a..3c17ebb8 100644
--- a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
+++ b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
@@ -57,7 +57,11 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 
     final public static String SHARED_PREFERENCES = "LEAPPreferences";
     final public static String ACTION_QUIT = "quit";
-	public static final String REQUEST_CODE = "request_code";
+    public static final String REQUEST_CODE = "request_code";
+    public static final String PARAMETERS = "dashboard parameters";
+    public static final String START_ON_BOOT = "dashboard start on boot";
+    final public static String ON_BOOT = "dashboard on boot";
+
 	
 	private ProgressBar mProgressBar;
 	private TextView eipStatus;
@@ -90,14 +94,18 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 		if (preferences.getString(Provider.KEY, "").isEmpty())
 			startActivityForResult(new Intent(this,ConfigurationWizard.class),CONFIGURE_LEAP);
 		else
-			buildDashboard();
+		    buildDashboard(getIntent().getBooleanExtra(ON_BOOT, false));
 	}
 
 	@Override
 	protected void onDestroy() {
 		super.onDestroy();
 	}
-	
+
+    protected void onPause() {
+	super.onPause();
+    }
+    
 	@Override
 	protected void onActivityResult(int requestCode, int resultCode, Intent data){
 		if ( requestCode == CONFIGURE_LEAP || requestCode == SWITCH_PROVIDER) {
@@ -108,13 +116,13 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 				Intent updateEIP = new Intent(getApplicationContext(), EIP.class);
 				updateEIP.setAction(EIP.ACTION_UPDATE_EIP_SERVICE);
 				startService(updateEIP);
-				buildDashboard();
+				buildDashboard(false);
 				invalidateOptionsMenu();
 				if(data != null && data.hasExtra(LogInDialog.VERB)) {
 					View view = ((ViewGroup)findViewById(android.R.id.content)).getChildAt(0);
 					logInDialog(view, Bundle.EMPTY);
 				}
-			} else if(resultCode == RESULT_CANCELED && data.hasExtra(ACTION_QUIT)) {
+			} else if(resultCode == RESULT_CANCELED && (data == null || data.hasExtra(ACTION_QUIT))) {
 				finish();
 			} else
 				configErrorDialog();
@@ -152,7 +160,7 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 	 * Inflates permanent UI elements of the View and contains logic for what
 	 * service dependent UI elements to include.
 	 */
-	private void buildDashboard() {
+	private void buildDashboard(boolean hide_and_turn_on_eip) {
 		provider = Provider.getInstance();
 		provider.init( this );
 
@@ -167,7 +175,17 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 		FragmentManager fragMan = getFragmentManager();
 		if ( provider.hasEIP()){
 			EipServiceFragment eipFragment = new EipServiceFragment();
+			if (hide_and_turn_on_eip) {		    
+			    getSharedPreferences(Dashboard.SHARED_PREFERENCES, MODE_PRIVATE).edit().remove(Dashboard.START_ON_BOOT).commit();			
+			    Bundle arguments = new Bundle();
+			    arguments.putBoolean(EipServiceFragment.START_ON_BOOT, true);
+			    eipFragment.setArguments(arguments);
+			}
 			fragMan.beginTransaction().replace(R.id.servicesCollection, eipFragment, EipServiceFragment.TAG).commit();
+
+			if (hide_and_turn_on_eip) {
+			    onBackPressed();
+			}
 		}
 	}
 
@@ -464,9 +482,9 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 		// TODO validate "action"...how do we get the list of intent-filters for a class via Android API?
 		Intent eip_intent = new Intent(this, EIP.class);
 		eip_intent.setAction(EIP.ACTION_STOP_EIP);
-	//	eip_intent.putExtra(EIP.RECEIVER_TAG, eip_receiver);
+	//	eip_intent.putExtra(EIP.RECEIVER_TAG, eip_receiver);fi
 		startService(eip_intent);
-
+		
 	}
 
     private void eipStart(){
diff --git a/app/src/main/java/se/leap/bitmaskclient/EIP.java b/app/src/main/java/se/leap/bitmaskclient/EIP.java
index e773e3b9..68688b90 100644
--- a/app/src/main/java/se/leap/bitmaskclient/EIP.java
+++ b/app/src/main/java/se/leap/bitmaskclient/EIP.java
@@ -108,11 +108,12 @@ public final class EIP extends IntentService {
 	
 	@Override
 	public void onDestroy() {
-		unbindService(mVpnServiceConn);
-		mBound = false;
-
-		super.onDestroy();
+	    unbindService(mVpnServiceConn);
+	    mBound = false;
+	    
+	    super.onDestroy();
 	}
+
 	
 	@Override
 	protected void onHandleIntent(Intent intent) {
diff --git a/app/src/main/java/se/leap/bitmaskclient/EipServiceFragment.java b/app/src/main/java/se/leap/bitmaskclient/EipServiceFragment.java
index b4cb541a..4341c9dc 100644
--- a/app/src/main/java/se/leap/bitmaskclient/EipServiceFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/EipServiceFragment.java
@@ -27,6 +27,7 @@ import android.widget.TextView;
 public class EipServiceFragment extends Fragment implements StateListener, OnCheckedChangeListener {
 	
 	protected static final String IS_EIP_PENDING = "is_eip_pending";
+    public static final String START_ON_BOOT = "start on boot";
 	
 	private View eipFragment;
 	private static Switch eipSwitch;
@@ -73,6 +74,8 @@ public class EipServiceFragment extends Fragment implements StateListener, OnChe
 		});
 		eipSwitch.setOnCheckedChangeListener(this);
 		
+		if(getArguments() != null && getArguments().containsKey(START_ON_BOOT) && getArguments().getBoolean(START_ON_BOOT))
+		    startEipFromScratch();
 		
 		return eipFragment;
 	}
@@ -108,24 +111,32 @@ public class EipServiceFragment extends Fragment implements StateListener, OnChe
 
 		OpenVPN.removeStateListener(this);
 	}
-	
+    
 	@Override
 	public void onSaveInstanceState(Bundle outState) {
 		super.onSaveInstanceState(outState);
 		outState.putBoolean(IS_EIP_PENDING, mEipStartPending);
 	}
-	
+
+    protected void saveEipStatus() {
+	boolean eip_is_on = false;
+	Log.d("bitmask", "saveEipStatus");
+	if(eipSwitch.isChecked()) {
+	    eip_is_on = true;
+	}
+
+	if(getActivity() != null)
+	    getActivity().getSharedPreferences(Dashboard.SHARED_PREFERENCES, Activity.MODE_PRIVATE).edit().putBoolean(Dashboard.START_ON_BOOT, eip_is_on).commit();
+    }
 	@Override
 	public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+	    Log.d("bitmask", "onCheckChanged");
 		if (buttonView.equals(eipSwitch) && !eipAutoSwitched){
 		    boolean allowed_anon = getActivity().getSharedPreferences(Dashboard.SHARED_PREFERENCES, Activity.MODE_PRIVATE).getBoolean(EIP.ALLOWED_ANON, false);
 		    String certificate = getActivity().getSharedPreferences(Dashboard.SHARED_PREFERENCES, Activity.MODE_PRIVATE).getString(EIP.CERTIFICATE, "");
 		    if(allowed_anon || !certificate.isEmpty()) {
 			if (isChecked){
-				mEipStartPending = true;
-				eipFragment.findViewById(R.id.eipProgress).setVisibility(View.VISIBLE);
-				((TextView) eipFragment.findViewById(R.id.eipStatus)).setText(R.string.eip_status_start_pending);
-				eipCommand(EIP.ACTION_START_EIP);
+			    startEipFromScratch();
 			} else {
 				if (mEipStartPending){
 					AlertDialog.Builder alertBuilder = new AlertDialog.Builder(getActivity());
@@ -165,9 +176,18 @@ public class EipServiceFragment extends Fragment implements StateListener, OnChe
 			eipStatus.setText(R.string.state_noprocess);
 		}
 		eipAutoSwitched = true;
+		saveEipStatus();
 	}
 	
 
+    public void startEipFromScratch() {
+	mEipStartPending = true;
+	eipFragment.findViewById(R.id.eipProgress).setVisibility(View.VISIBLE);
+	((TextView) eipFragment.findViewById(R.id.eipStatus)).setText(R.string.eip_status_start_pending);
+	eipSwitch.setChecked(true);	
+	saveEipStatus();
+	eipCommand(EIP.ACTION_START_EIP);
+    }
 	
 	/**
 	 * Send a command to EIP
diff --git a/app/src/main/java/se/leap/bitmaskclient/OnBootReceiver.java b/app/src/main/java/se/leap/bitmaskclient/OnBootReceiver.java
new file mode 100644
index 00000000..eb196d46
--- /dev/null
+++ b/app/src/main/java/se/leap/bitmaskclient/OnBootReceiver.java
@@ -0,0 +1,24 @@
+package se.leap.bitmaskclient;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.util.Log;
+
+
+public class OnBootReceiver extends BroadcastReceiver {
+
+	// Debug: am broadcast -a android.intent.action.BOOT_COMPLETED
+	@Override
+	public void onReceive(Context context, Intent intent) {
+	    if (Intent.ACTION_BOOT_COMPLETED.equals(intent.getAction())) {
+		if (!context.getSharedPreferences(Dashboard.SHARED_PREFERENCES, Context.MODE_PRIVATE).getString(Provider.KEY, "").isEmpty() && context.getSharedPreferences(Dashboard.SHARED_PREFERENCES, Context.MODE_PRIVATE).getBoolean(Dashboard.START_ON_BOOT, false)) {
+		    Intent dashboard_intent = new Intent(context, Dashboard.class);
+		    dashboard_intent.setAction(EIP.ACTION_START_EIP);
+		    dashboard_intent.putExtra(Dashboard.ON_BOOT, true);
+		    dashboard_intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+		    context.startActivity(dashboard_intent);
+		}
+	    }
+	}
+}
diff --git a/app/src/main/java/se/leap/openvpn/OpenVpnService.java b/app/src/main/java/se/leap/openvpn/OpenVpnService.java
index b5c9c798..deec8518 100644
--- a/app/src/main/java/se/leap/openvpn/OpenVpnService.java
+++ b/app/src/main/java/se/leap/openvpn/OpenVpnService.java
@@ -1,13 +1,8 @@
 package se.leap.openvpn;
 
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.Vector;
 
-import se.leap.bitmaskclient.Dashboard;
-import se.leap.bitmaskclient.R;
 import android.annotation.TargetApi;
+import android.app.Activity;
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
@@ -20,11 +15,17 @@ import android.net.LocalSocket;
 import android.net.LocalSocketAddress;
 import android.net.VpnService;
 import android.os.Binder;
-import android.os.Handler.Callback;
 import android.os.Build;
+import android.os.Handler.Callback;
 import android.os.IBinder;
 import android.os.Message;
 import android.os.ParcelFileDescriptor;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Vector;
+import se.leap.bitmaskclient.Dashboard;
+import se.leap.bitmaskclient.R;
 import se.leap.openvpn.OpenVPN.StateListener;
 
 public class OpenVpnService extends VpnService implements StateListener, Callback {
@@ -163,7 +164,7 @@ public class OpenVpnService extends VpnService implements StateListener, Callbac
 
 	PendingIntent getLogPendingIntent() {
 		// Let the configure Button show the Dashboard
-		Intent intent = new Intent(Dashboard.getAppContext(),Dashboard.class);
+	    Intent intent = new Intent(getApplicationContext(),Dashboard.class);
 		intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
 		PendingIntent startLW = PendingIntent.getActivity(getApplicationContext(), 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
 		intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
@@ -278,10 +279,11 @@ public class OpenVpnService extends VpnService implements StateListener, Callbac
 
 	@Override
 	public void onDestroy() {
-		if (mProcessThread != null) {
+	    if (mProcessThread != null) {
 			mSocketManager.managmentCommand("signal SIGINT\n");
 
 			mProcessThread.interrupt();
+
 		}
 		if (mNetworkStateReceiver!= null) {
 			this.unregisterReceiver(mNetworkStateReceiver);
@@ -468,11 +470,16 @@ public class OpenVpnService extends VpnService implements StateListener, Callbac
 	public void updateState(String state,String logmessage, int resid) {
 		// If the process is not running, ignore any state, 
 		// Notification should be invisible in this state
-		if(mProcessThread==null)
-			return;	
-		if("CONNECTED".equals(state)) {
-			mNotificationManager.cancel(OPENVPN_STATUS);
-		} else if(!"BYTECOUNT".equals(state)) {
+	    android.util.Log.d("OpenVpnService", "updateState(" + state + ","+logmessage);
+	    
+	    if(mProcessThread==null) {
+		if(mNotificationManager != null)
+		    mNotificationManager.cancel(OPENVPN_STATUS);
+		return;
+	    }
+	    if("CONNECTED".equalsIgnoreCase(state)) {
+		mNotificationManager.cancel(OPENVPN_STATUS);
+	    } else if(!"BYTECOUNT".equals(state)) {
 
 			// Other notifications are shown,
 			// This also mean we are no longer connected, ignore bytecount messages until next
@@ -481,6 +488,8 @@ public class OpenVpnService extends VpnService implements StateListener, Callbac
 			boolean persist = false;
 			if (("NOPROCESS".equals(state) ) || ("EXITING").equals(state)){
 				showNotification(state, getString(R.string.eip_state_not_connected), ticker, false, 0, persist);
+				if(getSharedPreferences(Dashboard.SHARED_PREFERENCES, Activity.MODE_PRIVATE) != null)
+				    getSharedPreferences(Dashboard.SHARED_PREFERENCES, Activity.MODE_PRIVATE).edit().putBoolean(Dashboard.START_ON_BOOT, false).commit();
 			}
 			else if (state.equals("GET_CONFIG") || state.equals("ASSIGN_IP")){ //don't show them in the notification message
 			}
diff --git a/app/src/main/java/se/leap/openvpn/ProfileManager.java b/app/src/main/java/se/leap/openvpn/ProfileManager.java
index b9eb3ab6..07a4087a 100644
--- a/app/src/main/java/se/leap/openvpn/ProfileManager.java
+++ b/app/src/main/java/se/leap/openvpn/ProfileManager.java
@@ -71,7 +71,8 @@ public class ProfileManager {
 		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(c);
 		Editor prefsedit = prefs.edit();
 		
-		prefsedit.putString(ONBOOTPROFILE, connectedrofile.getUUIDString());
+		//prefsedit.putString(ONBOOTPROFILE, connectedrofile.getUUIDString());
+		prefsedit.putString(ONBOOTPROFILE, VpnProfile.EXTRA_PROFILEUUID);
 		prefsedit.apply();
 		mLastConnectedVpn=connectedrofile;
 		
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bcb6ecc9..492c48c7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -116,7 +116,6 @@
     <string name="error_no_such_algorithm_exception_user_message">Update the app</string>
     <string name="login_button">Log In</string>
     <string name="logout_button">Log Out</string>
-    <string name="danger_checkbox">Skip security check</string>
     <string name="setup_error_title">Configuration Error</string>
     <string name="setup_error_configure_button">Configure</string>
     <string name="setup_error_close_button">Exit</string>
diff --git a/app/src/release/java/se/leap/bitmaskclient/ConfigurationWizard.java b/app/src/release/java/se/leap/bitmaskclient/ConfigurationWizard.java
new file mode 100644
index 00000000..a6b009e3
--- /dev/null
+++ b/app/src/release/java/se/leap/bitmaskclient/ConfigurationWizard.java
@@ -0,0 +1,588 @@
+/**

+ * Copyright (c) 2013 LEAP Encryption Access Project and contributers

+ * 

+ * This program is free software: you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as published by

+ * the Free Software Foundation, either version 3 of the License, or

+ * (at your option) any later version.

+ *

+ * This program is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

+ * GNU General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License

+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

+ */

+ package se.leap.bitmaskclient;

+

+
+
+
+

+

+import android.app.Activity;

+import android.app.DialogFragment;

+import android.app.Fragment;

+import android.app.FragmentManager;

+import android.app.FragmentTransaction;

+import android.content.BroadcastReceiver;

+import android.content.Context;

+import android.content.Intent;

+import android.content.IntentFilter;

+import android.content.SharedPreferences;

+import android.content.res.AssetManager;

+import android.os.Bundle;

+import android.os.Handler;

+import android.util.Log;

+import android.view.Display;

+import android.view.Menu;

+import android.view.MenuItem;

+import android.view.View.MeasureSpec;

+import android.view.View;

+import android.view.ViewGroup;

+import android.view.WindowManager;

+import android.widget.ListAdapter;

+import android.widget.ListView;

+import android.widget.ProgressBar;

+import android.widget.ProgressBar;

+import android.widget.RelativeLayout;

+import android.widget.TextView;

+import java.io.IOException;

+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Iterator;

+import org.json.JSONException;

+import org.json.JSONObject;

+import se.leap.bitmaskclient.DownloadFailedDialog.DownloadFailedDialogInterface;
+import se.leap.bitmaskclient.NewProviderDialog.NewProviderDialogInterface;
+import se.leap.bitmaskclient.ProviderAPIResultReceiver.Receiver;
+import se.leap.bitmaskclient.ProviderDetailFragment.ProviderDetailFragmentInterface;
+import se.leap.bitmaskclient.ProviderListContent.ProviderItem;
+import se.leap.bitmaskclient.R;
+

+/**

+ * Activity that builds and shows the list of known available providers.

+ * 

+ * It also allows the user to enter custom providers with a button.

+ * 

+ * @author parmegv

+ *

+ */

+public class ConfigurationWizard extends Activity

+implements ProviderListFragment.Callbacks, NewProviderDialogInterface, ProviderDetailFragmentInterface, DownloadFailedDialogInterface, Receiver {

+

+	private ProgressBar mProgressBar;

+	private TextView progressbar_description;

+	private ProviderListFragment provider_list_fragment;

+	private Intent mConfigState = new Intent();

+	

+	final public static String TAG = "se.leap.bitmaskclient.ConfigurationWizard";

+	final public static String TYPE_OF_CERTIFICATE = "type_of_certificate";

+	final public static String ANON_CERTIFICATE = "anon_certificate";

+	final public static String AUTHED_CERTIFICATE = "authed_certificate";

+

+	final protected static String PROVIDER_SET = "PROVIDER SET";

+	final protected static String SERVICES_RETRIEVED = "SERVICES RETRIEVED";

+    final protected static String ASSETS_URL_FOLDER = "urls";
+    

+    public ProviderAPIResultReceiver providerAPI_result_receiver;

+    private ProviderAPIBroadcastReceiver_Update providerAPI_broadcast_receiver_update;
+
+    private static SharedPreferences preferences;

+    private static boolean setting_up_provider = false;
+    

+    @Override

+    protected void onCreate(Bundle savedInstanceState) {

+        super.onCreate(savedInstanceState);

+	    preferences = getSharedPreferences(Dashboard.SHARED_PREFERENCES, MODE_PRIVATE);

+        

+        setContentView(R.layout.configuration_wizard_activity);

+	    mProgressBar = (ProgressBar) findViewById(R.id.progressbar_configuration_wizard);

+	    mProgressBar.setVisibility(ProgressBar.INVISIBLE);

+	    progressbar_description = (TextView) findViewById(R.id.progressbar_description);

+	    progressbar_description.setVisibility(TextView.INVISIBLE);

+        providerAPI_result_receiver = new ProviderAPIResultReceiver(new Handler());

+        providerAPI_result_receiver.setReceiver(this);

+	    providerAPI_broadcast_receiver_update = new ProviderAPIBroadcastReceiver_Update();

+	    IntentFilter update_intent_filter = new IntentFilter(ProviderAPI.UPDATE_PROGRESSBAR);

+	    update_intent_filter.addCategory(Intent.CATEGORY_DEFAULT);

+	    registerReceiver(providerAPI_broadcast_receiver_update, update_intent_filter);

+

+	    loadPreseededProviders();

+        

+        // Only create our fragments if we're not restoring a saved instance

+        if ( savedInstanceState == null ){

+        	// TODO Some welcome screen?

+        	// We will need better flow control when we have more Fragments (e.g. user auth)

+        	provider_list_fragment = ProviderListFragment.newInstance();

+    		Bundle arguments = new Bundle();

+    		int configuration_wizard_request_code = getIntent().getIntExtra(Dashboard.REQUEST_CODE, -1);

+    		if(configuration_wizard_request_code == Dashboard.SWITCH_PROVIDER) {

+    			arguments.putBoolean(ProviderListFragment.SHOW_ALL_PROVIDERS, true);

+    		}

+			provider_list_fragment.setArguments(arguments);

+

+    		FragmentManager fragmentManager = getFragmentManager();

+    		fragmentManager.beginTransaction()

+    		.replace(R.id.configuration_wizard_layout, provider_list_fragment, ProviderListFragment.TAG)

+    		.commit();

+        }

+

+        // TODO: If exposing deep links into your app, handle intents here.

+    }

+

+	@Override

+	protected void onDestroy() {

+		super.onDestroy();

+		unregisterReceiver(providerAPI_broadcast_receiver_update);

+	}

+

+    public void refreshProviderList(int top_padding) {

+    	ProviderListFragment new_provider_list_fragment = new ProviderListFragment();

+		Bundle top_padding_bundle = new Bundle();

+		top_padding_bundle.putInt(ProviderListFragment.TOP_PADDING, top_padding);

+		new_provider_list_fragment.setArguments(top_padding_bundle);

+		

+		FragmentManager fragmentManager = getFragmentManager();

+		fragmentManager.beginTransaction()

+		.replace(R.id.configuration_wizard_layout, new_provider_list_fragment, ProviderListFragment.TAG)

+		.commit();

+    }

+    

+	@Override

+	public void onReceiveResult(int resultCode, Bundle resultData) {

+		if(resultCode == ProviderAPI.PROVIDER_OK) {

+				mConfigState.setAction(PROVIDER_SET);

+

+				if (preferences.getBoolean(EIP.ALLOWED_ANON, false)){

+					mConfigState.putExtra(SERVICES_RETRIEVED, true);

+					downloadAnonCert();

+				} else {

+					mProgressBar.incrementProgressBy(1);

+				    mProgressBar.setVisibility(ProgressBar.GONE);

+				    progressbar_description.setVisibility(TextView.GONE);

+					setResult(RESULT_OK);
+					showProviderDetails(getCurrentFocus());

+				}
+		} else if(resultCode == ProviderAPI.PROVIDER_NOK) {

+			//refreshProviderList(0);
+			String reason_to_fail = resultData.getString(ProviderAPI.ERRORS);

+			showDownloadFailedDialog(getCurrentFocus(), reason_to_fail);

+			mProgressBar.setVisibility(ProgressBar.GONE);

+			progressbar_description.setVisibility(TextView.GONE);
+			preferences.edit().remove(Provider.KEY).commit();

+			setting_up_provider = false;
+			setResult(RESULT_CANCELED, mConfigState);

+		}

+		else if(resultCode == ProviderAPI.CORRECTLY_DOWNLOADED_CERTIFICATE) {

+			mProgressBar.incrementProgressBy(1);

+		    mProgressBar.setVisibility(ProgressBar.GONE);

+		    progressbar_description.setVisibility(TextView.GONE);

+		    //refreshProviderList(0);

+		    setResult(RESULT_OK);

+		    showProviderDetails(getCurrentFocus());

+		} else if(resultCode == ProviderAPI.INCORRECTLY_DOWNLOADED_CERTIFICATE) {

+			//refreshProviderList(0);

+			mProgressBar.setVisibility(ProgressBar.GONE);

+		    progressbar_description.setVisibility(TextView.GONE);

+			//Toast.makeText(getApplicationContext(), R.string.incorrectly_downloaded_certificate_message, Toast.LENGTH_LONG).show();

+        	setResult(RESULT_CANCELED, mConfigState);

+		} else if(resultCode == AboutActivity.VIEWED) {
+		    // Do nothing, right now
+		    // I need this for CW to wait for the About activity to end before going back to Dashboard.
+		}
+	}

+

+	/**

+     * Callback method from {@link ProviderListFragment.Callbacks}

+     * indicating that the item with the given ID was selected.

+     */

+    @Override

+    public void onItemSelected(String id) {

+	    //TODO Code 2 pane view

+	//	resetOldConnection();

+	    ProviderItem selected_provider = getProvider(id);

+	    int provider_index = getProviderIndex(id);

+
+
+	    startProgressBar(provider_index+1);
+	    provider_list_fragment.hideAllBut(provider_index);
+
+	    setUpProvider(selected_provider.providerMainUrl());
+    }

+    

+    @Override

+    public void onBackPressed() {

+    	if(setting_up_provider) {
+    		stopSettingUpProvider();
+    	} else {

+    		usualBackButton();
+    	}
+    }
+    

+    private void stopSettingUpProvider() {

+		ProviderAPI.stop();

+		mProgressBar.setVisibility(ProgressBar.GONE);

+		mProgressBar.setProgress(0);

+		progressbar_description.setVisibility(TextView.GONE);

+		getSharedPreferences(Dashboard.SHARED_PREFERENCES, Activity.MODE_PRIVATE).edit().remove(Provider.KEY).commit();

+    	setting_up_provider = false;

+	showAllProviders();
+    }

+    

+    private void usualBackButton() {

+		try {

+			boolean is_provider_set_up = new JSONObject(preferences.getString(Provider.KEY, "no provider")) != null ? true : false;

+			boolean is_provider_set_up_truly = new JSONObject(preferences.getString(Provider.KEY, "no provider")).length() != 0 ? true : false;

+			if(!is_provider_set_up || !is_provider_set_up_truly) {

+				askDashboardToQuitApp();

+			} else {

+				setResult(RESULT_OK);

+			}

+		} catch (JSONException e) {

+			askDashboardToQuitApp();

+			super.onBackPressed();

+			e.printStackTrace();

+		}

+		super.onBackPressed();

+    }

+    private void askDashboardToQuitApp() {

+		Intent ask_quit = new Intent();

+		ask_quit.putExtra(Dashboard.ACTION_QUIT, Dashboard.ACTION_QUIT);

+		setResult(RESULT_CANCELED, ask_quit);

+    }

+

+    private ProviderItem getProvider(String name) {

+	    Iterator<ProviderItem> providers_iterator = ProviderListContent.ITEMS.iterator();

+	    while(providers_iterator.hasNext()) {

+		    ProviderItem provider = providers_iterator.next();

+		    if(provider.name().equalsIgnoreCase(name)) {

+			    return provider;

+		    }

+	    }

+	    return null;

+    }

+    

+    private String getId(String provider_main_url_string) {
+	try {
+	URL provider_url = new URL(provider_main_url_string);
+	URL aux_provider_url;
+	Iterator<ProviderItem> providers_iterator = ProviderListContent.ITEMS.iterator();
+	while(providers_iterator.hasNext()) {
+	    ProviderItem provider = providers_iterator.next();
+	    aux_provider_url = new URL(provider.providerMainUrl());
+	    if(isSameURL(provider_url, aux_provider_url)) {
+		return provider.name();
+	    }
+	}
+	} catch (MalformedURLException e) {
+	    e.printStackTrace();
+	}
+	return "";
+    }

+
+    /**
+     * Checks, whether 2 urls are pointing to the same location.
+     *
+     * @param url a url
+     * @param baseUrl an other url, that should be compared.
+     * @return true, if the urls point to the same host and port and use the 
+     *         same protocol, false otherwise.
+     */
+    private boolean isSameURL(final URL url, final URL baseUrl) {
+	if (!url.getProtocol().equals(baseUrl.getProtocol())) {
+	    return false;
+	}
+	if (!url.getHost().equals(baseUrl.getHost())) {
+	    return false;
+	}
+	if (url.getPort() != baseUrl.getPort()) {
+	    return false;
+	}
+	return true;
+    }
+	

+	private void startProgressBar() {

+	    mProgressBar.setVisibility(ProgressBar.VISIBLE);

+	    mProgressBar.setProgress(0);

+	    mProgressBar.setMax(3);

+	}

+	

+	private void startProgressBar(int list_item_index) {

+	    mProgressBar.setVisibility(ProgressBar.VISIBLE);

+	    progressbar_description.setVisibility(TextView.VISIBLE);

+	    mProgressBar.setProgress(0);

+	    mProgressBar.setMax(3);

+	    int measured_height = listItemHeight(list_item_index);

+	    mProgressBar.setTranslationY(measured_height);

+	    progressbar_description.setTranslationY(measured_height + mProgressBar.getHeight());

+	}

+

+    private int getProviderIndex(String id) {

+    	int index = 0;

+	    Iterator<ProviderItem> providers_iterator = ProviderListContent.ITEMS.iterator();

+	    while(providers_iterator.hasNext()) {

+		    ProviderItem provider = providers_iterator.next();

+		    if(provider.name().equalsIgnoreCase(id)) {

+			    break;

+		    } else index++;
+	    }

+	    return index;

+    }

+    

+    private int listItemHeight(int list_item_index) {

+        ListView provider_list_view = (ListView)findViewById(android.R.id.list);

+        ListAdapter provider_list_adapter = provider_list_view.getAdapter();

+        View listItem = provider_list_adapter.getView(0, null, provider_list_view);

+        listItem.setLayoutParams(new RelativeLayout.LayoutParams(

+                    RelativeLayout.LayoutParams.WRAP_CONTENT,

+                    RelativeLayout.LayoutParams.WRAP_CONTENT));

+        WindowManager wm = (WindowManager) getApplicationContext()

+                    .getSystemService(Context.WINDOW_SERVICE);

+        Display display = wm.getDefaultDisplay();

+        int screenWidth = display.getWidth(); // deprecated

+

+        int listViewWidth = screenWidth - 10 - 10;

+        int widthSpec = MeasureSpec.makeMeasureSpec(listViewWidth,

+                    MeasureSpec.AT_MOST);

+        listItem.measure(widthSpec, 0);

+

+        return listItem.getMeasuredHeight();

+}

+	

+        /**
+     * Loads providers data from url files contained in the assets folder
+     * @return true if the files were correctly read
+     */
+    private boolean loadPreseededProviders() {
+    	boolean loaded_preseeded_providers = false;
+        String[] urls_filepaths = null;
+	try {
+	    //TODO Put that folder in a better place (also inside the "for")
+	    urls_filepaths = getAssets().list(ASSETS_URL_FOLDER); 
+	    String provider_name = "";
+	    for(String url_filepath : urls_filepaths) {
+		provider_name = url_filepath.subSequence(0, url_filepath.lastIndexOf(".")).toString();
+		String provider_main_url = extractProviderMainUrlFromAssetsFile(ASSETS_URL_FOLDER + "/" + url_filepath);
+		if(getId(provider_main_url).isEmpty())
+		    ProviderListContent.addItem(new ProviderItem(provider_name, provider_main_url));
+		loaded_preseeded_providers = true;

+	    }
+	} catch (IOException e) {
+	    loaded_preseeded_providers = false;
+	}
+	
+	return loaded_preseeded_providers;
+    }
+    
+    private String extractProviderMainUrlFromAssetsFile(String filepath) {
+	String provider_main_url = "";
+	try {	    
+	    InputStream input_stream_file_contents = getAssets().open(filepath);
+	    byte[] urls_file_bytes = new byte[input_stream_file_contents.available()];
+	    input_stream_file_contents.read(urls_file_bytes);
+	    String urls_file_content = new String(urls_file_bytes);
+	    JSONObject file_contents = new JSONObject(urls_file_content);
+	    provider_main_url = file_contents.getString(Provider.MAIN_URL);
+	} catch (JSONException e) {
+	} catch (IOException e) {
+	}
+	return provider_main_url;
+    }
+    
+	/**

+	 * Asks ProviderAPI to download an anonymous (anon) VPN certificate.

+	 */

+	private void downloadAnonCert() {

+		Intent provider_API_command = new Intent(this, ProviderAPI.class);

+

+		Bundle parameters = new Bundle();

+

+		parameters.putString(TYPE_OF_CERTIFICATE, ANON_CERTIFICATE);

+

+		provider_API_command.setAction(ProviderAPI.DOWNLOAD_CERTIFICATE);

+		provider_API_command.putExtra(ProviderAPI.PARAMETERS, parameters);

+		provider_API_command.putExtra(ProviderAPI.RECEIVER_KEY, providerAPI_result_receiver);

+

+		startService(provider_API_command);

+	}

+	

+	/**

+	 * Open the new provider dialog

+	 */

+	public void addAndSelectNewProvider() {

+		FragmentTransaction fragment_transaction = getFragmentManager().beginTransaction();

+		Fragment previous_new_provider_dialog = getFragmentManager().findFragmentByTag(NewProviderDialog.TAG);

+		if (previous_new_provider_dialog != null) {

+			fragment_transaction.remove(previous_new_provider_dialog);

+		}

+		fragment_transaction.addToBackStack(null);

+		

+		DialogFragment newFragment = NewProviderDialog.newInstance();

+		newFragment.show(fragment_transaction, NewProviderDialog.TAG);

+	}

+	

+	/**

+	 * Open the new provider dialog with data

+	 */

+	public void addAndSelectNewProvider(String main_url) {
+		FragmentTransaction fragment_transaction = getFragmentManager().beginTransaction();

+		Fragment previous_new_provider_dialog = getFragmentManager().findFragmentByTag(NewProviderDialog.TAG);

+		if (previous_new_provider_dialog != null) {

+			fragment_transaction.remove(previous_new_provider_dialog);

+		}

+		

+		DialogFragment newFragment = NewProviderDialog.newInstance();

+		Bundle data = new Bundle();

+		data.putString(Provider.MAIN_URL, main_url);

+		newFragment.setArguments(data);

+		newFragment.show(fragment_transaction, NewProviderDialog.TAG);

+	}

+	

+	/**

+	 * Once selected a provider, this fragment offers the user to log in, 

+	 * use it anonymously (if possible) 

+	 * or cancel his/her election pressing the back button.

+	 * @param view

+	 * @param reason_to_fail 

+	 */

+	public void showDownloadFailedDialog(View view, String reason_to_fail) {

+		FragmentTransaction fragment_transaction = getFragmentManager().beginTransaction();

+		Fragment previous_provider_details_dialog = getFragmentManager().findFragmentByTag(DownloadFailedDialog.TAG);

+		if (previous_provider_details_dialog != null) {

+			fragment_transaction.remove(previous_provider_details_dialog);

+		}

+		fragment_transaction.addToBackStack(null);

+		

+		DialogFragment newFragment = DownloadFailedDialog.newInstance(reason_to_fail);

+		newFragment.show(fragment_transaction, DownloadFailedDialog.TAG);

+	}

+	

+	/**

+	 * Once selected a provider, this fragment offers the user to log in, 

+	 * use it anonymously (if possible) 

+	 * or cancel his/her election pressing the back button.

+	 * @param view

+	 */

+	public void showProviderDetails(View view) {

+		if(setting_up_provider) {

+			FragmentTransaction fragment_transaction = getFragmentManager().beginTransaction();

+			Fragment previous_provider_details_dialog = getFragmentManager().findFragmentByTag(ProviderDetailFragment.TAG);

+			if (previous_provider_details_dialog != null) {

+				fragment_transaction.remove(previous_provider_details_dialog);

+			}

+			fragment_transaction.addToBackStack(null);

+

+			DialogFragment newFragment = ProviderDetailFragment.newInstance();

+			newFragment.show(fragment_transaction, ProviderDetailFragment.TAG);

+		}

+	}

+

+	public void showAndSelectProvider(String provider_main_url) {

+	    if(getId(provider_main_url).isEmpty())
+		showProvider(provider_main_url);

+	    autoSelectProvider(provider_main_url);
+	}

+	

+	private void showProvider(final String provider_main_url) {
+		String provider_name = provider_main_url.replaceFirst("http[s]?://", "").replaceFirst("\\/", "_");

+		ProviderItem added_provider = new ProviderItem(provider_name, provider_main_url);

+		provider_list_fragment.addItem(added_provider);

+	}

+	

+	private void autoSelectProvider(String provider_main_url) {
+		onItemSelected(getId(provider_main_url));

+	}

+	

+	/**

+	 * Asks ProviderAPI to download a new provider.json file

+	 * @param provider_name

+	 * @param provider_main_url

+	 */

+	public void setUpProvider(String provider_main_url) {

+		Intent provider_API_command = new Intent(this, ProviderAPI.class);

+		Bundle parameters = new Bundle();

+		parameters.putString(Provider.MAIN_URL, provider_main_url);

+

+		provider_API_command.setAction(ProviderAPI.SET_UP_PROVIDER);

+		provider_API_command.putExtra(ProviderAPI.PARAMETERS, parameters);

+		provider_API_command.putExtra(ProviderAPI.RECEIVER_KEY, providerAPI_result_receiver);
+
+		startService(provider_API_command);

+		setting_up_provider = true;
+	}
+
+	public void retrySetUpProvider() {
+		cancelSettingUpProvider();
+		if(!ProviderAPI.caCertDownloaded()) {
+			addAndSelectNewProvider(ProviderAPI.lastProviderMainUrl());
+		} else {
+			Intent provider_API_command = new Intent(this, ProviderAPI.class);
+
+			provider_API_command.setAction(ProviderAPI.SET_UP_PROVIDER);
+			provider_API_command.putExtra(ProviderAPI.RECEIVER_KEY, providerAPI_result_receiver);
+
+			startService(provider_API_command);
+		}
+	}
+	@Override

+	public boolean onCreateOptionsMenu(Menu menu) {

+		getMenuInflater().inflate(R.menu.configuration_wizard_activity, menu);

+		return true;

+	}

+	

+	@Override

+	public boolean onOptionsItemSelected(MenuItem item){

+		switch (item.getItemId()){

+		case R.id.about_leap:
+		    startActivityForResult(new Intent(this, AboutActivity.class), 0);
+			return true;
+		case R.id.new_provider:

+			addAndSelectNewProvider();

+			return true;

+		default:

+			return super.onOptionsItemSelected(item);

+		}

+	}

+		

+	public void showAllProviders() {

+		provider_list_fragment = (ProviderListFragment) getFragmentManager().findFragmentByTag(ProviderListFragment.TAG);

+		if(provider_list_fragment != null)

+			provider_list_fragment.unhideAll();

+	}

+	

+	public void cancelSettingUpProvider() {

+		provider_list_fragment = (ProviderListFragment) getFragmentManager().findFragmentByTag(ProviderListFragment.TAG);

+		if(provider_list_fragment != null) {
+			provider_list_fragment.removeLastItem();

+		}

+		preferences.edit().remove(Provider.KEY).remove(EIP.ALLOWED_ANON).remove(EIP.KEY).commit();

+	}

+

+	@Override

+	public void login() {

+		Intent ask_login = new Intent();

+		ask_login.putExtra(LogInDialog.VERB, LogInDialog.VERB);

+		setResult(RESULT_OK, ask_login);

+		setting_up_provider = false;

+		finish();

+	}

+

+	@Override

+	public void use_anonymously() {

+		setResult(RESULT_OK);

+		setting_up_provider = false;

+		finish();

+	}

+

+	public class ProviderAPIBroadcastReceiver_Update extends BroadcastReceiver {

+

+		@Override

+		public void onReceive(Context context, Intent intent) {

+			int update = intent.getIntExtra(ProviderAPI.CURRENT_PROGRESS, 0);

+			mProgressBar.setProgress(update);

+		}

+	}

+}

diff --git a/app/src/release/java/se/leap/bitmaskclient/NewProviderDialog.java b/app/src/release/java/se/leap/bitmaskclient/NewProviderDialog.java
new file mode 100644
index 00000000..7ed1940e
--- /dev/null
+++ b/app/src/release/java/se/leap/bitmaskclient/NewProviderDialog.java
@@ -0,0 +1,117 @@
+/**
+ * Copyright (c) 2013 LEAP Encryption Access Project and contributers
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+ package se.leap.bitmaskclient;
+
+import se.leap.bitmaskclient.ProviderListContent.ProviderItem;
+import se.leap.bitmaskclient.R;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.CheckBox;
+import android.widget.EditText;
+import android.widget.Toast;
+
+/**
+ * Implements the new custom provider dialog.
+ * 
+ * @author parmegv
+ *
+ */
+public class NewProviderDialog extends DialogFragment {
+
+    final public static String TAG = "newProviderDialog";
+        
+	public interface NewProviderDialogInterface {
+        public void showAndSelectProvider(String url_provider);
+    }
+
+	NewProviderDialogInterface interface_with_ConfigurationWizard;
+
+	/**
+	 * @return a new instance of this DialogFragment.
+	 */
+	public static DialogFragment newInstance() {
+		NewProviderDialog dialog_fragment = new NewProviderDialog();
+		return dialog_fragment;
+	}
+	
+    @Override
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+        try {
+        	interface_with_ConfigurationWizard = (NewProviderDialogInterface) activity;
+        } catch (ClassCastException e) {
+            throw new ClassCastException(activity.toString()
+                    + " must implement NoticeDialogListener");
+        }
+    }
+
+    @Override
+	public Dialog onCreateDialog(Bundle savedInstanceState) {
+		AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+		LayoutInflater inflater = getActivity().getLayoutInflater();
+		View new_provider_dialog_view = inflater.inflate(R.layout.new_provider_dialog, null);
+		final EditText url_input_field = (EditText)new_provider_dialog_view.findViewById(R.id.new_provider_url);
+		if(getArguments() != null && getArguments().containsKey(Provider.MAIN_URL)) {
+			url_input_field.setText(getArguments().getString(Provider.MAIN_URL));
+		}
+		
+		builder.setView(new_provider_dialog_view)
+			.setMessage(R.string.introduce_new_provider)
+			.setPositiveButton(R.string.save, new DialogInterface.OnClickListener() {
+				public void onClick(DialogInterface dialog, int id) {
+					String entered_url = url_input_field.getText().toString().trim();
+					if(!entered_url.startsWith("https://")) {
+						if (entered_url.startsWith("http://")){
+							entered_url = entered_url.substring("http://".length());
+						}
+						entered_url = "https://".concat(entered_url);
+					}
+					if(validURL(entered_url)) {
+						interface_with_ConfigurationWizard.showAndSelectProvider(entered_url);
+						Toast.makeText(getActivity().getApplicationContext(), R.string.valid_url_entered, Toast.LENGTH_LONG).show();
+					} else {
+						url_input_field.setText("");
+						Toast.makeText(getActivity().getApplicationContext(), R.string.not_valid_url_entered, Toast.LENGTH_LONG).show();;
+					}
+				}
+			})
+			.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+				public void onClick(DialogInterface dialog, int id) {
+					dialog.cancel();
+				}
+			});
+		// Create the AlertDialog object and return it
+		return builder.create();
+	}
+
+    /**
+     * Checks if the entered url is valid or not.
+     * @param entered_url
+     * @return true if it's not empty nor contains only the protocol.
+     */
+	boolean validURL(String entered_url) {
+		//return !entered_url.isEmpty() && entered_url.matches("http[s]?://.+") && !entered_url.replaceFirst("http[s]?://", "").isEmpty();
+		return android.util.Patterns.WEB_URL.matcher(entered_url).matches();
+	}
+}
diff --git a/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java b/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java
new file mode 100644
index 00000000..150b27b2
--- /dev/null
+++ b/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java
@@ -0,0 +1,860 @@
+/**
+ * Copyright (c) 2013 LEAP Encryption Access Project and contributers
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+ package se.leap.bitmaskclient;
+
+import java.io.DataOutputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.math.BigInteger;
+import java.net.CookieHandler;
+import java.net.CookieManager;
+import java.net.CookiePolicy;
+import java.net.MalformedURLException;
+import java.net.SocketTimeoutException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.net.URLEncoder;
+import java.net.UnknownHostException;
+import java.security.KeyManagementException;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+import java.security.cert.CertificateEncodingException;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import java.security.interfaces.RSAPrivateKey;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Scanner;
+
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.KeyManager;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSession;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactory;
+import javax.net.ssl.X509TrustManager;
+
+import org.apache.http.client.ClientProtocolException;
+import org.jboss.security.srp.SRPParameters;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import se.leap.bitmaskclient.R;
+import se.leap.bitmaskclient.ProviderListContent.ProviderItem;
+import android.app.IntentService;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.ResultReceiver;
+import android.util.Base64;
+import android.util.Log;
+
+
+/**
+ * Implements HTTP api methods used to manage communications with the provider server.
+ * 
+ * It's an IntentService because it downloads data from the Internet, so it operates in the background.
+ *  
+ * @author parmegv
+ * @author MeanderingCode
+ *
+ */
+public class ProviderAPI extends IntentService {
+	
+	private Handler mHandler;
+
+    final public static String
+    SET_UP_PROVIDER = "setUpProvider",
+    DOWNLOAD_NEW_PROVIDER_DOTJSON = "downloadNewProviderDotJSON",
+    SRP_REGISTER = "srpRegister",
+    SRP_AUTH = "srpAuth",
+    LOG_OUT = "logOut",
+    DOWNLOAD_CERTIFICATE = "downloadUserAuthedCertificate",
+    PARAMETERS = "parameters",
+    RESULT_KEY = "result",
+    RECEIVER_KEY = "receiver",
+    SESSION_ID_COOKIE_KEY = "session_id_cookie_key",
+    SESSION_ID_KEY = "session_id",
+    ERRORS = "errors",
+    UPDATE_PROGRESSBAR = "update_progressbar",
+    CURRENT_PROGRESS = "current_progress",
+    TAG = "provider_api_tag"
+    ;
+
+    final public static int
+    CUSTOM_PROVIDER_ADDED = 0,
+    SRP_AUTHENTICATION_SUCCESSFUL = 3,
+    SRP_AUTHENTICATION_FAILED = 4,
+    SRP_REGISTRATION_SUCCESSFUL = 5,
+    SRP_REGISTRATION_FAILED = 6,
+    LOGOUT_SUCCESSFUL = 7,
+    LOGOUT_FAILED = 8,
+    CORRECTLY_DOWNLOADED_CERTIFICATE = 9,
+    INCORRECTLY_DOWNLOADED_CERTIFICATE = 10,
+    PROVIDER_OK = 11,
+    PROVIDER_NOK = 12,
+    CORRECTLY_DOWNLOADED_ANON_CERTIFICATE = 13,
+    INCORRECTLY_DOWNLOADED_ANON_CERTIFICATE = 14
+    ;
+
+    private static boolean 
+    CA_CERT_DOWNLOADED = false,
+    PROVIDER_JSON_DOWNLOADED = false,
+    EIP_SERVICE_JSON_DOWNLOADED = false
+    ;
+    
+    private static String last_provider_main_url;
+    private static boolean setting_up_provider = true;
+    
+    public static void stop() {
+    	setting_up_provider = false;
+    }
+
+	public ProviderAPI() {
+		super("ProviderAPI");
+		Log.v("ClassName", "Provider API");
+	}
+	
+	@Override
+	public void onCreate() {
+		super.onCreate();
+		mHandler = new Handler();
+		CookieHandler.setDefault(new CookieManager(null, CookiePolicy.ACCEPT_ORIGINAL_SERVER) );
+	}
+	
+	public static String lastProviderMainUrl() {
+		return last_provider_main_url;
+	}
+	
+	private String formatErrorMessage(final int toast_string_id) {
+		return "{ \"" + ERRORS + "\" : \""+getResources().getString(toast_string_id)+"\" }";
+	}
+
+	@Override
+	protected void onHandleIntent(Intent command) {
+		final ResultReceiver receiver = command.getParcelableExtra(RECEIVER_KEY);
+		String action = command.getAction();
+		Bundle parameters = command.getBundleExtra(PARAMETERS);
+		setting_up_provider = true;
+		
+		if(action.equalsIgnoreCase(SET_UP_PROVIDER)) {
+			Bundle result = setUpProvider(parameters);
+			if(setting_up_provider) {
+				if(result.getBoolean(RESULT_KEY)) {
+					receiver.send(PROVIDER_OK, result);
+				} else { 
+					receiver.send(PROVIDER_NOK, result);
+				}
+			}
+		} else if (action.equalsIgnoreCase(SRP_AUTH)) {
+			Bundle session_id_bundle = authenticateBySRP(parameters);
+				if(session_id_bundle.getBoolean(RESULT_KEY)) {
+					receiver.send(SRP_AUTHENTICATION_SUCCESSFUL, session_id_bundle);
+				} else {
+					receiver.send(SRP_AUTHENTICATION_FAILED, session_id_bundle);
+				}
+		} else if (action.equalsIgnoreCase(LOG_OUT)) {
+				if(logOut(parameters)) {
+					receiver.send(LOGOUT_SUCCESSFUL, Bundle.EMPTY);
+				} else {
+					receiver.send(LOGOUT_FAILED, Bundle.EMPTY);
+				}
+		} else if (action.equalsIgnoreCase(DOWNLOAD_CERTIFICATE)) {
+				if(getNewCert(parameters)) {
+					receiver.send(CORRECTLY_DOWNLOADED_CERTIFICATE, Bundle.EMPTY);
+				} else {
+					receiver.send(INCORRECTLY_DOWNLOADED_CERTIFICATE, Bundle.EMPTY);
+				}
+		}
+	}
+	
+	/**
+	 * Starts the authentication process using SRP protocol.
+	 * 
+	 * @param task containing: username, password and api url. 
+	 * @return a bundle with a boolean value mapped to a key named RESULT_KEY, and which is true if authentication was successful. 
+	 */
+	private Bundle authenticateBySRP(Bundle task) {
+		Bundle session_id_bundle = new Bundle();
+		int progress = 0;
+		
+		String username = (String) task.get(LogInDialog.USERNAME);
+		String password = (String) task.get(LogInDialog.PASSWORD);
+		if(validUserLoginData(username, password)) {
+		
+			String authentication_server = (String) task.get(Provider.API_URL);
+
+			SRPParameters params = new SRPParameters(new BigInteger(ConfigHelper.NG_1024, 16).toByteArray(), ConfigHelper.G.toByteArray(), BigInteger.ZERO.toByteArray(), "SHA-256");
+			LeapSRPSession client = new LeapSRPSession(username, password, params);
+			byte[] A = client.exponential();
+			broadcast_progress(progress++);
+			try {
+				JSONObject saltAndB = sendAToSRPServer(authentication_server, username, new BigInteger(1, A).toString(16));
+				if(saltAndB.length() > 0) {
+					String salt = saltAndB.getString(LeapSRPSession.SALT);
+					broadcast_progress(progress++);
+					byte[] Bbytes = new BigInteger(saltAndB.getString("B"), 16).toByteArray();
+					byte[] M1 = client.response(new BigInteger(salt, 16).toByteArray(), Bbytes);
+					if(M1 != null) {
+					broadcast_progress(progress++);
+					JSONObject session_idAndM2 = sendM1ToSRPServer(authentication_server, username, M1);
+					  if(session_idAndM2.has(LeapSRPSession.M2) && client.verify((byte[])session_idAndM2.get(LeapSRPSession.M2))) {
+						  session_id_bundle.putBoolean(RESULT_KEY, true);
+						  broadcast_progress(progress++);
+					  } else {
+						  session_id_bundle.putBoolean(RESULT_KEY, false);
+						  session_id_bundle.putString(getResources().getString(R.string.user_message), getResources().getString(R.string.error_bad_user_password_user_message));
+						  session_id_bundle.putString(LogInDialog.USERNAME, username);
+					  }
+					} else {
+						session_id_bundle.putBoolean(RESULT_KEY, false);
+						session_id_bundle.putString(LogInDialog.USERNAME, username);
+						session_id_bundle.putString(getResources().getString(R.string.user_message), getResources().getString(R.string.error_srp_math_error_user_message));
+					}
+					broadcast_progress(progress++);
+				} else {
+					session_id_bundle.putString(getResources().getString(R.string.user_message), getResources().getString(R.string.error_bad_user_password_user_message));
+					session_id_bundle.putString(LogInDialog.USERNAME, username);
+					session_id_bundle.putBoolean(RESULT_KEY, false);
+				}
+			} catch (ClientProtocolException e) {
+				session_id_bundle.putBoolean(RESULT_KEY, false);
+				session_id_bundle.putString(getResources().getString(R.string.user_message), getResources().getString(R.string.error_client_http_user_message));
+				session_id_bundle.putString(LogInDialog.USERNAME, username);
+			} catch (IOException e) {
+				session_id_bundle.putBoolean(RESULT_KEY, false);
+				session_id_bundle.putString(getResources().getString(R.string.user_message), getResources().getString(R.string.error_io_exception_user_message));
+				session_id_bundle.putString(LogInDialog.USERNAME, username);
+			} catch (JSONException e) {
+				session_id_bundle.putBoolean(RESULT_KEY, false);
+				session_id_bundle.putString(getResources().getString(R.string.user_message), getResources().getString(R.string.error_json_exception_user_message));
+				session_id_bundle.putString(LogInDialog.USERNAME, username);
+			} catch (NoSuchAlgorithmException e) {
+				session_id_bundle.putBoolean(RESULT_KEY, false);
+				session_id_bundle.putString(getResources().getString(R.string.user_message), getResources().getString(R.string.error_no_such_algorithm_exception_user_message));
+				session_id_bundle.putString(LogInDialog.USERNAME, username);
+			} catch (KeyManagementException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			} catch (KeyStoreException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			} catch (CertificateException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		} else {
+			if(!wellFormedPassword(password)) {
+				session_id_bundle.putBoolean(RESULT_KEY, false);
+				session_id_bundle.putString(LogInDialog.USERNAME, username);
+				session_id_bundle.putBoolean(LogInDialog.PASSWORD_INVALID_LENGTH, true);
+			}
+			if(username.isEmpty()) {
+				session_id_bundle.putBoolean(RESULT_KEY, false);
+				session_id_bundle.putBoolean(LogInDialog.USERNAME_MISSING, true);
+			}
+		}
+		
+		return session_id_bundle;
+	}
+	
+	/**
+	 * Sets up an intent with the progress value passed as a parameter
+	 * and sends it as a broadcast.
+	 * @param progress
+	 */
+	private void broadcast_progress(int progress) {
+		Intent intentUpdate = new Intent();
+		intentUpdate.setAction(UPDATE_PROGRESSBAR);
+		intentUpdate.addCategory(Intent.CATEGORY_DEFAULT);
+		intentUpdate.putExtra(CURRENT_PROGRESS, progress);
+		sendBroadcast(intentUpdate);
+	}
+
+	/**
+	 * Validates parameters entered by the user to log in
+	 * @param entered_username
+	 * @param entered_password
+	 * @return true if both parameters are present and the entered password length is greater or equal to eight (8).
+	 */
+	private boolean validUserLoginData(String entered_username, String entered_password) {
+		return !(entered_username.isEmpty()) && wellFormedPassword(entered_password);
+	}
+
+	/**
+	 * Validates a password
+	 * @param entered_password
+	 * @return true if the entered password length is greater or equal to eight (8).
+	 */
+	private boolean wellFormedPassword(String entered_password) {
+		return entered_password.length() >= 8;
+	}
+
+	/**
+	 * Sends an HTTP POST request to the authentication server with the SRP Parameter A.
+	 * @param server_url
+	 * @param username
+	 * @param clientA First SRP parameter sent 
+	 * @return response from authentication server
+	 * @throws ClientProtocolException
+	 * @throws IOException
+	 * @throws JSONException
+	 * @throws CertificateException 
+	 * @throws NoSuchAlgorithmException 
+	 * @throws KeyStoreException 
+	 * @throws KeyManagementException 
+	 */
+	private JSONObject sendAToSRPServer(String server_url, String username, String clientA) throws ClientProtocolException, IOException, JSONException, KeyManagementException, KeyStoreException, NoSuchAlgorithmException, CertificateException {
+		Map<String, String> parameters = new HashMap<String, String>();
+		parameters.put("login", username);
+		parameters.put("A", clientA);
+		return sendToServer(server_url + "/sessions.json", "POST", parameters);
+		
+		/*HttpPost post = new HttpPost(server_url + "/sessions.json" + "?" + "login=" + username + "&&" + "A=" + clientA);
+		return sendToServer(post);*/
+	}
+
+	/**
+	 * Sends an HTTP PUT request to the authentication server with the SRP Parameter M1 (or simply M).
+	 * @param server_url
+	 * @param username
+	 * @param m1 Second SRP parameter sent 
+	 * @return response from authentication server
+	 * @throws ClientProtocolException
+	 * @throws IOException
+	 * @throws JSONException
+	 * @throws CertificateException 
+	 * @throws NoSuchAlgorithmException 
+	 * @throws KeyStoreException 
+	 * @throws KeyManagementException 
+	 */
+	private JSONObject sendM1ToSRPServer(String server_url, String username, byte[] m1) throws ClientProtocolException, IOException, JSONException, KeyManagementException, KeyStoreException, NoSuchAlgorithmException, CertificateException {
+		Map<String, String> parameters = new HashMap<String, String>();
+		parameters.put("client_auth", new BigInteger(1, ConfigHelper.trim(m1)).toString(16));
+		
+		//HttpPut put = new HttpPut(server_url + "/sessions/" + username +".json" + "?" + "client_auth" + "=" + new BigInteger(1, ConfigHelper.trim(m1)).toString(16));
+		JSONObject json_response = sendToServer(server_url + "/sessions/" + username +".json", "PUT", parameters);
+
+		JSONObject session_idAndM2 = new JSONObject();
+		if(json_response.length() > 0) {
+			byte[] M2_not_trimmed = new BigInteger(json_response.getString(LeapSRPSession.M2), 16).toByteArray();
+			/*Cookie session_id_cookie = LeapHttpClient.getInstance(getApplicationContext()).getCookieStore().getCookies().get(0);
+			session_idAndM2.put(ConfigHelper.SESSION_ID_COOKIE_KEY, session_id_cookie.getName());
+			session_idAndM2.put(ConfigHelper.SESSION_ID_KEY, session_id_cookie.getValue());*/
+			session_idAndM2.put(LeapSRPSession.M2, ConfigHelper.trim(M2_not_trimmed));
+			CookieHandler.setDefault(null); // we don't need cookies anymore
+			String token = json_response.getString(LeapSRPSession.TOKEN);
+			LeapSRPSession.setToken(token);
+		}
+		return session_idAndM2;
+	}
+	
+	/**
+	 * Executes an HTTP request expecting a JSON response.
+	 * @param url
+	 * @param request_method
+	 * @param parameters
+	 * @return response from authentication server
+	 * @throws IOException
+	 * @throws JSONException
+	 * @throws MalformedURLException 
+	 * @throws CertificateException 
+	 * @throws NoSuchAlgorithmException 
+	 * @throws KeyStoreException 
+	 * @throws KeyManagementException 
+	 */
+	private JSONObject sendToServer(String url, String request_method, Map<String, String> parameters) throws JSONException, MalformedURLException, IOException, KeyManagementException, KeyStoreException, NoSuchAlgorithmException, CertificateException {
+		JSONObject json_response;
+		InputStream is = null;
+		HttpsURLConnection urlConnection = (HttpsURLConnection)new URL(url).openConnection();
+		urlConnection.setRequestMethod(request_method);
+		urlConnection.setChunkedStreamingMode(0);
+		urlConnection.setSSLSocketFactory(getProviderSSLSocketFactory());
+		try {
+			
+			DataOutputStream writer = new DataOutputStream(urlConnection.getOutputStream());
+			writer.writeBytes(formatHttpParameters(parameters));
+			writer.close();
+
+			is = urlConnection.getInputStream();
+			String plain_response = new Scanner(is).useDelimiter("\\A").next();
+			json_response = new JSONObject(plain_response);
+		} finally {
+			InputStream error_stream = urlConnection.getErrorStream();
+			if(error_stream != null) {
+				String error_response = new Scanner(error_stream).useDelimiter("\\A").next();
+				urlConnection.disconnect();
+				Log.d("Error", error_response);
+				json_response = new JSONObject(error_response);
+				if(!json_response.isNull(ERRORS) || json_response.has(ERRORS)) {
+					return new JSONObject();
+				}
+			}
+		}
+
+		return json_response;
+	}
+	
+	private String formatHttpParameters(Map<String, String> parameters) throws UnsupportedEncodingException	{
+	    StringBuilder result = new StringBuilder();
+	    boolean first = true;
+
+		Iterator<String> parameter_iterator = parameters.keySet().iterator();
+		while(parameter_iterator.hasNext()) {
+			if(first)
+				first = false;
+			else
+				result.append("&&");
+			
+			String key = parameter_iterator.next();
+			String value = parameters.get(key);
+
+	        result.append(URLEncoder.encode(key, "UTF-8"));
+	        result.append("=");
+	        result.append(URLEncoder.encode(value, "UTF-8"));
+		}
+
+	    return result.toString();
+	}
+	
+	
+	
+	
+	/**
+	 * Downloads a provider.json from a given URL, adding a new provider using the given name.  
+	 * @param task containing a boolean meaning if the provider is custom or not, another boolean meaning if the user completely trusts this provider, the provider name and its provider.json url.
+	 * @return a bundle with a boolean value mapped to a key named RESULT_KEY, and which is true if the update was successful. 
+	 */
+	private Bundle setUpProvider(Bundle task) {
+		int progress = 0;
+		Bundle current_download = new Bundle();
+		
+		if(task != null && task.containsKey(Provider.MAIN_URL)) {
+			last_provider_main_url = task.getString(Provider.MAIN_URL);
+			CA_CERT_DOWNLOADED = PROVIDER_JSON_DOWNLOADED = EIP_SERVICE_JSON_DOWNLOADED = false;
+		}
+
+		if(!CA_CERT_DOWNLOADED)
+			current_download = downloadCACert(last_provider_main_url);
+		if(CA_CERT_DOWNLOADED || (current_download.containsKey(RESULT_KEY) && current_download.getBoolean(RESULT_KEY))) {
+			broadcast_progress(progress++);
+			CA_CERT_DOWNLOADED = true;
+			if(!PROVIDER_JSON_DOWNLOADED)
+				current_download = getAndSetProviderJson(last_provider_main_url); 
+			if(PROVIDER_JSON_DOWNLOADED || (current_download.containsKey(RESULT_KEY) && current_download.getBoolean(RESULT_KEY))) {
+				broadcast_progress(progress++);
+				PROVIDER_JSON_DOWNLOADED = true;
+				current_download = getAndSetEipServiceJson(); 
+				if(current_download.containsKey(RESULT_KEY) && current_download.getBoolean(RESULT_KEY)) {
+					broadcast_progress(progress++);
+					EIP_SERVICE_JSON_DOWNLOADED = true;
+				}
+			}
+		}
+		
+		return current_download;
+	}
+	
+	private Bundle downloadCACert(String provider_main_url) {
+		Bundle result = new Bundle();
+		String cert_string = downloadWithCommercialCA(provider_main_url + "/ca.crt");
+
+	    if(validCertificate(cert_string) && setting_up_provider) {
+	    	getSharedPreferences(Dashboard.SHARED_PREFERENCES, MODE_PRIVATE).edit().putString(Provider.CA_CERT, cert_string).commit();
+			result.putBoolean(RESULT_KEY, true);
+		} else {
+			String reason_to_fail = pickErrorMessage(cert_string);
+			result.putString(ERRORS, reason_to_fail);
+			result.putBoolean(RESULT_KEY, false);
+		}
+		
+		return result;
+	}
+	
+
+	public static boolean caCertDownloaded() {
+		return CA_CERT_DOWNLOADED;
+	}
+
+	private boolean validCertificate(String cert_string) {
+		boolean result = false;
+		if(!ConfigHelper.checkErroneousDownload(cert_string)) {
+			X509Certificate certCert = ConfigHelper.parseX509CertificateFromString(cert_string);
+			try {
+				Base64.encodeToString( certCert.getEncoded(), Base64.DEFAULT);
+				result = true;
+			} catch (CertificateEncodingException e) {
+				Log.d(TAG, e.getLocalizedMessage());
+			}
+		}
+		
+		return result;
+	}
+	
+	private Bundle getAndSetProviderJson(String provider_main_url) {
+		Bundle result = new Bundle();
+
+		if(setting_up_provider) {
+			String provider_dot_json_string = downloadWithCommercialCA(provider_main_url + "/provider.json");
+
+			try {
+				JSONObject provider_json = new JSONObject(provider_dot_json_string);
+				String name = provider_json.getString(Provider.NAME);
+				//TODO setProviderName(name);
+
+				getSharedPreferences(Dashboard.SHARED_PREFERENCES, MODE_PRIVATE).edit().putString(Provider.KEY, provider_json.toString()).commit();
+				getSharedPreferences(Dashboard.SHARED_PREFERENCES, MODE_PRIVATE).edit().putBoolean(EIP.ALLOWED_ANON, provider_json.getJSONObject(Provider.SERVICE).getBoolean(EIP.ALLOWED_ANON)).commit();
+
+				result.putBoolean(RESULT_KEY, true);
+			} catch (JSONException e) {
+				//TODO Error message should be contained in that provider_dot_json_string
+				String reason_to_fail = pickErrorMessage(provider_dot_json_string);
+				result.putString(ERRORS, reason_to_fail);
+				result.putBoolean(RESULT_KEY, false);
+			}
+		}
+		return result;
+	}
+
+
+	
+	public static boolean providerJsonDownloaded() {
+		return PROVIDER_JSON_DOWNLOADED;
+	}
+
+	private Bundle getAndSetEipServiceJson() {
+		Bundle result = new Bundle();
+		String eip_service_json_string = "";
+		if(setting_up_provider) {
+			try {
+				JSONObject provider_json = new JSONObject(getSharedPreferences(Dashboard.SHARED_PREFERENCES, MODE_PRIVATE).getString(Provider.KEY, ""));
+				String eip_service_url = provider_json.getString(Provider.API_URL) +  "/" + provider_json.getString(Provider.API_VERSION) + "/" + EIP.SERVICE_API_PATH;
+				eip_service_json_string = downloadWithProviderCA(eip_service_url);
+				JSONObject eip_service_json = new JSONObject(eip_service_json_string);
+				eip_service_json.getInt(Provider.API_RETURN_SERIAL);
+
+				getSharedPreferences(Dashboard.SHARED_PREFERENCES, MODE_PRIVATE).edit().putString(EIP.KEY, eip_service_json.toString()).commit();
+
+				result.putBoolean(RESULT_KEY, true);
+			} catch (JSONException e) {
+				String reason_to_fail = pickErrorMessage(eip_service_json_string);
+				result.putString(ERRORS, reason_to_fail);
+				result.putBoolean(RESULT_KEY, false);
+			}
+		}
+		return result;
+	}
+
+	public static boolean eipServiceDownloaded() {
+		return EIP_SERVICE_JSON_DOWNLOADED;
+	}
+	
+	/**
+	 * Interprets the error message as a JSON object and extract the "errors" keyword pair.
+	 * If the error message is not a JSON object, then it is returned untouched.
+	 * @param string_json_error_message
+	 * @return final error message
+	 */
+	private String pickErrorMessage(String string_json_error_message) {
+		String error_message = "";
+		try {
+			JSONObject json_error_message = new JSONObject(string_json_error_message);
+			error_message = json_error_message.getString(ERRORS);
+		} catch (JSONException e) {
+			// TODO Auto-generated catch block
+			error_message = string_json_error_message;
+		}
+		
+		return error_message;
+	}
+	
+	/**
+	 * Tries to download the contents of the provided url using commercially validated CA certificate from chosen provider.
+	 * 
+	 * @param string_url
+	 * @return
+	 */
+	private String downloadWithCommercialCA(String string_url) {
+		
+		String json_file_content = "";
+		
+		URL provider_url = null;
+		int seconds_of_timeout = 1;
+		try {
+			provider_url = new URL(string_url);
+			URLConnection url_connection = provider_url.openConnection();
+			url_connection.setConnectTimeout(seconds_of_timeout*1000);
+			if(!LeapSRPSession.getToken().isEmpty())
+				url_connection.addRequestProperty(LeapSRPSession.AUTHORIZATION_HEADER, "Token token = " + LeapSRPSession.getToken());
+			json_file_content = new Scanner(url_connection.getInputStream()).useDelimiter("\\A").next();
+		} catch (MalformedURLException e) {
+			json_file_content = formatErrorMessage(R.string.malformed_url);
+		} catch(SocketTimeoutException e) {
+			json_file_content = formatErrorMessage(R.string.server_unreachable_message);
+		} catch (IOException e) {
+			if(provider_url != null) {
+				json_file_content = downloadWithProviderCA(string_url);
+			} else {
+				json_file_content = formatErrorMessage(R.string.certificate_error);
+			}
+		} catch (Exception e) {
+			if(provider_url != null) {
+				json_file_content = downloadWithProviderCA(string_url);
+			}
+		}
+
+		return json_file_content;
+	}
+
+	/**
+	 * Tries to download the contents of the provided url using not commercially validated CA certificate from chosen provider. 
+	 * @param url as a string
+	 * @return an empty string if it fails, the url content if not. 
+	 */
+	private String downloadWithProviderCA(String url_string) {
+		String json_file_content = "";
+
+		try {
+			URL url = new URL(url_string);
+			// Tell the URLConnection to use a SocketFactory from our SSLContext
+			HttpsURLConnection urlConnection =
+					(HttpsURLConnection)url.openConnection();
+			urlConnection.setSSLSocketFactory(getProviderSSLSocketFactory());
+			if(!LeapSRPSession.getToken().isEmpty())
+				urlConnection.addRequestProperty(LeapSRPSession.AUTHORIZATION_HEADER, "Token token=" + LeapSRPSession.getToken());
+			json_file_content = new Scanner(urlConnection.getInputStream()).useDelimiter("\\A").next();
+		} catch (CertificateException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (UnknownHostException e) {
+			json_file_content = formatErrorMessage(R.string.server_unreachable_message);
+		} catch (IOException e) {
+		    // The downloaded certificate doesn't validate our https connection.
+		    json_file_content = formatErrorMessage(R.string.certificate_error);
+		} catch (KeyStoreException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (NoSuchAlgorithmException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (KeyManagementException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return json_file_content;
+	}
+	
+	private javax.net.ssl.SSLSocketFactory getProviderSSLSocketFactory() throws KeyStoreException, NoSuchAlgorithmException, CertificateException, IOException, KeyManagementException {
+		String provider_cert_string = getSharedPreferences(Dashboard.SHARED_PREFERENCES, MODE_PRIVATE).getString(Provider.CA_CERT,"");
+
+		java.security.cert.Certificate provider_certificate = ConfigHelper.parseX509CertificateFromString(provider_cert_string);
+
+		// Create a KeyStore containing our trusted CAs
+		String keyStoreType = KeyStore.getDefaultType();
+		KeyStore keyStore = KeyStore.getInstance(keyStoreType);
+		keyStore.load(null, null);
+		keyStore.setCertificateEntry("provider_ca_certificate", provider_certificate);
+
+		// Create a TrustManager that trusts the CAs in our KeyStore
+		String tmfAlgorithm = TrustManagerFactory.getDefaultAlgorithm();
+		TrustManagerFactory tmf = TrustManagerFactory.getInstance(tmfAlgorithm);
+		tmf.init(keyStore);
+
+		// Create an SSLContext that uses our TrustManager
+		SSLContext context = SSLContext.getInstance("TLS");
+		context.init(null, tmf.getTrustManagers(), null);
+
+		return context.getSocketFactory();
+	}
+	
+	/**
+	 * Downloads the string that's in the url with any certificate.
+	 */
+	private String downloadWithoutCA(String url_string) {
+		String string = "";
+		try {
+
+			HostnameVerifier hostnameVerifier = new HostnameVerifier() {
+				@Override
+				public boolean verify(String hostname, SSLSession session) {
+					return true;
+				}
+			};
+			
+			class DefaultTrustManager implements X509TrustManager {
+
+				@Override
+					public void checkClientTrusted(X509Certificate[] arg0, String arg1) throws CertificateException {}
+
+				@Override
+					public void checkServerTrusted(X509Certificate[] arg0, String arg1) throws CertificateException {}
+
+				@Override
+					public X509Certificate[] getAcceptedIssuers() {
+						return null;
+					}
+			}
+
+			SSLContext context = SSLContext.getInstance("TLS");
+			context.init(new KeyManager[0], new TrustManager[] {new DefaultTrustManager()}, new SecureRandom());
+
+			URL url = new URL(url_string);
+			HttpsURLConnection urlConnection = (HttpsURLConnection)url.openConnection();
+			urlConnection.setSSLSocketFactory(context.getSocketFactory());
+			urlConnection.setHostnameVerifier(hostnameVerifier);
+			string = new Scanner(urlConnection.getInputStream()).useDelimiter("\\A").next();
+			System.out.println("String ignoring certificate = " + string);
+		} catch (FileNotFoundException e) {
+			e.printStackTrace();
+			string = formatErrorMessage(R.string.server_unreachable_message);
+		} catch (IOException e) {
+			// The downloaded certificate doesn't validate our https connection.
+			e.printStackTrace();
+			string = formatErrorMessage(R.string.certificate_error);
+		} catch (NoSuchAlgorithmException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (KeyManagementException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return string;
+	}
+	
+	/**
+	 * Logs out from the api url retrieved from the task.
+	 * @param task containing api url from which the user will log out
+	 * @return true if there were no exceptions
+	 */
+	private boolean logOut(Bundle task) {
+		try {
+			String delete_url = task.getString(Provider.API_URL) + "/logout";
+			int progress = 0;
+
+			HttpsURLConnection urlConnection = (HttpsURLConnection)new URL(delete_url).openConnection();
+			urlConnection.setRequestMethod("DELETE");
+			urlConnection.setSSLSocketFactory(getProviderSSLSocketFactory());
+
+			int responseCode = urlConnection.getResponseCode();
+			broadcast_progress(progress++);
+			LeapSRPSession.setToken("");
+			Log.d(TAG, Integer.toString(responseCode));
+		} catch (ClientProtocolException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			return false;
+		} catch (IndexOutOfBoundsException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			return false;
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			return false;
+		} catch (KeyManagementException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (KeyStoreException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (NoSuchAlgorithmException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (CertificateException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return true;
+	}
+
+	/**
+	 * Downloads a new OpenVPN certificate, attaching authenticated cookie for authenticated certificate.
+	 * 
+	 * @param task containing the type of the certificate to be downloaded
+	 * @return true if certificate was downloaded correctly, false if provider.json is not present in SharedPreferences, or if the certificate url could not be parsed as a URI, or if there was an SSL error. 
+	 */
+	private boolean getNewCert(Bundle task) {
+
+		try {
+			String type_of_certificate = task.getString(ConfigurationWizard.TYPE_OF_CERTIFICATE);
+			JSONObject provider_json = new JSONObject(getSharedPreferences(Dashboard.SHARED_PREFERENCES, MODE_PRIVATE).getString(Provider.KEY, ""));
+			
+			String provider_main_url = provider_json.getString(Provider.API_URL);
+			URL new_cert_string_url = new URL(provider_main_url + "/" + provider_json.getString(Provider.API_VERSION) + "/" + EIP.CERTIFICATE);
+
+			String cert_string = downloadWithProviderCA(new_cert_string_url.toString());
+
+			if(!cert_string.isEmpty()) {
+				if(ConfigHelper.checkErroneousDownload(cert_string)) {
+					String reason_to_fail = provider_json.getString(ERRORS);
+					//result.putString(ConfigHelper.ERRORS_KEY, reason_to_fail);
+					//result.putBoolean(ConfigHelper.RESULT_KEY, false);
+					return false;
+				} else {
+					
+					// API returns concatenated cert & key.  Split them for OpenVPN options
+					String certificateString = null, keyString = null;
+					String[] certAndKey = cert_string.split("(?<=-\n)");
+					for (int i=0; i < certAndKey.length-1; i++){
+						if ( certAndKey[i].contains("KEY") ) {
+							keyString = certAndKey[i++] + certAndKey[i];
+						}
+						else if ( certAndKey[i].contains("CERTIFICATE") ) {
+							certificateString = certAndKey[i++] + certAndKey[i];
+						}
+					}
+					try {
+						RSAPrivateKey keyCert = ConfigHelper.parseRsaKeyFromString(keyString);
+						keyString = Base64.encodeToString( keyCert.getEncoded(), Base64.DEFAULT );
+						getSharedPreferences(Dashboard.SHARED_PREFERENCES, MODE_PRIVATE).edit().putString(EIP.PRIVATE_KEY, "-----BEGIN RSA PRIVATE KEY-----\n"+keyString+"-----END RSA PRIVATE KEY-----").commit();
+
+						X509Certificate certCert = ConfigHelper.parseX509CertificateFromString(certificateString);
+						certificateString = Base64.encodeToString( certCert.getEncoded(), Base64.DEFAULT);
+						getSharedPreferences(Dashboard.SHARED_PREFERENCES, MODE_PRIVATE).edit().putString(EIP.CERTIFICATE, "-----BEGIN CERTIFICATE-----\n"+certificateString+"-----END CERTIFICATE-----").commit();
+						
+						return true;
+					} catch (CertificateException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+						return false;
+					}
+				}
+			} else {
+				return false;
+			}
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			return false;
+		} catch (JSONException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			return false;
+		} /*catch (URISyntaxException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			return false;
+		}*/
+	}
+}
diff --git a/app/src/release/java/se/leap/bitmaskclient/ProviderDetailFragment.java b/app/src/release/java/se/leap/bitmaskclient/ProviderDetailFragment.java
new file mode 100644
index 00000000..42cdd516
--- /dev/null
+++ b/app/src/release/java/se/leap/bitmaskclient/ProviderDetailFragment.java
@@ -0,0 +1,115 @@
+package se.leap.bitmaskclient;

+

+import org.json.JSONException;

+import org.json.JSONObject;

+

+import se.leap.bitmaskclient.R;

+import se.leap.bitmaskclient.ProviderListContent.ProviderItem;

+

+import android.app.Activity;

+import android.app.AlertDialog;

+import android.app.Dialog;

+import android.app.DialogFragment;

+import android.content.DialogInterface;

+import android.content.SharedPreferences;

+import android.os.Bundle;

+import android.view.LayoutInflater;

+import android.view.View;

+import android.widget.TextView;

+

+public class ProviderDetailFragment extends DialogFragment {

+

+    final public static String TAG = "providerDetailFragment";

+    

+	@Override

+	public Dialog onCreateDialog(Bundle savedInstanceState) {

+		AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());

+		try {

+

+			LayoutInflater inflater = getActivity().getLayoutInflater();

+			View provider_detail_view = inflater.inflate(R.layout.provider_detail_fragment, null);

+			

+			JSONObject provider_json = new JSONObject(getActivity().getSharedPreferences(Dashboard.SHARED_PREFERENCES, getActivity().MODE_PRIVATE).getString(Provider.KEY, ""));

+			

+			final TextView domain = (TextView)provider_detail_view.findViewById(R.id.provider_detail_domain);

+			domain.setText(provider_json.getString(Provider.DOMAIN));

+			final TextView name = (TextView)provider_detail_view.findViewById(R.id.provider_detail_name);

+			name.setText(provider_json.getJSONObject(Provider.NAME).getString("en"));

+			final TextView description = (TextView)provider_detail_view.findViewById(R.id.provider_detail_description);

+			description.setText(provider_json.getJSONObject(Provider.DESCRIPTION).getString("en"));

+			

+			builder.setView(provider_detail_view);

+			builder.setTitle(R.string.provider_details_fragment_title);

+			

+			if(anon_allowed(provider_json)) {

+				builder.setPositiveButton(R.string.use_anonymously_button, new DialogInterface.OnClickListener() {

+					public void onClick(DialogInterface dialog, int id) {

+						interface_with_configuration_wizard.use_anonymously();

+					}

+				});

+			}

+

+			if(registration_allowed(provider_json)) {

+				builder.setNegativeButton(R.string.login_button, new DialogInterface.OnClickListener() {

+					public void onClick(DialogInterface dialog, int id) {

+						interface_with_configuration_wizard.login();

+					}

+				});

+			}

+

+			return builder.create();

+		} catch (JSONException e) {

+			return null;

+		}

+	}

+	

+	private boolean anon_allowed(JSONObject provider_json) {

+		try {

+			JSONObject service_description = provider_json.getJSONObject(Provider.SERVICE);

+			return service_description.has(EIP.ALLOWED_ANON) && service_description.getBoolean(EIP.ALLOWED_ANON);

+		} catch (JSONException e) {

+			return false;

+		}

+	}

+	

+	private boolean registration_allowed(JSONObject provider_json) {

+		try {

+			JSONObject service_description = provider_json.getJSONObject(Provider.SERVICE);

+			return service_description.has(Provider.ALLOW_REGISTRATION) && service_description.getBoolean(Provider.ALLOW_REGISTRATION);

+		} catch (JSONException e) {

+			return false;

+		}

+	}

+	

+	@Override

+	public void onCancel(DialogInterface dialog) {

+		super.onCancel(dialog);

+		SharedPreferences.Editor editor = getActivity().getSharedPreferences(Dashboard.SHARED_PREFERENCES, Activity.MODE_PRIVATE).edit();

+		editor.remove(Provider.KEY).remove(EIP.ALLOWED_ANON).remove(EIP.KEY).commit();
+		interface_with_configuration_wizard.showAllProviders();
+	}

+

+	public static DialogFragment newInstance() {

+		ProviderDetailFragment provider_detail_fragment = new ProviderDetailFragment();

+		return provider_detail_fragment;

+	}

+	

+    @Override

+    public void onAttach(Activity activity) {

+        super.onAttach(activity);

+        try {

+        	interface_with_configuration_wizard = (ProviderDetailFragmentInterface) activity;

+        } catch (ClassCastException e) {

+            throw new ClassCastException(activity.toString()

+                    + " must implement LogInDialogListener");

+        }

+    }

+	

+	public interface ProviderDetailFragmentInterface {

+		public void login();

+		public void use_anonymously();

+		public void showAllProviders();

+	}

+	

+	ProviderDetailFragmentInterface interface_with_configuration_wizard;

+}

diff --git a/app/src/release/java/se/leap/bitmaskclient/ProviderListContent.java b/app/src/release/java/se/leap/bitmaskclient/ProviderListContent.java
new file mode 100644
index 00000000..a5402fd8
--- /dev/null
+++ b/app/src/release/java/se/leap/bitmaskclient/ProviderListContent.java
@@ -0,0 +1,85 @@
+/**

+ * Copyright (c) 2013 LEAP Encryption Access Project and contributers

+ * 

+ * This program is free software: you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as published by

+ * the Free Software Foundation, either version 3 of the License, or

+ * (at your option) any later version.

+ *

+ * This program is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

+ * GNU General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License

+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

+ */

+ package se.leap.bitmaskclient;

+

+import java.io.IOException;

+import java.io.InputStream;

+import java.util.ArrayList;

+import java.util.HashMap;

+import java.util.List;

+import java.util.Map;

+import java.net.URL;

+import java.net.MalformedURLException;

+

+import org.json.JSONException;

+import org.json.JSONObject;

+

+/**

+ * Models the provider list shown in the ConfigurationWizard.

+ * 

+ * @author parmegv

+ *

+ */

+public class ProviderListContent {

+

+	public static List<ProviderItem> ITEMS = new ArrayList<ProviderItem>();

+

+	public static Map<String, ProviderItem> ITEM_MAP = new HashMap<String, ProviderItem>();

+

+	/**

+	 * Adds a new provider item to the end of the items map, and to the items list.

+	 * @param item

+	 */

+	public static void addItem(ProviderItem item) {

+		ITEMS.add(item);

+		ITEM_MAP.put(String.valueOf(ITEMS.size()), item);

+	}

+	public static void removeItem(ProviderItem item) {

+		ITEMS.remove(item);

+		ITEM_MAP.remove(item);

+	}

+

+	/**

+	 * A provider item.

+	 */
+	public static class ProviderItem {

+		final public static String CUSTOM = "custom";

+		private String provider_main_url;

+		private String name;
+

+		/**

+		 * @param name of the provider

+		 * @param provider_main_url used to download provider.json file of the provider

+		 */
+		public ProviderItem(String name, String provider_main_url) {

+			this.name = name;

+			this.provider_main_url = provider_main_url;
+		}

+		

+		public String name() { return name; }

+		

+		public String providerMainUrl() { return provider_main_url; }

+		

+		public String domain() {

+			try {

+				return new URL(provider_main_url).getHost();

+			} catch (MalformedURLException e) {

+				return provider_main_url.replaceFirst("http[s]?://", "").replaceFirst("/.*", "");

+			}

+		}

+	}

+}

diff --git a/app/src/release/res/layout-xlarge/new_provider_dialog.xml b/app/src/release/res/layout-xlarge/new_provider_dialog.xml
new file mode 100644
index 00000000..12616625
--- /dev/null
+++ b/app/src/release/res/layout-xlarge/new_provider_dialog.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:textSize="24sp" >
+    
+    <EditText
+        android:id="@+id/new_provider_url"
+        android:inputType="textUri"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:layout_marginLeft="4dp"
+        android:layout_marginRight="4dp"
+        android:textSize="24sp"
+        android:hint="@string/new_provider_uri" />
+
+</LinearLayout>
diff --git a/app/src/release/res/layout/new_provider_dialog.xml b/app/src/release/res/layout/new_provider_dialog.xml
new file mode 100644
index 00000000..36eb0d6a
--- /dev/null
+++ b/app/src/release/res/layout/new_provider_dialog.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical" >
+    
+    <EditText
+        android:id="@+id/new_provider_url"
+        android:inputType="textUri"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:layout_marginLeft="4dp"
+        android:layout_marginRight="4dp"
+        android:layout_marginBottom="4dp"
+        android:hint="@string/new_provider_uri" />
+
+</LinearLayout>