Merge pull request #9 from ljwolford/android

Android
adlnet · Jun 22, 2015 · 21d0471 · 21d0471
2 parents 79f2fdc + 2047a7e
commit 21d0471
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -2,6 +2,8 @@ jxapi - Experience API Java library
 =====
 [![Build Status](https://travis-ci.org/adlnet/jxapi.png?branch=master)](https://travis-ci.org/adlnet/jxapi)
 
+##### Note: To build jxapi jar with all included dependencies simply run `mvn package`
+
 # StatementClient
 
 To instantiate a new StatementClient you need the URL to an LRS, and a username/password combo that works for HTTP BasicAuth

diff --git a/src/main/java/gov/adlnet/xapi/model/ActivityDefinition.java b/src/main/java/gov/adlnet/xapi/model/ActivityDefinition.java
@@ -203,6 +203,9 @@ public String toString() {
 		return "";
 	}
     public String toString(String langMap) {
-        return name.get(langMap);
+        if (name != null){
+            return name.get(langMap);
+        }
+        return "";
     }
 }