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/java/se/leap/bitmaskclient/EIP.java')

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