From dbf1c509b21c30f0e66dee7ae3fa861469ad6586 Mon Sep 17 00:00:00 2001
From: ricky barrette <rickbarrette@gmail.com>
Date: Sun, 30 Jan 2011 20:49:00 +0000
Subject: [PATCH] TravelPost.java

im a lot closer to finishing twitter intergration.

however it is breaking at line 103 when it tries to get the users auth tokens from twitter
---
 .../android/TravelPost/TravelPost.java        | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/TravelPost/src/com/TwentyCodes/android/TravelPost/TravelPost.java b/TravelPost/src/com/TwentyCodes/android/TravelPost/TravelPost.java
index 5b75066..1bb43c7 100644
--- a/TravelPost/src/com/TwentyCodes/android/TravelPost/TravelPost.java
+++ b/TravelPost/src/com/TwentyCodes/android/TravelPost/TravelPost.java
@@ -13,6 +13,7 @@ import twitter4j.conf.ConfigurationBuilder;
 import twitter4j.http.AccessToken;
 import twitter4j.http.RequestToken;
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
@@ -30,7 +31,7 @@ import android.widget.Toast;
 public class TravelPost extends PreferenceActivity implements OnPreferenceClickListener {
 
 	private PostMortemReportExceptionHandler mExceptionReport = new PostMortemReportExceptionHandler(this);
-	private RequestToken requestToken;
+	private Twitter twitter;
 	private static SharedPreferences shared_prefs;
 	public static final String SETTINGS = "settings";
 	private static final int TWITTER_AUTH_REQUEST_CODE = 0;
@@ -63,10 +64,10 @@ public class TravelPost extends PreferenceActivity implements OnPreferenceClickL
 
 	@Override
 	public boolean onPreferenceClick(Preference preference) {
-		Twitter twitter = new TwitterFactory().getInstance();
+		twitter = new TwitterFactory().getInstance();
 	    twitter.setOAuthConsumer(TC_TEST_OAUTH_KEY, TC_TEST_OAUTH_SECRET);
 	    try {
-			requestToken = twitter.getOAuthRequestToken();
+			RequestToken requestToken = twitter.getOAuthRequestToken();
 			this.startActivityForResult(new Intent(this, WebAuth.class).putExtra(WebAuth.AUTH_URL, requestToken.getAuthorizationURL()), TWITTER_AUTH_REQUEST_CODE);
 		} catch (TwitterException e) {
 			Toast.makeText(this, e.getMessage(), Toast.LENGTH_LONG);
@@ -85,22 +86,27 @@ public class TravelPost extends PreferenceActivity implements OnPreferenceClickL
 	public void	onActivityResult(int requestCode, int resultCode, Intent data) {
 		Log.v(TAG, "onActivityResult()");
 		Log.d(TAG, "Request code:"+ requestCode);
-		if(data != null)
-			Log.d(TAG, data.getStringExtra(WebAuth.AUTH_CODE));
-		else
+		String authCode = null;
+		if(data != null){
+			authCode = data.getStringExtra(WebAuth.AUTH_CODE);
+			Log.d(TAG, authCode);
+		} else
 			Log.e(TAG, "WebAuth result was null!!!");
 		if(resultCode == Activity.RESULT_OK)
 			switch(requestCode){
 				case TWITTER_AUTH_REQUEST_CODE:
 					try {
+						Log.v(TAG,"twitter auth case");
 						AccessToken accessToken = null;
-						Twitter twitter = new TwitterFactory().getInstance();
-						accessToken = twitter.getOAuthAccessToken(requestToken, data.getStringExtra(WebAuth.AUTH_CODE));
+						twitter = new TwitterFactory().getInstance();
+					    twitter.setOAuthConsumer(TC_TEST_OAUTH_KEY, TC_TEST_OAUTH_SECRET);
+						accessToken = twitter.getOAuthAccessToken(twitter.getOAuthRequestToken(), authCode);
 						Log.d(TAG, accessToken.getToken());
 						Log.d(TAG, accessToken.getTokenSecret());
+						Log.v(TAG,"saving twitter tokens");
+						shared_prefs = getSharedPreferences(SETTINGS, Context.MODE_PRIVATE);
 						shared_prefs.edit().putString(TWITTER_AUTH_TOKEN, accessToken.getToken()).commit();
 						shared_prefs.edit().putString(TWITTER_AUTH_SECRET, accessToken.getTokenSecret()).commit();
-						
 					} catch (TwitterException e) {
 						Toast.makeText(this, e.getMessage(), Toast.LENGTH_LONG);
 						e.printStackTrace();