summaryrefslogtreecommitdiff
path: root/app/src/main/java
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-07-10 12:40:26 +0200
committerParménides GV <parmegv@sdf.org>2014-07-24 16:50:48 +0200
commit629a0b279a80938212b01c096e55c402d91739d4 (patch)
tree5e3a06fa200dc18d3891dddbeb8ee3f0ba04e62b /app/src/main/java
parentc552639de6e6192654c9aea02e89d6541baa3857 (diff)
We don't need support library from Robotium.
I've also fixed a simple test that wasn't letting the suite to finish correctly.
Diffstat (limited to 'app/src/main/java')
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/EIP.java2
1 files changed, 1 insertions, 1 deletions
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 : "";
}
}