Changed name of EventListActivity class so it describes class' purpose more precisely. Fixed a bug with Uri not being serializable (it still isn't, but it isn't used in serializable classes anymore).

AndroidManifest.xml

@@ -19,7 +19,7 @@
         </activity>
         <activity android:name=".ui.EventViewActivity"></activity>
         <activity android:name=".ui.JoinUsActivity"></activity>
-        <activity android:name=".ui.ProgramListActivity"></activity>
+        <activity android:name=".ui.EventListActivity"></activity>
 
     </application>
 </manifest>

src/com/studentersamfundet/app/DataHandler.java

@@ -5,8 +5,6 @@ import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
 
-import android.net.Uri;
-
 public class DataHandler {
 	private List<Event> events = new LinkedList<Event>();
 	private List<News> news = new LinkedList<News>();
@@ -32,15 +30,9 @@ public class DataHandler {
 		try {
 			int regularPrice = Integer.parseInt(priceReg);
 			int memberPrice = Integer.parseInt(priceMem);
-			Uri ticketUri = null;
 			
-			if (ticketUriStr.startsWith("http://") && ticketUriStr.length() > 7) {
-				ticketUri = Uri.parse(ticketUriStr);
-			}
-			
-			event.setTicketsInfo(regularPrice, memberPrice, ticketUri);
-		} catch (NumberFormatException e1) { /* Do nothing. */
-		} catch (NullPointerException e2) { /* That's correct, catch NullPointerExceptions. */ }
+			event.setTicketsInfo(regularPrice, memberPrice, ticketUriStr);
+		} catch (NumberFormatException e1) { /* Do nothing. */ } 
 		
 		
 		events.add(event);

src/com/studentersamfundet/app/Event.java

@@ -24,7 +24,7 @@ public class Event implements Serializable {
 	
 	private int regularPrice;
 	private int memberPrice;
-	private Uri ticketUri;
+	private String ticketUriStr;
 	
 	public Event(
 			int id, 
@@ -98,12 +98,20 @@ public class Event implements Serializable {
 	}
 	
 	public Uri getTicketUri() {
-		return this.ticketUri;
+		Uri ticketUri = null;
+		
+		if (ticketUriStr != null 
+				&& ticketUriStr.startsWith("http://") 
+				&& ticketUriStr.length() > 7) {
+			ticketUri = Uri.parse(ticketUriStr);
+		}
+		
+		return ticketUri;
 	}
 	
-	public void setTicketsInfo(int regularPrice, int memberPrice, Uri ticketUri) {
+	public void setTicketsInfo(int regularPrice, int memberPrice, String ticketUri) {
 		this.regularPrice = regularPrice;
 		this.memberPrice = memberPrice;
-		this.ticketUri = ticketUri;
+		this.ticketUriStr = ticketUri;
 	}
 }

src/com/studentersamfundet/app/ui/BaseDnsActivity.java

@@ -18,7 +18,7 @@ public abstract class BaseDnsActivity extends Activity {
         	intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT
         			| Intent.FLAG_ACTIVITY_SINGLE_TOP);
         	
-    		intent.setClass(this, ProgramListActivity.class);
+    		intent.setClass(this, EventListActivity.class);
     		startActivity(intent);
     		
     	/* Join button was pushed: */

src/com/studentersamfundet/app/ui/DnsActivity.java

@@ -142,7 +142,7 @@ public class DnsActivity extends BaseDnsActivity {
 
 		intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT
 				| Intent.FLAG_ACTIVITY_SINGLE_TOP);
-		intent.setClass(this, ProgramListActivity.class);
+		intent.setClass(this, EventListActivity.class);
 
 		startActivity(intent);
 	}

src/com/studentersamfundet/app/ui/EventListActivity.java

@@ -33,7 +33,7 @@ import com.studentersamfundet.app.R;
 import com.studentersamfundet.app.RSSParserProgram;
 import com.studentersamfundet.app.ui.ChooseCategoryDialog.Callback;
 
-public class ProgramListActivity extends BaseDnsActivity {
+public class EventListActivity extends BaseDnsActivity {
 	public static final String feedURL = "http://studentersamfundet.no/rss/lars_program_feed.php";
 	
 	private FeedFetcher feed;
@@ -124,15 +124,15 @@ public class ProgramListActivity extends BaseDnsActivity {
     			} else {
     				row.setBackgroundResource(R.color.ListItemBackgroundOdd);
     			}
-				titleView.setTextAppearance(ProgramListActivity.this, R.style.ListItemTextTitle);
-				dateView.setTextAppearance(ProgramListActivity.this, R.style.ListItemTextDate);
-				priceView.setTextAppearance(ProgramListActivity.this, R.style.ListItemTextDate);
+				titleView.setTextAppearance(EventListActivity.this, R.style.ListItemTextTitle);
+				dateView.setTextAppearance(EventListActivity.this, R.style.ListItemTextDate);
+				priceView.setTextAppearance(EventListActivity.this, R.style.ListItemTextDate);
     			
     			/* Add onClickListeners: */
     			row.setOnClickListener(new OnClickListener() {
 					
 					public void onClick(View v) {
-						Intent intent = new Intent(ProgramListActivity.this, EventViewActivity.class);
+						Intent intent = new Intent(EventListActivity.this, EventViewActivity.class);
 						intent.putExtra("event", e);
 						
 						startActivity(intent);
@@ -244,7 +244,7 @@ public class ProgramListActivity extends BaseDnsActivity {
 		        
 		        currentCategory = category;
 			} else {
-				Toast toast = Toast.makeText(ProgramListActivity.this, R.string.error_noconnection_noupdate, Toast.LENGTH_LONG);
+				Toast toast = Toast.makeText(EventListActivity.this, R.string.error_noconnection_noupdate, Toast.LENGTH_LONG);
 	        	toast.show();
 			}
 		}