Move the getConsumer method to the Connection

diff --git a/net/systemeD/halcyon/connection/Connection.as b/net/systemeD/halcyon/connection/Connection.as
index 22696c9c13509b860a14df9086d0d60f7d4370fb..bebd589a53eb610fd25c0f5cb634474ed633a839 100755 (executable)
--- a/net/systemeD/halcyon/connection/Connection.as
+++ b/net/systemeD/halcyon/connection/Connection.as
@@ -368,6 +368,7 @@ package net.systemeD.halcyon.connection {
         public function fetchUserTraces(refresh:Boolean=false):void {}
         public function fetchTrace(id:Number, callback:Function):void {}
         public function getAccessToken(data:Object):OAuthToken { return null; } //todo make private and remove import org.ioshtan etc
+        public function getConsumer():OAuthConsumer { return null; }
     }
 
 }

diff --git a/net/systemeD/halcyon/connection/XMLConnection.as b/net/systemeD/halcyon/connection/XMLConnection.as
index f64c2ade1cda120d1d4839c2512814b98020d5fe..09779f289da42954bdde9b4a6f303a6dfa8b4f87 100644 (file)
--- a/net/systemeD/halcyon/connection/XMLConnection.as
+++ b/net/systemeD/halcyon/connection/XMLConnection.as
@@ -61,7 +61,7 @@ package net.systemeD.halcyon.connection {
            }
 
         /* Get the stored access token, or try setting it up from loader params or passed SharedObject */
-        /* todo: make this private */
+        /* todo: make this private, fix indentation */
         override public function getAccessToken(data:Object):OAuthToken {
           if (authToken == null) {
             var key:String = Connection.getParam("oauth_token", null);
@@ -79,6 +79,18 @@ package net.systemeD.halcyon.connection {
           return authToken;
         }
 
+        override public function getConsumer():OAuthConsumer {
+            if (appID == null) {
+              var key:String = Connection.getParam("oauth_consumer_key", null);
+              var secret:String = Connection.getParam("oauth_consumer_secret", null);
+
+              if ( key != null && secret != null ) {
+                  appID =  new OAuthConsumer(key, secret);
+              }
+            }
+            return appID;
+        }
+
         private var httpStatus:int = 0;
         
         private function recordStatus(event:HTTPStatusEvent):void {

diff --git a/net/systemeD/potlatch2/save/SaveManager.as b/net/systemeD/potlatch2/save/SaveManager.as
index 547293f2fc73487ba3e90518a6ee221c8c52794a..56cff409fd0634f19a87b18b81d07a2a81f455b0 100644 (file)
--- a/net/systemeD/potlatch2/save/SaveManager.as
+++ b/net/systemeD/potlatch2/save/SaveManager.as
@@ -31,7 +31,7 @@ package net.systemeD.potlatch2.save {
         private function save(callback:Function):void {
             var conn:Connection = Connection.getConnectionInstance();
             if ( consumer == null )
-                consumer = getConsumer();
+                consumer = conn.getConsumer();
             if ( accessToken == null )
                 accessToken = conn.getAccessToken(SharedObject.getLocal("access_token").data);
         
@@ -41,16 +41,6 @@ package net.systemeD.potlatch2.save {
                 callback();
         }
 
-        private function getConsumer():OAuthConsumer {
-            var key:String = Connection.getParam("oauth_consumer_key", null);
-            var secret:String = Connection.getParam("oauth_consumer_secret", null);
-            
-            if ( key == null || secret == null )
-                return null;
-            else    
-                return new OAuthConsumer(key, secret);
-        }
-        
         private function getNewToken(onCompletion:Function):void {
             var oauthPanel:OAuthPanel = OAuthPanel(
                 PopUpManager.createPopUp(Application(Application.application), OAuthPanel, true));