Author: jerome
Date: 2009-04-03 08:33:43 +0200 (Fri, 03 Apr 2009)
New Revision: 4323

Modified:
   
software_suite_v2/software/gadgets/tuxdroid-gadget-twitter/trunk/tuxdroid-gadget-twitter/src/Configuration.java
   
software_suite_v2/software/gadgets/tuxdroid-gadget-twitter/trunk/tuxdroid-gadget-twitter/src/GadgetTwitter.java
Log:
* Added messages in case of 'no messages', 'no replies' and no 'new friend 
statuses'.
* Filtered '&' that cause errors with the tts.

Modified: 
software_suite_v2/software/gadgets/tuxdroid-gadget-twitter/trunk/tuxdroid-gadget-twitter/src/Configuration.java
===================================================================
--- 
software_suite_v2/software/gadgets/tuxdroid-gadget-twitter/trunk/tuxdroid-gadget-twitter/src/Configuration.java
     2009-04-03 05:08:37 UTC (rev 4322)
+++ 
software_suite_v2/software/gadgets/tuxdroid-gadget-twitter/trunk/tuxdroid-gadget-twitter/src/Configuration.java
     2009-04-03 06:33:43 UTC (rev 4323)
@@ -24,7 +24,7 @@
 
 public class Configuration extends SimpleGadgetConfiguration{
 
-       private String username = "jerome_conan";
+       private String username = "tuxdroid";
        private String password = "twitter09";
        private String myStatus = "Hello all from my Tux Droïd twitter gadget";
        private boolean updateStatus = true;

Modified: 
software_suite_v2/software/gadgets/tuxdroid-gadget-twitter/trunk/tuxdroid-gadget-twitter/src/GadgetTwitter.java
===================================================================
--- 
software_suite_v2/software/gadgets/tuxdroid-gadget-twitter/trunk/tuxdroid-gadget-twitter/src/GadgetTwitter.java
     2009-04-03 05:08:37 UTC (rev 4322)
+++ 
software_suite_v2/software/gadgets/tuxdroid-gadget-twitter/trunk/tuxdroid-gadget-twitter/src/GadgetTwitter.java
     2009-04-03 06:33:43 UTC (rev 4323)
@@ -63,6 +63,7 @@
                {
                        try
                        {
+                               boolean noStatuses = true;
                                List<User> friend = twitter.getFriends();
                                for(int i=0; i < twitter.getFriends().size(); 
i++)
                                {
@@ -76,7 +77,9 @@
                                        boolean said = 
this.savedStruct.isRegistered(TwitterDatasStruct.FRIENDS_STATUSES, username, 
statusText); 
                                        if((statusText != "null") && !said)
                                        {
-                                               throwMessage(username + ", " + 
statusText);
+                                               noStatuses = false;
+                                               String stat = 
statusText.replace("&", "");
+                                               throwMessage(username + ", " + 
stat);
                                                
this.savedStruct.addFriendStatus(username, statusText);
                                        }
                                        }
@@ -85,17 +88,27 @@
                                                ;
                                        }
                                }
+                               
+                               if(noStatuses)
+                               {
+                                       throwMessage("No new friends 
statuses.");
+                               }
                        }
                        catch(TwitterException badRequest)
                        {
                                throwMessage("Twitter is busy for now, please, 
try later.");
                                this.quitGadget();
                        }
+                       
+                       
                }
                
                //Getting provates and public messages.
                if(this.configuration().getGiveMessages())
                {
+                       boolean noReplies = true;
+                       boolean noMessage = true;
+                       
                        try
                        { 
                                List<Message> replies = twitter.getReplies();
@@ -113,7 +126,9 @@
                                        
                                        if((reply.getText() != "null") && !said)
                                        {
-                                               throwMessage("reply from {0}, 
the reply is: {1}", username, reply.getText());
+                                               noReplies = false;
+                                               String repl = 
reply.getText().replace("&", "").replace("@" + 
this.configuration().getUsername(), "");
+                                               throwMessage("reply from {0}, 
the reply is: {1}", username, repl);
                                                
this.savedStruct.addReply(username, reply.getText());
                                        }
                                    }
@@ -123,6 +138,11 @@
                                        throwMessage("you don't have replies");
                                }
                                
+                               if(noReplies)
+                               {
+                                       throwMessage("you don't have replies");
+                               }
+                               
                                if(messages.size() > 0)
                                {
                                        //then give messages.
@@ -132,7 +152,9 @@
                                                boolean said = 
this.savedStruct.isRegistered(TwitterDatasStruct.MESSAGES, username, 
message.getText());
                                                if((message.getText() != 
"null") && !said)
                                                {
-                                                       throwMessage("message 
from {0}, the message is: {1}", username, message.getText());
+                                                       noMessage = false;
+                                                       String mess = 
message.getText().replace("&", "");
+                                                       throwMessage("message 
from {0}, the message is: {1}", username, mess);
                                                        
this.savedStruct.addMessage(username, message.getText());
                                                }
                                        }
@@ -141,6 +163,11 @@
                                {
                                        throwMessage("you don't have private 
messages");
                                }
+                               
+                               if(noMessage)
+                               {
+                                       throwMessage("you don't have private 
messages");
+                               }
                        }
                        catch(TwitterException badRequest)
                        {


------------------------------------------------------------------------------
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn

Reply via email to