From 629a0b279a80938212b01c096e55c402d91739d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Thu, 10 Jul 2014 12:40:26 +0200
Subject: We don't need support library from Robotium.

I've also fixed a simple test that wasn't letting the suite to finish
correctly.
---
 app/src/main/java/se/leap/bitmaskclient/EIP.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/src/main')

diff --git a/app/src/main/java/se/leap/bitmaskclient/EIP.java b/app/src/main/java/se/leap/bitmaskclient/EIP.java
index 0b43f9e1..7374d5ed 100644
--- a/app/src/main/java/se/leap/bitmaskclient/EIP.java
+++ b/app/src/main/java/se/leap/bitmaskclient/EIP.java
@@ -445,7 +445,7 @@ public final class EIP extends IntentService {
 		} catch (JSONException e) {
 		    Log.v(TAG,"Couldn't read gateway name for profile creation! Returning original name = " + mName);
 		    e.printStackTrace();
-		    return mName;
+		    return (mName != null) ? mName : "";
 		}
 	    }
 
-- 
cgit v1.2.3


From b8165c50328beca82efc93fadfc69a3ac18123dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Tue, 15 Jul 2014 18:29:37 +0200
Subject: Bump build number and version for 0.6.0-RC1

---
 app/src/main/AndroidManifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/src/main')

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f73d59cb..8018f7e8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -17,8 +17,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="se.leap.bitmaskclient"
-    android:versionCode="84"
-    android:versionName="0.5.3" >
+    android:versionCode="85"
+    android:versionName="0.6.0-RC1" >
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-- 
cgit v1.2.3


From dce7064c35a903c7b13e97181c07058e143df621 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Mon, 21 Jul 2014 17:10:31 +0200
Subject: Bump version number for the "meetup" release

---
 app/src/main/AndroidManifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/src/main')

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8018f7e8..a90d6396 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -17,8 +17,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="se.leap.bitmaskclient"
-    android:versionCode="85"
-    android:versionName="0.6.0-RC1" >
+    android:versionCode="86"
+    android:versionName="0.5.4" >
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-- 
cgit v1.2.3