morristech
diff --git a/‎cloudkey-1.1.jar‎
16 Bytes b/‎cloudkey-1.1.jar‎
16 Bytes
diff --git a/‎examples/Example.class‎
424 Bytes b/‎examples/Example.class‎
424 Bytes
diff --git a/‎examples/Example.java‎
Lines changed: 6 additions & 5 deletions b/‎examples/Example.java‎
Lines changed: 6 additions & 5 deletions
diff --git a/‎src/net/dmcloud/util/FAToken.java‎
Lines changed: 6 additions & 3 deletions b/‎src/net/dmcloud/util/FAToken.java‎
Lines changed: 6 additions & 3 deletions
@@ -49,9 +49,9 @@ public static void mediaList() {
 
     public static void testToken() {
         FAToken token1 = new FAToken(user_id, "111111111111111111111111", api_key, 1338947483);
-        token1.setCallback("http://www.dmcloud.com/fa2");
-        token1.setData("firstname", "john");
-        token1.setData("lastname", "doe");
+        token1.setCallbackUrl("http://www.dmcloud.com/fa2");
+        token1.setMeta("firstname", "john");
+        token1.setMeta("lastname", "doe");
         token1.setRight("start_date", "1327946483");
         token1.setRight("end_date", "1338947483");
         token1.setRight("playback_window", "600");
@@ -74,6 +74,7 @@ public static void testToken() {
                 }
             }
         } catch(Exception e) {
+            e.printStackTrace();
             System.out.println("oups");
             System.out.println(e);
         }
@@ -103,8 +104,8 @@ public static void getApiKey() {
 
     public static void main(String[] args) {
         //mediaList();
-        //testToken();
-        getApiKey();
+        testToken();
+        //getApiKey();
     }
 
 }
@@ -17,8 +17,8 @@ public class FAToken {
     private String media_id = null;
     private String api_key = null;
     private String nonce = null;
-    private HashMap<String,String> rights;
-    private HashMap<String,String> meta;
+    private HashMap<String,String> rights = null;
+    private HashMap<String,String> meta = null;
     private String callback_url = null;
     private Integer expires = 0;
     private Integer maxReplay = 0;
@@ -53,9 +53,13 @@ public FAToken(String token, String api_key, Boolean check_auth) throws Exceptio
         }
         if (token_info.containsKey("rights")) {
             rights = (HashMap<String,String>)token_info.get("rights");
+        } else {
+            rights = new HashMap<String,String>();
         }
         if (token_info.containsKey("meta")) {
             meta = (HashMap<String,String>)token_info.get("meta");
+        } else {
+            meta = new HashMap<String,String>();
         }
         if (token_info.containsKey("callback_url")) {
             callback_url = token_info.get("callback_url").toString();
@@ -157,7 +161,6 @@ public String getAuth(DCObject token_info) {
     public String toJSON() throws Exception {
 		ObjectMapper mapper;
         DCObject token_info;
-
         if (nonce == null) {
             genNonce();
         }
Original file line number	Diff line number	Diff line change
`@@ -49,9 +49,9 @@ public static void mediaList() {`
`49`	`49`
`50`	`50`	`public static void testToken() {`
`51`	`51`	`FAToken token1 = new FAToken(user_id, "111111111111111111111111", api_key, 1338947483);`
`52`		`- token1.setCallback("http://www.dmcloud.com/fa2");`
`53`		`- token1.setData("firstname", "john");`
`54`		`- token1.setData("lastname", "doe");`
	`52`	`+ token1.setCallbackUrl("http://www.dmcloud.com/fa2");`
	`53`	`+ token1.setMeta("firstname", "john");`
	`54`	`+ token1.setMeta("lastname", "doe");`
`55`	`55`	`token1.setRight("start_date", "1327946483");`
`56`	`56`	`token1.setRight("end_date", "1338947483");`
`57`	`57`	`token1.setRight("playback_window", "600");`
`@@ -74,6 +74,7 @@ public static void testToken() {`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`	`} catch(Exception e) {`
	`77`	`+ e.printStackTrace();`
`77`	`78`	`System.out.println("oups");`
`78`	`79`	`System.out.println(e);`
`79`	`80`	`}`
`@@ -103,8 +104,8 @@ public static void getApiKey() {`
`103`	`104`
`104`	`105`	`public static void main(String[] args) {`
`105`	`106`	`//mediaList();`
`106`		`- //testToken();`
`107`		`- getApiKey();`
	`107`	`+ testToken();`
	`108`	`+ //getApiKey();`
`108`	`109`	`}`
`109`	`110`
`110`	`111`	`}`