[tuxdroid-svn] r4792 - in software_suite_v2/software/gadgets/tuxdroid-gadget-facebook/trunk/tuxdroid-gadget-facebook: . src

[jerome <c2m...@c2...>]

Author: jerome
Date: 2009-06-11 16:19:07 +0200 (Thu, 11 Jun 2009)
New Revision: 4792

Modified:
   software_suite_v2/software/gadgets/tuxdroid-gadget-facebook/trunk/tuxdroid-gadget-facebook/.classpath
   software_suite_v2/software/gadgets/tuxdroid-gadget-facebook/trunk/tuxdroid-gadget-facebook/src/FacebookConnection.java
   software_suite_v2/software/gadgets/tuxdroid-gadget-facebook/trunk/tuxdroid-gadget-facebook/src/FacebookFunctions.java
Log:


Modified: software_suite_v2/software/gadgets/tuxdroid-gadget-facebook/trunk/tuxdroid-gadget-facebook/.classpath
===================================================================
--- software_suite_v2/software/gadgets/tuxdroid-gadget-facebook/trunk/tuxdroid-gadget-facebook/.classpath	2009-06-11 14:06:33 UTC (rev 4791)
+++ software_suite_v2/software/gadgets/tuxdroid-gadget-facebook/trunk/tuxdroid-gadget-facebook/.classpath	2009-06-11 14:19:07 UTC (rev 4792)
@@ -3,12 +3,12 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/tuxdroid-gadget-java-kit"/>
-	<classpathentry kind="lib" path="C:/Users/nux/Desktop/facebook-java-api-1.8.1-bin/facebook-java-api-1.8.1/lib/activation-1.1.jar"/>
-	<classpathentry kind="lib" path="C:/Users/nux/Desktop/facebook-java-api-1.8.1-bin/facebook-java-api-1.8.1/lib/facebook-java-api-1.8.1.jar"/>
-	<classpathentry kind="lib" path="C:/Users/nux/Desktop/facebook-java-api-1.8.1-bin/facebook-java-api-1.8.1/lib/jaxb-api-2.1.jar"/>
-	<classpathentry kind="lib" path="C:/Users/nux/Desktop/facebook-java-api-1.8.1-bin/facebook-java-api-1.8.1/lib/jaxb-impl-2.1.3.jar"/>
-	<classpathentry kind="lib" path="C:/Users/nux/Desktop/facebook-java-api-1.8.1-bin/facebook-java-api-1.8.1/lib/json-20070829.jar"/>
-	<classpathentry kind="lib" path="C:/Users/nux/Desktop/facebook-java-api-1.8.1-bin/facebook-java-api-1.8.1/lib/stax-api-1.0-2.jar"/>
 	<classpathentry kind="lib" path="C:/Program Files/Kysoh/Tuxdroid/softwares/control_center/deps/tuxdroid-java-api-0.1.jar"/>
+	<classpathentry kind="lib" path="C:/Users/nux/Desktop/facebook/facebook-java-api-1.8.1-bin/facebook-java-api-1.8.1/lib/activation-1.1.jar"/>
+	<classpathentry kind="lib" path="C:/Users/nux/Desktop/facebook/facebook-java-api-1.8.1-bin/facebook-java-api-1.8.1/lib/facebook-java-api-1.8.1.jar"/>
+	<classpathentry kind="lib" path="C:/Users/nux/Desktop/facebook/facebook-java-api-1.8.1-bin/facebook-java-api-1.8.1/lib/jaxb-api-2.1.jar"/>
+	<classpathentry kind="lib" path="C:/Users/nux/Desktop/facebook/facebook-java-api-1.8.1-bin/facebook-java-api-1.8.1/lib/jaxb-impl-2.1.3.jar"/>
+	<classpathentry kind="lib" path="C:/Users/nux/Desktop/facebook/facebook-java-api-1.8.1-bin/facebook-java-api-1.8.1/lib/json-20070829.jar"/>
+	<classpathentry kind="lib" path="C:/Users/nux/Desktop/facebook/facebook-java-api-1.8.1-bin/facebook-java-api-1.8.1/lib/stax-api-1.0-2.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Modified: software_suite_v2/software/gadgets/tuxdroid-gadget-facebook/trunk/tuxdroid-gadget-facebook/src/FacebookConnection.java
===================================================================
--- software_suite_v2/software/gadgets/tuxdroid-gadget-facebook/trunk/tuxdroid-gadget-facebook/src/FacebookConnection.java	2009-06-11 14:06:33 UTC (rev 4791)
+++ software_suite_v2/software/gadgets/tuxdroid-gadget-facebook/trunk/tuxdroid-gadget-facebook/src/FacebookConnection.java	2009-06-11 14:19:07 UTC (rev 4792)
@@ -59,7 +59,7 @@
 			gdg.throwMessage("Connect to your account and push my left wing");
 			
 			tux.flippers.up();
-			tux.button.left.waitPressed(20.0);
+			tux.button.left.waitPressed(60.0);
 			tux.flippers.down();
 			
 			// fetch session key

Modified: software_suite_v2/software/gadgets/tuxdroid-gadget-facebook/trunk/tuxdroid-gadget-facebook/src/FacebookFunctions.java
===================================================================
--- software_suite_v2/software/gadgets/tuxdroid-gadget-facebook/trunk/tuxdroid-gadget-facebook/src/FacebookFunctions.java	2009-06-11 14:06:33 UTC (rev 4791)
+++ software_suite_v2/software/gadgets/tuxdroid-gadget-facebook/trunk/tuxdroid-gadget-facebook/src/FacebookFunctions.java	2009-06-11 14:19:07 UTC (rev 4792)
@@ -193,7 +193,17 @@
 			 */
 			if(notifs.contains("<friend_requests"))
 			{
-				String friendsString = notifs.substring(notifs.indexOf("<friend_requests"), notifs.indexOf("</friend_requests>"));
+				
+				String friendsString = "";
+				try
+				{
+					friendsString = notifs.substring(notifs.indexOf("<friend_requests"), notifs.indexOf("</friend_requests>"));
+				}
+				catch(StringIndexOutOfBoundsException no)
+				{
+					friendsString = notifs.substring(notifs.indexOf("<friend_requests"), notifs.indexOf("/>", notifs.indexOf("<friend_requests")));
+				}
+				
 				Vector<String> friendsDatas = new Vector<String>();
 				Vector<Long> friendsDatasAsLong = new Vector<Long>();
 				
@@ -267,6 +277,7 @@
 					{
 						try
 						{
+							Thread.sleep(200);
 							connection.getClient().fql_query("Select name from group WHERE gid=" + gid.longValue());
 							String response = connection.getClient().getRawResponse();
 							if(response.contains("<group>") && response.contains("<name>"))
@@ -348,11 +359,11 @@
 		}
 		catch (FacebookException e) 
 		{
-			e.printStackTrace();
+			;
 		} 
 		catch (IOException e) 
 		{
-			e.printStackTrace();
+			;
 		}
 		
 		return notifications;