[tuxdroid-svn] r4669 - in software_suite_v2/software/gadgets/tuxdroid-gadget-facebook/trunk/tuxdroi
Status: Beta
Brought to you by:
ks156
|
From: jerome <c2m...@c2...> - 2009-05-26 11:44:13
|
Author: jerome
Date: 2009-05-26 13:44:03 +0200 (Tue, 26 May 2009)
New Revision: 4669
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
software_suite_v2/software/gadgets/tuxdroid-gadget-facebook/trunk/tuxdroid-gadget-facebook/src/FacebookGadget.java
Log:
* Getting all base informations from facebook.
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-05-26 11:34:05 UTC (rev 4668)
+++ software_suite_v2/software/gadgets/tuxdroid-gadget-facebook/trunk/tuxdroid-gadget-facebook/.classpath 2009-05-26 11:44:03 UTC (rev 4669)
@@ -3,7 +3,6 @@
<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="libraries"/>
<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"/>
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-05-26 11:34:05 UTC (rev 4668)
+++ software_suite_v2/software/gadgets/tuxdroid-gadget-facebook/trunk/tuxdroid-gadget-facebook/src/FacebookConnection.java 2009-05-26 11:44:03 UTC (rev 4669)
@@ -29,18 +29,19 @@
public class FacebookConnection {
public static String api_key = "a9eb7b7e52df160fb1dfc437b0b487c8";
+ public static String f_key = "0314c8569f89d0411e5a4823372ae27a";
private FacebookRestClient client;
private Long userId;
/**
* Class constructor.
*/
- public FacebookConnection(String secretKey, FacebookGadget gdg, TuxAPI tux)
+ public FacebookConnection(FacebookGadget gdg, TuxAPI tux)
{
try
{
//Create the client instance
- client = new FacebookRestClient(FacebookConnection.api_key, secretKey);
+ client = new FacebookRestClient(FacebookConnection.api_key, FacebookConnection.f_key);
//Is this a desktop app
client.setIsDesktop(true);
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-05-26 11:34:05 UTC (rev 4668)
+++ software_suite_v2/software/gadgets/tuxdroid-gadget-facebook/trunk/tuxdroid-gadget-facebook/src/FacebookFunctions.java 2009-05-26 11:44:03 UTC (rev 4669)
@@ -400,7 +400,7 @@
{
if(this.notifications.containsKey("friend_requests"))
{
- return Integer.valueOf(this.notifications.get("friend_requests").get(0));
+ return Integer.valueOf(this.notifications.get("friend_requests").size());
}
else
{
@@ -420,7 +420,6 @@
if(this.notifications.containsKey("friend_requests"))
{
Vector<String> dat = this.notifications.get("friend_requests");
- dat.remove(0);
friends = dat;
}
return friends;
Modified: software_suite_v2/software/gadgets/tuxdroid-gadget-facebook/trunk/tuxdroid-gadget-facebook/src/FacebookGadget.java
===================================================================
--- software_suite_v2/software/gadgets/tuxdroid-gadget-facebook/trunk/tuxdroid-gadget-facebook/src/FacebookGadget.java 2009-05-26 11:34:05 UTC (rev 4668)
+++ software_suite_v2/software/gadgets/tuxdroid-gadget-facebook/trunk/tuxdroid-gadget-facebook/src/FacebookGadget.java 2009-05-26 11:44:03 UTC (rev 4669)
@@ -32,7 +32,6 @@
*/
public class FacebookGadget extends SimpleGadget<FacebookGadget.Configuration>{
- public native String getKey();
private TuxAPI tux = null;
/**
@@ -142,24 +141,86 @@
this.showFriendRequests = aShowFriendRequests;
}
}
-
+
+
/**
* Gadget start method.
*/
@Override
protected void start() throws Throwable
{
- //First of all, loading our library.
- try
+ this.connectTuxApi();
+
+ if(tux.radio.getConnected())
{
- System.loadLibrary("./libraries/utils");
+ FacebookConnection facebook = new FacebookConnection(this, tux);
+ FacebookFunctions functions = new FacebookFunctions(facebook);
+
+ //Get email informations.
+ if(this.configuration().notifyEmail)
+ {
+ if(functions.getEmailNotifications().intValue() > 0)
+ {
+ throwMessage("You have {0} new messages", functions.getEmailNotifications().intValue());
+ }
+ }
+
+ //Get friend requests notification.
+ if(this.configuration().showFriendRequests)
+ {
+ if(functions.getFriendRequestsCount().intValue() > 0)
+ {
+ throwMessage("You have {0} friend requests", functions.getFriendRequestsCount());
+
+ for(String friendName : functions.getFriendRequestNames())
+ {
+ throwMessage("From {0}", friendName);
+ }
+ }
+ }
+
+ //Get group invites notifications.
+ if(this.configuration().showGroupsInvites)
+ {
+ if(functions.getGroupsInvitesCount().intValue() > 0)
+ {
+ throwMessage("You have {0} group invites", functions.getGroupsInvitesCount().intValue());
+
+ for(String group : functions.getGroupInvitesNames())
+ {
+ throwMessage("to {0}", group);
+ }
+ }
+ }
+
+ //Get pokes notification.
+ if(this.configuration().showEventsInvites)
+ {
+ if(functions.getEventsInvitesCount().intValue() > 0)
+ {
+ throwMessage("You have {0} event invites", functions.getEventsInvitesCount().intValue());
+
+ for(String event : functions.getEventInvitesNames())
+ {
+ throwMessage("to {0}", event);
+ }
+ }
+ }
+
+ if(this.configuration().showPokes)
+ {
+ if(functions.getPokesCount().intValue() > 0)
+ {
+ throwMessage("You have {0} pokes", functions.getPokesCount().intValue());
+ }
+ }
}
- catch(Exception libraryLoadError)
+ else
{
- throwMessage("Error while loading needed library");
+ throwMessage("I must be connected to access your facebook account.");
}
- this.connectTuxApi();
+ this.quitGadget();
}
@@ -175,6 +236,15 @@
/**
+ * Called when user stop the gadget.
+ */
+ private void quitGadget()
+ {
+ tux.destroy();
+ }
+
+
+ /**
* Main entry point.
* @param args
*/
|