Author: jerome
Date: 2009-04-04 09:00:38 +0200 (Sat, 04 Apr 2009)
New Revision: 4337
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-twitter/trunk/tuxdroid-gadget-twitter/resources/gadget.pot
software_suite_v2/software/gadgets/tuxdroid-gadget-twitter/trunk/tuxdroid-gadget-twitter/resources/gadget.xml
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:
* Fixed a bug with max tweets to read.
* Removed a useless parameter.
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-twitter/trunk/tuxdroid-gadget-twitter/resources/gadget.pot
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-twitter/trunk/tuxdroid-gadget-twitter/resources/gadget.pot
2009-04-04 06:50:21 UTC (rev 4336)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-twitter/trunk/tuxdroid-gadget-twitter/resources/gadget.pot
2009-04-04 07:00:38 UTC (rev 4337)
@@ -22,9 +22,6 @@
msgid "Tweet following status text"
msgstr ""
-msgid "Check friends tweets"
-msgstr ""
-
msgid "Give my messages/replies"
msgstr ""
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-twitter/trunk/tuxdroid-gadget-twitter/resources/gadget.xml
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-twitter/trunk/tuxdroid-gadget-twitter/resources/gadget.xml
2009-04-04 06:50:21 UTC (rev 4336)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-twitter/trunk/tuxdroid-gadget-twitter/resources/gadget.xml
2009-04-04 07:00:38 UTC (rev 4337)
@@ -44,12 +44,6 @@
description="Maximum tweets to read"
type="enum(10, 15, 20, 25, 30)"
defaultValue="10" />
- <parameter
- category="User parameters"
- name="giveUsersStatus"
- description="Check friends tweets"
- type="boolean"
- defaultValue="true" />
<parameter
category="User parameters"
name="giveOtherReplies"
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-04 06:50:21 UTC (rev 4336)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-twitter/trunk/tuxdroid-gadget-twitter/src/Configuration.java
2009-04-04 07:00:38 UTC (rev 4337)
@@ -28,8 +28,7 @@
private String password = "twitter09";
private String myStatus = "Hello all from my Tux Droïd twitter gadget";
private boolean updateStatus = true;
- private String maxRead = "2";
- private boolean giveUsersStatus = true;
+ private String maxRead = "10";
private boolean giveMessages = true;
private boolean giveOtherReplies = true;
@@ -114,26 +113,6 @@
/**
- * Return true if users want to hear all friends statuses.
- * @return
- */
- public boolean getGiveUsersStatus()
- {
- return this.giveUsersStatus;
- }
-
-
- /**
- * Set user want to hear friends statuses (if true, don't hear statuses
otherwise).
- * @param giveUsersStatus
- */
- public void setGiveUsersStatus(boolean giveUsersStatus)
- {
- this.giveUsersStatus = giveUsersStatus;
- }
-
-
- /**
* Set giveMessages parameter.
* @param giveMessages
*/
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-04 06:50:21 UTC (rev 4336)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-twitter/trunk/tuxdroid-gadget-twitter/src/GadgetTwitter.java
2009-04-04 07:00:38 UTC (rev 4337)
@@ -66,103 +66,102 @@
}
}
- //Getting friends statuses.
- if(this.configuration().getGiveUsersStatus())
+ Vector<Twitter.Status> repliesToOtherUsers = new
Vector<Twitter.Status>();
+
+ try
{
- Vector<Twitter.Status> repliesToOtherUsers = new
Vector<Twitter.Status>();
+ boolean noStatuses = true;
+ List<User> friend = twitter.getFriends();
- try
+ int max = 0;
+
+ for(int i=0; i < twitter.getFriends().size(); i++)
{
- boolean noStatuses = true;
- List<User> friend = twitter.getFriends();
-
- for(int i=0; i < twitter.getFriends().size();
i++)
+ try
{
- try
+
+ if( max >=
this.configuration().getMaxRead() )
{
-
- if( i >=
this.configuration().getMaxRead() )
- {
- break;
- }
-
- Status status =
friend.get(i).getStatus();
-
- String statusText = status.getText();
- String username =
status.getUser().getName();
-
- //if a new status was set for this user.
- boolean said =
this.savedStruct.isRegistered(TwitterDatasStruct.FRIENDS_STATUSES, username,
statusText);
- if((statusText != "null") && !said)
- {
- noStatuses = false;
- String stat =
statusText.replace("&", "");
-
- for(String simley :
this.smileys)
- {
- stat =
stat.replace(simley, "");
- }
-
- stat = this.urlFilter(stat);
-
- if(isReplyToOtherUser(stat))
- {
-
repliesToOtherUsers.add(status);
- }
-
- else
- {
- throwMessage(username +
", " + stat);
- }
-
- //Saving last entry.
-
this.savedStruct.addFriendStatus(username, statusText);
- }
+ break;
}
- catch(NullPointerException
statusNotExists)
- {
- ;
- }
- }
-
-
- if((repliesToOtherUsers.size() > 0) &&
this.configuration().getGiveOtherReplies())
- {
- int max =
this.configuration().getMaxRead();
- for(Twitter.Status state : repliesToOtherUsers)
- {
- if( max <= 0)
- {
- return;
- }
-
- String sender =
state.getUser().getName();
- String to =
state.getText().substring(1, state.getText().indexOf(" "));
-
if(!to.equals(this.configuration().getUsername()))
- {
- String reply =
state.getText().substring(state.getText().indexOf(" ") + 1 );
- throwMessage("Reply from {0} to
{0}, the reply is : {2}", sender, to, reply);
- }
-
- max -= 1;
- }
- }
-
-
- if(noStatuses)
+ Status status =
friend.get(i).getStatus();
+
+ String statusText = status.getText();
+ String username = status.getUser().getName();
+
+ //if a new status was set for this user.
+ boolean said =
this.savedStruct.isRegistered(TwitterDatasStruct.FRIENDS_STATUSES, username,
statusText);
+ if((statusText != "null") && !said)
+ {
+ noStatuses = false;
+ String stat = statusText.replace("&",
"");
+
+ for(String simley : this.smileys)
+ {
+ stat = stat.replace(simley, "");
+ }
+
+ stat = this.urlFilter(stat);
+
+ if(isReplyToOtherUser(stat))
+ {
+ repliesToOtherUsers.add(status);
+ }
+
+ else
+ {
+ throwMessage(username + ", " +
stat);
+ max += 1;
+ }
+
+ //Saving last entry.
+
this.savedStruct.addFriendStatus(username, statusText);
+ }
+ }
+ catch(NullPointerException statusNotExists)
{
- throwMessage("No new friends
statuses.");
+ ;
}
}
- catch(TwitterException badRequest)
+
+
+ if((repliesToOtherUsers.size() > 0) &&
this.configuration().getGiveOtherReplies())
+ {
+ max = this.configuration().getMaxRead();
+
+ for(Twitter.Status state : repliesToOtherUsers)
+ {
+ if( max <= 0 )
+ {
+ return;
+ }
+
+ String sender = state.getUser().getName();
+ String to = state.getText().substring(1,
state.getText().indexOf(" "));
+
if(!to.equals(this.configuration().getUsername()))
+ {
+ String reply =
state.getText().substring(state.getText().indexOf(" ") + 1 );
+ throwMessage("Reply from {0} to {0},
the reply is : {2}", sender, to, reply);
+ }
+
+ max -= 1;
+ }
+ }
+
+
+ if(noStatuses)
{
- throwMessage("Twitter is busy for now, please,
try later.");
- this.quitGadget();
+ 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())
------------------------------------------------------------------------------
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
