From 3187b2309752de079a5f8d271e8a40fc1bd2be60 Mon Sep 17 00:00:00 2001
From: Nikolai Kristiansen <nikolaik@gmail.com>
Date: Wed, 15 Jan 2014 16:42:58 +0100
Subject: [PATCH] Update after structure changes in JSON-feed

---
 AndroidManifest.xml                                   |  4 ++--
 src/com/studentersamfundet/app/JSONParserProgram.java | 10 ++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index cfe0e3e..b2bc7db 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.studentersamfundet.app"
-      android:versionCode="3"
-      android:versionName="beta1.1">
+      android:versionCode="4"
+      android:versionName="beta1.2">
     <uses-sdk 
         android:minSdkVersion="8" 
         android:targetSdkVersion="17"/>
diff --git a/src/com/studentersamfundet/app/JSONParserProgram.java b/src/com/studentersamfundet/app/JSONParserProgram.java
index 825e6d7..02a9eec 100644
--- a/src/com/studentersamfundet/app/JSONParserProgram.java
+++ b/src/com/studentersamfundet/app/JSONParserProgram.java
@@ -58,7 +58,13 @@ public class JSONParserProgram implements IParser {
 					description = tempJSON.getString("excerpt");
 					date = tempJSON.getString("date");
 					text = tempJSON.getString("content");
-					category = tempJSON.getString("event");
+					
+					/* FIXME is category used? */
+					JSONArray categories = tempJSON.getJSONArray("event_type_parents");
+					category = categories.getString(0);
+					for (int j=1; j > categories.length(); j++) {
+						category += " "+categories.getString(j);
+					} 
 					
 					JSONObject custom = tempJSON.getJSONObject("custom_fields");
 					ticketUrl = custom.getJSONArray("_neuf_events_bs_url").getString(0);					
@@ -74,7 +80,7 @@ public class JSONParserProgram implements IParser {
 						thumb = tempJSON.getString("thumbnail");
 					} else {
 						JSONObject images = attachments.getJSONObject(0).getJSONObject("images");	
-						image = images.getJSONObject("full").getString("url");
+						image = images.getJSONObject("large").getString("url");
 						thumb = images.getJSONObject("thumbnail").getString("url");
 					}