summaryrefslogtreecommitdiff
path: root/app/src/main
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-07-24 16:50:58 +0200
committerParménides GV <parmegv@sdf.org>2014-07-24 16:50:58 +0200
commitb28eeb08e8ec3baafdd9388cc5b70c6c84db9cf1 (patch)
tree211e8daff57c173035ea8b75eeff6f72f3f97ed1 /app/src/main
parent66385b8fc376262cad2afd96e8a80aba416e3346 (diff)
parentdce7064c35a903c7b13e97181c07058e143df621 (diff)
Merge branch 'release-0.5.4' into develop
Diffstat (limited to 'app/src/main')
-rw-r--r--app/src/main/AndroidManifest.xml4
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/EIP.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f73d59cb..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="84"
- android:versionName="0.5.3" >
+ android:versionCode="86"
+ android:versionName="0.5.4" >
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
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 : "";
}
}