Merge pull request #103 from davec555/master

Fixed a bug regarding signatures from 4sq.com url's and added Project Macaw Twitter client

Foursquare/app/assistants/app-assistant.js

@@ -378,6 +378,8 @@ AppAssistant.prototype.handleLaunch = function (launchParams) {
 								var cid=longurl.substr(s,len);
 
 								var sig=longurl.substr(e+3);
+								var ref=sig.indexOf("&ref=");
+								sig = sig.substr(0,ref);
 
 								if(cardStageController){ //app already opened
 									cardStageController.pushScene("view-checkin",{checkin:cid,signature:sig});

Foursquare/app/assistants/attach-photo-assistant.js

@@ -9,7 +9,7 @@ AttachPhotoAssistant.prototype.setup = function() {
 	var credentials=this.cookieData.get();
 	//var pings=(credentials.swf=="on")? '1': '0';
 	var pings=_globals.swf;
-	this.stt=(_globals.settings.snedToTwitter==true)? '1': '0';
+	this.stt=(_globals.settings.sendToTwitter==true)? '1': '0';
 	this.stf=(_globals.settings.sendToFacebook==true || _globals.settings.sendToFacebook=='true')? '1': '0';
 
 

Foursquare/app/assistants/preferences-assistant.js

@@ -110,7 +110,8 @@ PreferencesAssistant.prototype.setup = function() {
                 {label: "Bad Kitty", value: "badkitty",secondaryIconPath: "images/bad_kitty_32.png"},
                 {label: "Spaz", value: "spaz",secondaryIconPath: "images/spaz_32.png"},
                 {label: "Spaz Special Edition", value: "spaz-sped",secondaryIconPath: "images/spaz_32.png"},
-                {label: "TweetMe", value: "tweetme",secondaryIconPath: "images/tweetme_32.png"}
+                {label: "TweetMe", value: "tweetme",secondaryIconPath: "images/tweetme_32.png"},
+                {label: "Project Macaw", value: "projectmacaw",secondaryIconPath: "images/project_macaw_32.png"}
             ]},
 
         this.twittermodel = {

Foursquare/app/assistants/user-info-assistant.js

@@ -1808,7 +1808,7 @@ UserInfoAssistant.prototype.infoTapped = function(event) {
 										action: "user",
 										name: event.item.username
 									});
-					break;
+					break;								
 				case "spaz":
 					_globals.openApp(this.controller, "Spaz", "com.funkatron.app.spaz", {
 										action: "user",
@@ -1827,6 +1827,12 @@ UserInfoAssistant.prototype.infoTapped = function(event) {
 										name: event.item.username
 									});
 					break;
+				case "projectmacaw":
+					_globals.openApp(this.controller, "Project Macaw", "net.minego.phnx", {
+										action: "user",
+										userid: event.item.username
+									});
+					break;							
 			}
 			break;
 	}

Foursquare/app/assistants/venuedetail-assistant.js

@@ -571,6 +571,12 @@ VenuedetailAssistant.prototype.infoTapped = function(event) {
 										name: event.item.username
 									});
 					break;
+				case "projectmacaw":
+					_globals.openApp(this.controller, "Project Macaw", "net.minego.phnx", {
+										action: "user",
+										userid: event.item.username
+									});
+					break;					
 			}
 			break;
 	}

Foursquare/app/lib/globals.js

@@ -58,6 +58,7 @@ _globals.whatsnew={
 	"id":"whatsnew",
 	"icon":"",
 	"pages":[
+		"Here's what's new in foursquare webOS <b>v2.8.5</b>! Follow me on Twitter: <a href=\"http://mobile.twitter.com/zhephree\">@zhephree</a><ul><li>Added Project Macaw as a Twitter client option<li>Fixed sig resolving from 4sq.com links passed from other apps</li></ul>",
 		"Here's what's new in foursquare webOS <b>v2.8.4</b>! Follow me on Twitter: <a href=\"http://mobile.twitter.com/zhephree\">@zhephree</a><ul><li>Sorry for the bugs lately. Something changed in foursquare's API that I didn't account for. I take the blame here. Enjoy this update. Hopefully the next update will be to bring NEW features and not fix existing ones<li>Fixed a bug preventing Venues with a special from loading</li><li>Fixed a bug that prevented list of Trending Places from displaying in Explore tab</li></ul>",
 		"Here's what's new in foursquare webOS <b>v2.8.3</b>! Follow me on Twitter: <a href=\"http://mobile.twitter.com/zhephree\">@zhephree</a><ul><li>Fixed a bug preventing Venues from loading</li><li>Adapted to Pre 3 resolution</li></ul>",
 		"Here's what's new in foursquare webOS <b>v2.8.2</b>! Follow me on Twitter: <a href=\"http://mobile.twitter.com/zhephree\">@zhephree</a><ul><li>Fixed a bug preventing Preferences from loading</li><li>Fixed a bug that prevented you from adding new venues</li></ul>",

Foursquare/appinfo.json

@@ -1,6 +1,6 @@
 {
 	"id": "com.foursquare.foursquare",
-	"version": "2.8.4",
+	"version": "2.8.5",
 	"vendor": "foursquare",
 	"noWindow" : "true",
 	"timingEnabled": "true",