Merge branch 'develop' into release-0.6.0

5 files changed, 35 insertions, 25 deletions

diff --git a/app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java b/app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java
index 5549252e..63c022bf 100644
--- a/app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java
+++ b/app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java
@@ -763,6 +763,8 @@ public class ProviderAPI extends IntentService {
 		} catch (KeyManagementException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
+		} catch (NoSuchElementException e) {
+		    json_file_content = formatErrorMessage(R.string.server_unreachable_message);
 		}
 		return json_file_content;
 	}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1718304d..61b07ff8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -48,7 +48,7 @@
             android:name="se.leap.bitmaskclient.OnBootReceiver"
             android:enabled="true"
             android:permission="android.permission.RECEIVE_BOOT_COMPLETED" >
-          <intent-filter>
+          <intent-filter android:priority="999">
             <action android:name="android.intent.action.BOOT_COMPLETED" />
           </intent-filter>
         </receiver>
diff --git a/app/src/main/java/se/leap/bitmaskclient/EIP.java b/app/src/main/java/se/leap/bitmaskclient/EIP.java
index 2105c67c..40fe7fe1 100644
--- a/app/src/main/java/se/leap/bitmaskclient/EIP.java
+++ b/app/src/main/java/se/leap/bitmaskclient/EIP.java
@@ -44,11 +44,13 @@ import de.blinkt.openvpn.core.ProfileManager;
 import de.blinkt.openvpn.core.VpnStatus.ConnectionStatus;
 import java.io.IOException;
 import java.io.StringReader;
+import java.lang.StringBuffer;
 import java.security.cert.CertificateExpiredException;
 import java.security.cert.CertificateNotYetValidException;
 import java.security.cert.X509Certificate;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.Calendar;
 import java.util.Collection;
 import java.util.HashMap;
@@ -343,31 +345,34 @@ public final class EIP extends IntentService {
 
     private void checkCertValidity() {
 	String certificate_string = getSharedPreferences(Dashboard.SHARED_PREFERENCES, MODE_PRIVATE).getString(CERTIFICATE, "");
-	String date_from_certificate_string = getSharedPreferences(Dashboard.SHARED_PREFERENCES, MODE_PRIVATE).getString(DATE_FROM_CERTIFICATE, Calendar.getInstance().getTime().toString());
-	X509Certificate certificate_x509 = ConfigHelper.parseX509CertificateFromString(certificate_string);
+	if(!certificate_string.isEmpty()) {
+	    String date_from_certificate_string = getSharedPreferences(Dashboard.SHARED_PREFERENCES, MODE_PRIVATE).getString(DATE_FROM_CERTIFICATE, certificate_date_format.format(Calendar.getInstance().getTime()).toString());
+	    X509Certificate certificate_x509 = ConfigHelper.parseX509CertificateFromString(certificate_string);
 
-	Calendar offset_date = Calendar.getInstance();
-	try {
-	    long difference = Math.abs(certificate_date_format.parse(date_from_certificate_string).getTime() - certificate_x509.getNotAfter().getTime())/2;
-	    long current_date_millis = offset_date.getTimeInMillis();
-	    offset_date.setTimeInMillis(current_date_millis + difference);
-	    Log.d(TAG, "certificate not after = " + certificate_x509.getNotAfter());
-	} catch(ParseException e) {
-	    e.printStackTrace();
-	}
+	    Calendar offset_date = Calendar.getInstance();
+	    try {
+		Date date_from_certificate = certificate_date_format.parse(date_from_certificate_string);
+		long difference = Math.abs(date_from_certificate.getTime() - certificate_x509.getNotAfter().getTime())/2;
+		long current_date_millis = offset_date.getTimeInMillis();
+		offset_date.setTimeInMillis(current_date_millis + difference);
+		Log.d(TAG, "certificate not after = " + certificate_x509.getNotAfter());
+	    } catch(ParseException e) {
+		e.printStackTrace();
+	    }
 	
-	Bundle result_data = new Bundle();
-	result_data.putString(REQUEST_TAG, ACTION_CHECK_CERT_VALIDITY);
-	try {
-	    Log.d(TAG, "offset_date = " + offset_date.getTime().toString());
-	    certificate_x509.checkValidity(offset_date.getTime());
-	    mReceiver.send(Activity.RESULT_OK, result_data);
-	    Log.d(TAG, "Valid certificate");
-	} catch(CertificateExpiredException e) {
-	    mReceiver.send(Activity.RESULT_CANCELED, result_data);
-	    Log.d(TAG, "Updating certificate");
-	} catch(CertificateNotYetValidException e) {
-	    mReceiver.send(Activity.RESULT_CANCELED, result_data);
+	    Bundle result_data = new Bundle();
+	    result_data.putString(REQUEST_TAG, ACTION_CHECK_CERT_VALIDITY);
+	    try {
+		Log.d(TAG, "offset_date = " + offset_date.getTime().toString());
+		certificate_x509.checkValidity(offset_date.getTime());
+		mReceiver.send(Activity.RESULT_OK, result_data);
+		Log.d(TAG, "Valid certificate");
+	    } catch(CertificateExpiredException e) {
+		mReceiver.send(Activity.RESULT_CANCELED, result_data);
+		Log.d(TAG, "Updating certificate");
+	    } catch(CertificateNotYetValidException e) {
+		mReceiver.send(Activity.RESULT_CANCELED, result_data);
+	    }
 	}
     }
 
diff --git a/app/src/main/java/se/leap/bitmaskclient/EipServiceFragment.java b/app/src/main/java/se/leap/bitmaskclient/EipServiceFragment.java
index 879d4dcd..09f9dbdb 100644
--- a/app/src/main/java/se/leap/bitmaskclient/EipServiceFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/EipServiceFragment.java
@@ -212,7 +212,7 @@ public class EipServiceFragment extends Fragment implements StateListener, OnChe
 	boolean isNewLevel = EIP.lastConnectionStatusLevel != level;
 	boolean justDecidedOnDisconnect = EIP.lastConnectionStatusLevel == ConnectionStatus.UNKNOWN_LEVEL;
 	Log.d(TAG, "update state with level " + level);
-	if(isNewLevel && !justDecidedOnDisconnect) {
+	if(!justDecidedOnDisconnect && (isNewLevel || level == ConnectionStatus.LEVEL_CONNECTED)) {
 	    getActivity().runOnUiThread(new Runnable() {
 		    @Override
 		    public void run() {
diff --git a/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java b/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java
index 625125d8..d1627974 100644
--- a/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java
+++ b/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java
@@ -48,6 +48,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Scanner;
+import java.util.NoSuchElementException;
 
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.HttpsURLConnection;
@@ -765,6 +766,8 @@ public class ProviderAPI extends IntentService {
 		} catch (KeyManagementException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
+		} catch (NoSuchElementException e) {
+		    json_file_content = formatErrorMessage(R.string.server_unreachable_message);
 		}
 		return json_file_content;
 	}