X-Git-Url: http://www.average.org/gitweb/?p=WhereAmI.git;a=blobdiff_plain;f=src%2Forg%2Faverage%2Fwhereami%2FAuthorize.java;h=9b42a364ab20f5dee76a9977e246bef6163e4afe;hp=1bf5fad0f6bdbf1e74cff00a127007e691c099a9;hb=816e15ad1c9de478be113a53a51b483791503c30;hpb=50c044c1b04021f044bc954274c198653c6b3902

diff --git a/src/org/average/whereami/Authorize.java b/src/org/average/whereami/Authorize.java
index 1bf5fad..9b42a36 100644
--- a/src/org/average/whereami/Authorize.java
+++ b/src/org/average/whereami/Authorize.java
@@ -6,13 +6,14 @@ package org.average.whereami;
 import java.io.IOException;
 
 import org.average.whereami.ClientCredentials;
+import org.average.whereami.PersistentStore;
 
 import android.app.Activity;
 import android.os.Bundle;
 import android.graphics.Bitmap;
+import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.content.SharedPreferences.Editor;
 import android.preference.PreferenceManager;
 import android.util.Log;
 import android.view.View;
@@ -28,17 +29,12 @@ import com.google.api.client.json.jackson.JacksonFactory;
 public class Authorize extends Activity {
 
     final String TAG = getClass().getName();
-
-    private SharedPreferences prefs;
-    private static final String ACCESS_TOKEN = "access_token";
-    private static final String EXPIRES_IN = "expires_in";
-    private static final String REFRESH_TOKEN = "refresh_token";
-    private static final String SCOPE = "scope";
+    SharedPreferences prefs;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        Log.w(TAG, "Starting task to retrieve request token.");
+        Log.v(TAG, "Starting task to retrieve request token.");
         prefs = PreferenceManager.getDefaultSharedPreferences(this);
     }
 
@@ -56,7 +52,7 @@ public class Authorize extends Activity {
         webview.setWebViewClient(new WebViewClient() {
             @Override
             public void onPageStarted(WebView view, String url, Bitmap bitmap) {
-                Log.w(TAG, "onPageStarted : " + url);
+                Log.v(TAG, "onPageStarted : " + url);
             }
             @Override
             public void onPageFinished(WebView view, String url) {
@@ -72,23 +68,18 @@ public class Authorize extends Activity {
                                 ClientCredentials.CLIENT_SECRET,
                                 code,
                                 ClientCredentials.REDIRECT_URI).execute();
-                            storeTokens(accessTokenResponse);
+                            PersistentStore store = new PersistentStore(prefs);
+                            store.writeTokens(accessTokenResponse);
                             finish();
-                            //view.setVisibility(View.INVISIBLE);
-                            //startActivity(new Intent(Authorize.this,
-                            //                         WhereAmI.class));
                         } else if (url.indexOf("error=")!=-1) {
-                            clearTokens();
+                            new PersistentStore(prefs).clearTokens();
                             finish();
-                            //view.setVisibility(View.INVISIBLE);
-                            //startActivity(new Intent(Authorize.this,
-                            //                         WhereAmI.class));
                         }
                     } catch (IOException e) {
                         e.printStackTrace();
                     }
                 }
-                Log.w(TAG, "onPageFinished : " + url);
+                Log.v(TAG, "onPageFinished : " + url);
             }
 
             private String extractCodeFromUrl(String url) {
@@ -96,30 +87,6 @@ public class Authorize extends Activity {
                             ClientCredentials.REDIRECT_URI.length()+7,
                             url.length());
             }
-
-            private void storeTokens(AccessTokenResponse accessTokenResponse) {
-                Log.w(TAG, "Storing tokens: " + accessTokenResponse);
-                Editor editor = prefs.edit();
-                editor.putString(ACCESS_TOKEN,
-                                 accessTokenResponse.accessToken);
-                editor.putLong(  EXPIRES_IN,
-                                 accessTokenResponse.expiresIn);
-                editor.putString(REFRESH_TOKEN,
-                                 accessTokenResponse.refreshToken);
-                editor.putString(SCOPE,
-                                 accessTokenResponse.scope);
-                editor.commit();
-            }
-
-            private void clearTokens() {
-                Log.w(TAG, "Clear tokens");
-                Editor editor = prefs.edit();
-                editor.remove(ACCESS_TOKEN);
-                editor.remove(EXPIRES_IN);
-                editor.remove(REFRESH_TOKEN);
-                editor.remove(SCOPE);
-                editor.commit();
-            }
         });
 
         webview.loadUrl(authorizationUrl);