diff --git a/src/com/studentersamfundet/app/DataHandler.java b/src/com/studentersamfundet/app/DataHandler.java index 7791012..3432985 100644 --- a/src/com/studentersamfundet/app/DataHandler.java +++ b/src/com/studentersamfundet/app/DataHandler.java @@ -7,6 +7,8 @@ import java.util.LinkedList; import java.util.Set; import java.util.TreeSet; +import android.util.Log; + public class DataHandler implements Serializable { private static final long serialVersionUID = 6787541405689146002L; @@ -30,13 +32,18 @@ public class DataHandler implements Serializable { Event event = new Event(intId, title, description, date, location, text, category, imageUri); + int regularPrice = 0; + int memberPrice = 0; try { - int regularPrice = Integer.parseInt(priceReg); - int memberPrice = Integer.parseInt(priceMem); - - event.setFbUriStr(fbUriStr); - event.setTicketsInfo(regularPrice, memberPrice, ticketUriStr); - } catch (NumberFormatException e1) { /* Do nothing. */ } + regularPrice = Integer.parseInt(priceReg); + memberPrice = Integer.parseInt(priceMem); + } catch (NumberFormatException e1) { + /* Do nothing. */ + Log.w("TAG", e1.toString()); + } + event.setFbUriStr(fbUriStr); + event.setTicketsInfo(regularPrice, memberPrice, ticketUriStr); + events.add(event); diff --git a/src/com/studentersamfundet/app/Event.java b/src/com/studentersamfundet/app/Event.java index 4a67e65..bece380 100644 --- a/src/com/studentersamfundet/app/Event.java +++ b/src/com/studentersamfundet/app/Event.java @@ -97,7 +97,8 @@ public class Event implements Serializable { Uri ticketUri = null; if (ticketUriStr != null - && ticketUriStr.startsWith("http://") + && (ticketUriStr.startsWith("http://") + || ticketUriStr.startsWith("https://")) && ticketUriStr.length() > 7) { ticketUri = Uri.parse(ticketUriStr); } diff --git a/src/com/studentersamfundet/app/JSONParserProgram.java b/src/com/studentersamfundet/app/JSONParserProgram.java index 7f71075..0934cbd 100644 --- a/src/com/studentersamfundet/app/JSONParserProgram.java +++ b/src/com/studentersamfundet/app/JSONParserProgram.java @@ -61,7 +61,7 @@ public class JSONParserProgram implements IParser { category = tempJSON.getString("event"); tempJSON = tempJSON.getJSONObject("custom_fields"); - ticketUrl = tempJSON.getJSONArray("_neuf_events_bs_url").getString(0); + ticketUrl = tempJSON.getJSONArray("_neuf_events_bs_url").getString(0); fbUrl = tempJSON.getJSONArray("_neuf_events_fb_url").getString(0); location = tempJSON.getJSONArray("_neuf_events_venue").getString(0); priceReg = tempJSON.getJSONArray("_neuf_events_price_regular").getString(0); diff --git a/src/com/studentersamfundet/app/network/ImageLoader.java b/src/com/studentersamfundet/app/network/ImageLoader.java index 6e23786..653e212 100644 --- a/src/com/studentersamfundet/app/network/ImageLoader.java +++ b/src/com/studentersamfundet/app/network/ImageLoader.java @@ -22,10 +22,10 @@ public class ImageLoader extends AsyncTask { private final int imageId; private int progressbarId = -1; - public ImageLoader(ViewGroup parent, int position, int imageId) { + public ImageLoader(ViewGroup parent, int position, int imageViewId) { this.parent = parent; this.position = position; - this.imageId = imageId; + this.imageId = imageViewId; } @Override