From cd3233daaac5fbcffbf7e54b4e21a326e426b6f5 Mon Sep 17 00:00:00 2001
From: DjBushido <bspeice.nc@gmail.com>
Date: Mon, 7 Apr 2014 14:35:34 -0400
Subject: [PATCH] Twitter functionality now working for HW 5

---
 HW5/AndroidManifest.xml                             |  3 ++-
 HW5/src/edu/uncc/itcs4180/hw5/MainActivity.java     |  3 +++
 .../itcs4180/hw5/twitter/TwitterAuthentication.java |  5 +++++
 .../uncc/itcs4180/hw5/twitter/TwitterClient.java    | 13 ++++---------
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/HW5/AndroidManifest.xml b/HW5/AndroidManifest.xml
index 28c495a..b8a6f7c 100644
--- a/HW5/AndroidManifest.xml
+++ b/HW5/AndroidManifest.xml
@@ -6,7 +6,8 @@
 
     <uses-sdk
         android:minSdkVersion="12"
-        android:targetSdkVersion="18" />
+        android:targetSdkVersion="18" />
+    <uses-permission android:name="android.permission.INTERNET"/>
 
     <application
         android:allowBackup="true"
diff --git a/HW5/src/edu/uncc/itcs4180/hw5/MainActivity.java b/HW5/src/edu/uncc/itcs4180/hw5/MainActivity.java
index efbd4da..f8da40d 100644
--- a/HW5/src/edu/uncc/itcs4180/hw5/MainActivity.java
+++ b/HW5/src/edu/uncc/itcs4180/hw5/MainActivity.java
@@ -1,7 +1,10 @@
 package edu.uncc.itcs4180.hw5;
 
+import edu.uncc.itcs4180.hw5.twitter.TweetList;
+import edu.uncc.itcs4180.hw5.twitter.TwitterClient;
 import android.os.Bundle;
 import android.app.Activity;
+import android.util.Log;
 import android.view.Menu;
 
 public class MainActivity extends Activity {
diff --git a/HW5/src/edu/uncc/itcs4180/hw5/twitter/TwitterAuthentication.java b/HW5/src/edu/uncc/itcs4180/hw5/twitter/TwitterAuthentication.java
index 29aa4fa..5dcbf0b 100644
--- a/HW5/src/edu/uncc/itcs4180/hw5/twitter/TwitterAuthentication.java
+++ b/HW5/src/edu/uncc/itcs4180/hw5/twitter/TwitterAuthentication.java
@@ -1,6 +1,11 @@
 package edu.uncc.itcs4180.hw5.twitter;
 
+import com.google.gson.annotations.SerializedName;
+
 public class TwitterAuthentication {
+	@SerializedName("token_type")
 	String tokenType;
+	
+	@SerializedName("access_token")
 	String accessToken;
 }
diff --git a/HW5/src/edu/uncc/itcs4180/hw5/twitter/TwitterClient.java b/HW5/src/edu/uncc/itcs4180/hw5/twitter/TwitterClient.java
index ee03451..8e205e0 100644
--- a/HW5/src/edu/uncc/itcs4180/hw5/twitter/TwitterClient.java
+++ b/HW5/src/edu/uncc/itcs4180/hw5/twitter/TwitterClient.java
@@ -5,11 +5,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
-import java.net.URL;
 import java.net.URLEncoder;
-import java.text.BreakIterator;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.concurrent.ExecutionException;
 
 import org.apache.http.HttpEntity;
@@ -22,11 +18,11 @@ import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.params.BasicHttpParams;
 
-import com.google.gson.Gson;
-
 import android.os.AsyncTask;
 import android.util.Base64;
 
+import com.google.gson.Gson;
+
 public class TwitterClient {
 	
 	private final String API_KEY = "HuEbvsXOxQsKVmTneyilVtsV6";
@@ -38,10 +34,9 @@ public class TwitterClient {
 	// Code mimicked in large part from:
 	// https://github.com/Rockncoder/TwitterTutorial/blob/master/src/com/example/TwitterTutorial/MainActivity.java
 	
-	public static TweetList getTweetList(String handle) {
-		TwitterClient tc = new TwitterClient();
+	public TweetList getTweetList(String handle) {
 		try {
-			return tc.new TweetListDownloader().execute(handle).get();
+			return new TweetListDownloader().execute(handle).get();
 		} catch (InterruptedException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();