tux-droid-svn Mailing List for Tux Droid CE (Page 17)
Status: Beta
Brought to you by:
ks156
Menu
▾
▴
tux-droid-svn — Subversion commit reports.
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
(32) |
Mar
(108) |
Apr
(71) |
May
(38) |
Jun
(128) |
Jul
(1) |
Aug
(14) |
Sep
(77) |
Oct
(104) |
Nov
(90) |
Dec
(71) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(81) |
Feb
(18) |
Mar
(40) |
Apr
(102) |
May
(151) |
Jun
(74) |
Jul
(151) |
Aug
(257) |
Sep
(447) |
Oct
(379) |
Nov
(404) |
Dec
(430) |
| 2009 |
Jan
(173) |
Feb
(236) |
Mar
(519) |
Apr
(300) |
May
(112) |
Jun
(232) |
Jul
(314) |
Aug
(58) |
Sep
(203) |
Oct
(293) |
Nov
(26) |
Dec
(109) |
| 2010 |
Jan
(19) |
Feb
(25) |
Mar
(33) |
Apr
(1) |
May
|
Jun
(3) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: jerome <c2m...@c2...> - 2009-10-12 08:59:47
|
Author: jerome
Date: 2009-10-12 10:59:26 +0200 (Mon, 12 Oct 2009)
New Revision: 5630
Modified:
software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/en.po
software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/nl.po
Log:
* Updated 'en' and 'nl' po files.
Modified: software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/en.po
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/en.po 2009-10-09 12:51:45 UTC (rev 5629)
+++ software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/en.po 2009-10-12 08:59:26 UTC (rev 5630)
@@ -26,10 +26,10 @@
msgstr "Check my messages/replies"
msgid "Check your Twitter account."
-msgstr "Check your Twitter account."
+msgstr "Check my Twitter account."
msgid "Check your tweets from your Twitter account."
-msgstr "Check your tweets from your Twitter account."
+msgstr "Check my tweets from your Twitter account."
msgid "Start me every x"
msgstr "Alert"
Modified: software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/nl.po
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/nl.po 2009-10-09 12:51:45 UTC (rev 5629)
+++ software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/nl.po 2009-10-12 08:59:26 UTC (rev 5630)
@@ -1,75 +1,74 @@
-msgid "Twitter Plugin"
-msgstr "Twitter Plugin"
-
-msgid "The Twitter plugin will make Tux Droid check your Twitter account."
-msgstr ""
-
-msgid "Username"
-msgstr "Gebruikersnaam"
-
-msgid "Password"
-msgstr "Wachtwoord"
-
-msgid "Tweet your new status"
-msgstr "Tweet je nieuwe status"
-
-msgid "Tweet following status text"
-msgstr "Tweet volgende status tekst"
-
-msgid "Hello all from my Tux Droid twitter gadget"
-msgstr "Hallo allemaal van mijn Tux Droid Twitter gadget"
-
-msgid "Check Friends updates"
-msgstr ""
-
-msgid "Check my messages/replies"
-msgstr ""
-
-msgid "Check your Twitter account."
-msgstr ""
-
-msgid "Check your tweets from your Twitter account."
-msgstr ""
-
-msgid "Start me every x"
-msgstr ""
-
-msgid "You do not seem to be connected. Please, verify you username and password, then try again."
-msgstr "Ik kan geen verbinding maken. Controleer of je gebruikersnaam en wachtwoord correct zijn ingegeven."
-
-msgid "You have a new friend update"
-msgstr ""
-
-msgid "You have {0} friend updates"
-msgstr ""
-
-msgid "You don't have any friend updates."
-msgstr ""
-
-msgid "You don't have any messages"
-msgstr ""
-
-msgid "You don't have any replies"
-msgstr ""
-
-msgid "Your new Tweet was not set, please, try again later"
-msgstr ""
-
-msgid "Your Tweet was added"
-msgstr ""
-
-msgid "Twitter is busy for now, please, try later."
-msgstr ""
-
-msgid "One reply from {0}"
-msgstr ""
-
-msgid "{0} replies from {1}"
-msgstr ""
-
-msgid "One message from {0}"
-msgstr ""
-
-msgid "{0} messages from {1}"
-msgstr ""
-
+msgid "Twitter Plugin"
+msgstr "Twitter Plugin"
+
+msgid "The Twitter plugin will make Tux Droid check your Twitter account."
+msgstr "De Twitter plugin zal Tux Droid je tweets doen lezen op je Twitter account."
+
+msgid "Username"
+msgstr "Gebruikersnaam"
+
+msgid "Password"
+msgstr "Wachtwoord"
+
+msgid "Tweet your new status"
+msgstr "Tweet je nieuwe status"
+
+msgid "Tweet following status text"
+msgstr "Tweet volgende status tekst"
+
+msgid "Hello all from my Tux Droid twitter gadget"
+msgstr "Hallo allemaal van mijn Tux Droid Twitter gadget"
+
+msgid "Check Friends updates"
+msgstr "Check voor vriend updates"
+
+msgid "Check my messages/replies"
+msgstr "Check mijn berichten/antwoorden"
+
+msgid "Check your Twitter account."
+msgstr "Check je Twitter account."
+
+msgid "Check your tweets from your Twitter account."
+msgstr "Check je tweets van je Twitter account."
+
+msgid "Start me every x"
+msgstr "Start me elke x"
+
+msgid "You do not seem to be connected. Please, verify you username and password, then try again."
+msgstr "Ik kan geen verbinding maken. Controleer of je gebruikersnaam en wachtwoord correct zijn ingegeven."
+
+msgid "You have a new friend update"
+msgstr "Je hebt een nieuwe vriend update"
+
+msgid "You have {0} friend updates"
+msgstr "Je hebt {0} vriend updates"
+
+msgid "You don't have any friend updates."
+msgstr "Je hebt geen vriend updates."
+
+msgid "You don't have any messages"
+msgstr "Je hebt geen berichten"
+
+msgid "You don't have any replies"
+msgstr "Je hebt geen antwoorden"
+
+msgid "Your new Tweet was not set, please, try again later"
+msgstr "Je nieuwe Tweet werd niet toegevoegd, probeer later opnieuw"
+
+msgid "Your Tweet was added"
+msgstr "Je Tweet werd toegevoegd"
+
+msgid "Twitter is busy for now, please, try later."
+msgstr "Twitter is bezet op het ogenblik, probeer later opnieuw."
+
+msgid "One reply from {0}"
+msgstr "1 antwoord van {0}"
+
+msgid "{0} replies from {1}"
+msgstr "{0} antwoorden van {1}"
+
+msgid "One message from {0}"
+msgstr "1 bericht van {0}"
+
+msgid "{0} messages from {1}"
+msgstr "{0} berichten van {1}"
\ No newline at end of file
|
|
From: jerome <c2m...@c2...> - 2009-10-09 12:51:58
|
Author: jerome
Date: 2009-10-09 14:51:45 +0200 (Fri, 09 Oct 2009)
New Revision: 5629
Modified:
software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/de.po
software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/en.po
software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/fr.po
software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/nl.po
Log:
* Updated po translations.
Modified: software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/de.po
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/de.po 2009-10-09 12:23:30 UTC (rev 5628)
+++ software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/de.po 2009-10-09 12:51:45 UTC (rev 5629)
@@ -1,84 +1,75 @@
-msgid "Twitter Plugin"
-msgstr "Twitter Plugin"
-
-msgid "The Twitter plugin will make Tux Droid read your tweets from your Twitter account."
-msgstr "Über das Twitter-Plugin kann Tux Droid die Tweets Ihres Twitter-Kontos vorlesen."
-
-msgid "Username"
-msgstr "Benutzername"
-
-msgid "your_user_name"
-msgstr "Ihr Benutzername"
-
-msgid "Password"
-msgstr "Kennwort"
-
-msgid "Tweet your new status"
-msgstr "Tweeten Sie Ihren neuen Status"
-
-msgid "Tweet following status text"
-msgstr "Tweeten Sie entsprechend dem Statustext"
-
-msgid "Hello all from my Tux Droid twitter gadget"
-msgstr "Hallo an Alle von meinem Twitter - Tux Droid"
-
-msgid "Maximum tweets to read"
-msgstr "Höchstzahl zu lesender Tweets"
-
-msgid "Give replies sent between followers"
-msgstr "Gibt die unter den Followern gegebenen Antworten wieder"
-
-msgid "Give my messages/replies"
-msgstr "Meine Nachrichten/Antworten wiedergeben"
-
-msgid "Read / update your tweets from your Twitter account."
-msgstr "Tweets von Ihrem Twitter-Konto lesen/aktualisieren."
-
-msgid "Read your tweets from your Twitter account."
-msgstr "Tweets von Ihrem Twitter-Konto lesen."
-
-msgid "Start every x"
-msgstr "Echtzeitbericht"
-
-msgid "Start me every x"
-msgstr "Benachrichtigen Sie mich bei Änderungen in Echtzeit"
-
-msgid "Start every x from full hour"
-msgstr "Regelmäßiger Bericht"
-
-msgid "Start me every x (From full hour)"
-msgstr "Ich möchte einen regelmäßigen Bericht"
-
-msgid "Start daily at"
-msgstr "Täglicher Bericht"
-
-msgid "Start me daily"
-msgstr "Berichte mir täglich"
-
-msgid "You do not seem to be connected. Please, verify you username and password, then try again."
-msgstr "Anscheinend sind Sie nicht verbunden. Prüfen Sie Benutzername und Kennwort und versuchen Sie es wieder."
-
-msgid "Reply from {0} to {0}, the reply is : {2}"
-msgstr "Antwort von {0} an {0}, die Antwort lautet: {2}"
-
-msgid "No new tweets available."
-msgstr "Keine neuen Tweets vorhanden."
-
-msgid "Twitter is busy for now, please, try later."
-msgstr "Twitter ist ausgelastet, versuchen Sie es später."
-
-msgid "reply from {0}, the reply is: {1}"
-msgstr "Antwort von {0}, die Antwort lautet: {1}"
-
-msgid "you don't have replies"
-msgstr "Sie haben keine Antworten"
-
-msgid "message from {0}, the message is: {1}"
-msgstr "Nachricht von {0}, die Nachricht lautet: {1}"
-
-msgid "you don't have private messages"
-msgstr "Sie haben keine privaten Nachrichten"
-
-msgid "I cannot get connected to your twitter account. Please, verify your internet connection."
-msgstr "Verbindung zu Ihrem Twitter-Konto nicht möglich. Überprüfen Sie Ihren Internet-Anschluss."
-
+msgid "Twitter Plugin"
+msgstr "Twitter Plugin"
+
+msgid "The Twitter plugin will make Tux Droid check your Twitter account."
+msgstr ""
+
+msgid "Username"
+msgstr "Benutzername"
+
+msgid "Password"
+msgstr "Kennwort"
+
+msgid "Tweet your new status"
+msgstr "Tweeten Sie Ihren neuen Status"
+
+msgid "Tweet following status text"
+msgstr "Tweeten Sie entsprechend dem Statustext"
+
+msgid "Hello all from my Tux Droid twitter gadget"
+msgstr "Hallo an Alle von meinem Twitter - Tux Droid"
+
+msgid "Check Friends updates"
+msgstr ""
+
+msgid "Check my messages/replies"
+msgstr ""
+
+msgid "Check your Twitter account."
+msgstr ""
+
+msgid "Check your tweets from your Twitter account."
+msgstr ""
+
+msgid "Start me every x"
+msgstr ""
+
+msgid "You do not seem to be connected. Please, verify you username and password, then try again."
+msgstr "Anscheinend sind Sie nicht verbunden. Prüfen Sie Benutzername und Kennwort und versuchen Sie es wieder."
+
+msgid "You have a new friend update"
+msgstr ""
+
+msgid "You have {0} friend updates"
+msgstr ""
+
+msgid "You don't have any friend updates."
+msgstr ""
+
+msgid "You don't have any messages"
+msgstr ""
+
+msgid "You don't have any replies"
+msgstr ""
+
+msgid "Your new Tweet was not set, please, try again later"
+msgstr ""
+
+msgid "Your Tweet was added"
+msgstr ""
+
+msgid "Twitter is busy for now, please, try later."
+msgstr "Twitter ist ausgelastet, versuchen Sie es später."
+
+msgid "One reply from {0}"
+msgstr ""
+
+msgid "{0} replies from {1}"
+msgstr ""
+
+msgid "One message from {0}"
+msgstr ""
+
+msgid "{0} messages from {1}"
+msgstr ""
+
Modified: software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/en.po
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/en.po 2009-10-09 12:23:30 UTC (rev 5628)
+++ software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/en.po 2009-10-09 12:51:45 UTC (rev 5629)
@@ -1,15 +1,12 @@
msgid "Twitter Plugin"
msgstr "Twitter Plugin"
-msgid "The Twitter plugin will make Tux Droid read your tweets from your Twitter account."
-msgstr "The Twitter plugin will make Tux Droid read your tweets from your Twitter account."
+msgid "The Twitter plugin will make Tux Droid check your Twitter account."
+msgstr "The Twitter plugin will make Tux Droid check your Twitter account."
msgid "Username"
msgstr "Username"
-msgid "your_user_name"
-msgstr "your user name"
-
msgid "Password"
msgstr "Password"
@@ -22,62 +19,57 @@
msgid "Hello all from my Tux Droid twitter gadget"
msgstr "Hello all from my Tux Droid twitter gadget"
-msgid "Maximum tweets to read"
-msgstr "Maximum tweets to read"
+msgid "Check Friends updates"
+msgstr "Check Friends updates"
-msgid "Give replies sent between followers"
-msgstr "Give replies sent between followers"
+msgid "Check my messages/replies"
+msgstr "Check my messages/replies"
-msgid "Give my messages/replies"
-msgstr "Give my messages/replies"
+msgid "Check your Twitter account."
+msgstr "Check your Twitter account."
-msgid "Read / update your tweets from your Twitter account."
-msgstr "Read / update your tweets from your Twitter account."
+msgid "Check your tweets from your Twitter account."
+msgstr "Check your tweets from your Twitter account."
-msgid "Read your tweets from your Twitter account."
-msgstr "Read your tweets from your Twitter account."
-
-msgid "Start every x"
-msgstr "Real time report"
-
msgid "Start me every x"
-msgstr "Notify me of changes in real time"
+msgstr "Alert"
-msgid "Start every x from full hour"
-msgstr "Regular report"
+msgid "You do not seem to be connected. Please, verify you username and password, then try again."
+msgstr "You do not seem to be connected. Please, verify you username and password, then try again."
-msgid "Start me every x (From full hour)"
-msgstr "Give me a report regularly"
+msgid "You have a new friend update"
+msgstr "You have a new friend update"
-msgid "Start daily at"
-msgstr "Daily report"
+msgid "You have {0} friend updates"
+msgstr "You have {0} friend updates"
-msgid "Start me daily"
-msgstr "Give me a daily report"
+msgid "You don't have any friend updates."
+msgstr "You don't have any friend updates."
-msgid "You do not seem to be connected. Please, verify you username and password, then try again."
-msgstr "You do not seem to be connected. Please, verify you username and password, then try again."
+msgid "You don't have any messages"
+msgstr "You don't have any messages"
-msgid "Reply from {0} to {0}, the reply is : {2}"
-msgstr "Reply from {0} to {0}, the reply is : {2}"
+msgid "You don't have any replies"
+msgstr "You don't have any replies"
-msgid "No new tweets available."
-msgstr "No new tweets available."
+msgid "Your new Tweet was not set, please, try again later"
+msgstr "Your new Tweet was not set, please, try again later"
+msgid "Your Tweet was added"
+msgstr "Your Tweet was added"
+
msgid "Twitter is busy for now, please, try later."
msgstr "Twitter is busy for now, please, try later."
-msgid "reply from {0}, the reply is: {1}"
-msgstr "reply from {0}, the reply is: {1}"
+msgid "One reply from {0}"
+msgstr "One reply from {0}"
-msgid "you don't have replies"
-msgstr "you don't have replies"
+msgid "{0} replies from {1}"
+msgstr "{0} replies from {1}"
-msgid "message from {0}, the message is: {1}"
-msgstr "message from {0}, the message is: {1}"
+msgid "One message from {0}"
+msgstr "One message from {0}"
-msgid "you don't have private messages"
-msgstr "you don't have private messages"
+msgid "{0} messages from {1}"
+msgstr "{0} messages from {1}"
-msgid "I cannot get connected to your twitter accound. Please, verify your internet connection."
-msgstr "I cannot get connected to your twitter accound. Please, verify your internet connection."
Modified: software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/fr.po
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/fr.po 2009-10-09 12:23:30 UTC (rev 5628)
+++ software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/fr.po 2009-10-09 12:51:45 UTC (rev 5629)
@@ -1,15 +1,12 @@
msgid "Twitter Plugin"
msgstr "Plugin Twitter"
-msgid "The Twitter plugin will make Tux Droid read your tweets from your Twitter account."
-msgstr "Le plugin Twitter permet à Tux Droid de lire vos tweets à partir de votre compte Twitter."
+msgid "The Twitter plugin will make Tux Droid check your Twitter account."
+msgstr "Le plugin Twitter permet à Tux Droid de vous tenir au courrant dès qu'il y a du nouveau sur votre compte Twitter."
msgid "Username"
msgstr "Utilisateur"
-msgid "your_user_name"
-msgstr "Votre nom d'utilisateur"
-
msgid "Password"
msgstr "Mot de passe"
@@ -22,63 +19,57 @@
msgid "Hello all from my Tux Droid twitter gadget"
msgstr "Bonjour à tous à partir du gadget Twitter de mon Tux Droid"
-msgid "Maximum tweets to read"
-msgstr "Tweets maximum à lire"
+msgid "Check Friends updates"
+msgstr "Vérifier les Tweets de mes amis"
-msgid "Give replies sent between followers"
-msgstr "Donner les réponses entre followers"
+msgid "Check my messages/replies"
+msgstr "Vérifier mes messages / réponses"
-msgid "Give my messages/replies"
-msgstr "Donner mes messages / réponses"
+msgid "Check your Twitter account."
+msgstr "Vérifier votre compte Twitter"
-msgid "Read / update your tweets from your Twitter account."
-msgstr "Lire / Mettre à jour vos tweets"
+msgid "Check your tweets from your Twitter account."
+msgstr "Vérifier vos Tweets"
-msgid "Read your tweets from your Twitter account."
-msgstr "Lire vos tweets"
-
-msgid "Start every x"
-msgstr "Rapport en temps réel"
-
msgid "Start me every x"
-msgstr "Me notifier des changements en temps réel"
+msgstr "Alerte"
-msgid "Start every x from full hour"
-msgstr "Rapport régulier"
+msgid "You do not seem to be connected. Please, verify you username and password, then try again."
+msgstr "Il semble que vous ne soyez pas connecté. Vérifiez votre login et votre mot de passe et essayez à nouveau."
-msgid "Start me every x (From full hour)"
-msgstr "Me donner un rapport régulier"
+msgid "You have a new friend update"
+msgstr "Un ami à publié un nouveau Tweet"
-msgid "Start daily at"
-msgstr "Raport journalier"
+msgid "You have {0} friend updates"
+msgstr "{0} de vos amis ont publié un nouveau Tweet"
-msgid "Start me daily"
-msgstr "Me donner un rapport journalier"
+msgid "You don't have any friend updates."
+msgstr "Vos amis n'ont pas publié de Tweets"
-msgid "You do not seem to be connected. Please, verify you username and password, then try again."
-msgstr "Il semble que vous n'êtes pas connecté. Vérifiez votre login et votre mot de passe et essayez à nouveau."
+msgid "You don't have any messages"
+msgstr "Vous n'avez pas de nouveau messages"
-msgid "Reply from {0} to {0}, the reply is : {2}"
-msgstr "Reply from {0} to {0}, the reply is : {2}"
+msgid "You don't have any replies"
+msgstr "Vous n'avez pas de nouvelles réponses"
-msgid "No new tweets available."
-msgstr "Aucun nouveau tweet disponible."
+msgid "Your new Tweet was not set, please, try again later"
+msgstr "Votre Tweet n'a pas été publié, s'il vous plait, essayez à nouveau."
+msgid "Your Tweet was added"
+msgstr "Votre Tweet a été publié"
+
msgid "Twitter is busy for now, please, try later."
msgstr "Twitter est occupé pour le moment, veuillez réessayer plus tard."
-msgid "reply from {0}, the reply is: {1}"
-msgstr "Réponse de {0}, la réponse est: {1}"
+msgid "One reply from {0}"
+msgstr "Une réponse de {0}"
-msgid "you don't have replies"
-msgstr "Vous n'avez pas de réponses"
+msgid "{0} replies from {1}"
+msgstr "{0} réponses de {1} "
-msgid "message from {0}, the message is: {1}"
-msgstr "Message de {0}, les message est: {1}"
+msgid "One message from {0}"
+msgstr "Un message de {0}"
-msgid "you don't have private messages"
-msgstr "Vous n'avez pas de messages privés."
+msgid "{0} messages from {1}"
+msgstr "{0} messages de {1}"
-msgid "I cannot get connected to your twitter accound. Please, verify your internet connection."
-msgstr "Je ne peux me connecter à votre compte Twitter. S'il vous plait, vérifiez votre connexion internet."
-
Modified: software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/nl.po
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/nl.po 2009-10-09 12:23:30 UTC (rev 5628)
+++ software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/nl.po 2009-10-09 12:51:45 UTC (rev 5629)
@@ -1,15 +1,12 @@
msgid "Twitter Plugin"
msgstr "Twitter Plugin"
-msgid "The Twitter plugin will make Tux Droid read your tweets from your Twitter account."
-msgstr "De Twitter gadget zal Tux Droid je tweets doen lezen van je Twitter account."
+msgid "The Twitter plugin will make Tux Droid check your Twitter account."
+msgstr ""
msgid "Username"
msgstr "Gebruikersnaam"
-msgid "your_user_name"
-msgstr "uw gebruikersnaam"
-
msgid "Password"
msgstr "Wachtwoord"
@@ -22,62 +19,57 @@
msgid "Hello all from my Tux Droid twitter gadget"
msgstr "Hallo allemaal van mijn Tux Droid Twitter gadget"
-msgid "Maximum tweets to read"
-msgstr "Maximum te lezen tweets"
+msgid "Check Friends updates"
+msgstr ""
-msgid "Give replies sent between followers"
-msgstr "Geef antwoorden weer tussen followers"
+msgid "Check my messages/replies"
+msgstr ""
-msgid "Give my messages/replies"
-msgstr "Geef mijn berichten/antwoorden weer"
+msgid "Check your Twitter account."
+msgstr ""
-msgid "Read / update your tweets from your Twitter account."
-msgstr "Lees / update jouw tweets van jouw Twitter account."
+msgid "Check your tweets from your Twitter account."
+msgstr ""
-msgid "Read your tweets from your Twitter account."
-msgstr "Lees jouw tweets van jouw Twitter account."
-
-msgid "Start every x"
-msgstr "Check jouw Twitter account automatisch"
-
msgid "Start me every x"
-msgstr "Check jouw Twitter account automatisch"
+msgstr ""
-msgid "Start every x from full hour"
-msgstr "Start op regelmatige tijdstippen"
+msgid "You do not seem to be connected. Please, verify you username and password, then try again."
+msgstr "Ik kan geen verbinding maken. Controleer of je gebruikersnaam en wachtwoord correct zijn ingegeven."
-msgid "Start me every x (From full hour)"
-msgstr "Start op regelmatige tijdstippen"
+msgid "You have a new friend update"
+msgstr ""
-msgid "Start daily at"
-msgstr "Start mij dagelijks"
+msgid "You have {0} friend updates"
+msgstr ""
-msgid "Start me daily"
-msgstr "Start mij dagelijks"
+msgid "You don't have any friend updates."
+msgstr ""
-msgid "You do not seem to be connected. Please, verify you username and password, then try again."
-msgstr "Ik kan geen verbinding maken. Controleer of je gebruikersnaam en wachtwoord correct zijn ingegeven."
+msgid "You don't have any messages"
+msgstr ""
-msgid "Reply from {0} to {0}, the reply is : {2}"
-msgstr "antwoord van {0} op {0}, het antwoord is : {2}"
+msgid "You don't have any replies"
+msgstr ""
-msgid "No new tweets available."
-msgstr "Er zijn geen nieuwe tweets beschikbaar."
+msgid "Your new Tweet was not set, please, try again later"
+msgstr ""
+msgid "Your Tweet was added"
+msgstr ""
+
msgid "Twitter is busy for now, please, try later."
-msgstr "Twitter is bezet op het ogenblik. Probeer later opnieuw."
+msgstr ""
-msgid "reply from {0}, the reply is: {1}"
-msgstr "antwoord van {0}, het antwoord is: {1}"
+msgid "One reply from {0}"
+msgstr ""
-msgid "you don't have replies"
-msgstr "Er zijn geen antwoorden"
+msgid "{0} replies from {1}"
+msgstr ""
-msgid "message from {0}, the message is: {1}"
-msgstr "bericht van {0}, het bericht is: {1}"
+msgid "One message from {0}"
+msgstr ""
-msgid "you don't have private messages"
-msgstr "Je hebt geen persoonlijke berichten"
+msgid "{0} messages from {1}"
+msgstr ""
-msgid "I cannot get connected to your twitter accound. Please, verify your internet connection."
-msgstr "Ik kan geen verbinding maken met je twitter account. Gelieve je internet connectie te controleren."
|
|
From: jerome <c2m...@c2...> - 2009-10-09 12:46:33
|
Author: jerome
Date: 2009-10-09 14:23:30 +0200 (Fri, 09 Oct 2009)
New Revision: 5628
Modified:
software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/plugin.pot
Log:
* Updated po template.
Modified: software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/plugin.pot
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/plugin.pot 2009-10-09 12:16:15 UTC (rev 5627)
+++ software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/plugin.pot 2009-10-09 12:23:30 UTC (rev 5628)
@@ -1,15 +1,12 @@
msgid "Twitter Plugin"
msgstr ""
-msgid "The Twitter plugin will make Tux Droid read your tweets from your Twitter account."
+msgid "The Twitter plugin will make Tux Droid check your Twitter account."
msgstr ""
msgid "Username"
msgstr ""
-msgid "your_user_name"
-msgstr ""
-
msgid "Password"
msgstr ""
@@ -22,62 +19,57 @@
msgid "Hello all from my Tux Droid twitter gadget"
msgstr ""
-msgid "Maximum tweets to read"
+msgid "Check Friends updates"
msgstr ""
-msgid "Give replies sent between followers"
+msgid "Check my messages/replies"
msgstr ""
-msgid "Give my messages/replies"
+msgid "Check your Twitter account."
msgstr ""
-msgid "Read / update your tweets from your Twitter account."
+msgid "Check your tweets from your Twitter account."
msgstr ""
-msgid "Read your tweets from your Twitter account."
+msgid "Start me every x"
msgstr ""
-msgid "Start every x"
+msgid "You do not seem to be connected. Please, verify you username and password, then try again."
msgstr ""
-msgid "Start me every x"
+msgid "You have a new friend update"
msgstr ""
-msgid "Start every x from full hour"
+msgid "You have {0} friend updates"
msgstr ""
-msgid "Start me every x (From full hour)"
+msgid "You don't have any friend updates."
msgstr ""
-msgid "Start daily at"
+msgid "You don't have any messages"
msgstr ""
-msgid "Start me daily"
+msgid "You don't have any replies"
msgstr ""
-msgid "You do not seem to be connected. Please, verify you username and password, then try again."
+msgid "Your new Tweet was not set, please, try again later"
msgstr ""
-msgid "Reply from {0} to {0}, the reply is : {2}"
+msgid "Your Tweet was added"
msgstr ""
-msgid "No new tweets available."
-msgstr ""
-
msgid "Twitter is busy for now, please, try later."
msgstr ""
-msgid "reply from {0}, the reply is: {1}"
+msgid "One reply from {0}"
msgstr ""
-msgid "you don't have replies"
+msgid "{0} replies from {1}"
msgstr ""
-msgid "message from {0}, the message is: {1}"
+msgid "One message from {0}"
msgstr ""
-msgid "you don't have private messages"
+msgid "{0} messages from {1}"
msgstr ""
-msgid "I cannot get connected to your twitter accound. Please, verify your internet connection."
-msgstr ""
|
|
From: jerome <c2m...@c2...> - 2009-10-09 12:18:02
|
Author: jerome
Date: 2009-10-09 14:16:15 +0200 (Fri, 09 Oct 2009)
New Revision: 5627
Modified:
software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/plugin.xml
Log:
* Updated tasks description.
Modified: software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/plugin.xml
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/plugin.xml 2009-10-09 12:04:19 UTC (rev 5626)
+++ software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/plugin.xml 2009-10-09 12:16:15 UTC (rev 5627)
@@ -71,53 +71,11 @@
weekMask="true,true,true,true,true,true,true"
weekMaskType="weekpart"
- weekMaskVisible="true"
+ weekMaskVisible="false"
delay="00:01:00"
delayMask="true,true,true"
delayVisible="false"
/>
- <task
- name="Start every x from full hour"
- description="Start me every x (From full hour)"
- command="check"
- type="every x from full hour"
- activated="false"
-
- weekMask="true,true,true,true,true,true,true"
- weekMaskType="weekpart"
- weekMaskVisible="true"
-
- date="0000/00/00"
- dateVisible="false"
-
- hoursBegin="00:00:00"
- hoursBeginMask="true,true,true"
- hoursBeginVisible="false"
-
- hoursEnd="23:59:00"
- hoursEndMask="true,true,true"
- hoursEndVisible="false"
-
- delay="00:15:00"
- delayType="quarters"
- delayMask="true,true,false"
- delayVisible="true"
- />
- <task
- name="Start daily at"
- description="Start me daily"
- command="check"
- type="daily at"
- activated="false"
-
- weekMask="true,true,true,true,true,true,true"
- weekMaskType="weekpart"
- weekMaskVisible="true"
-
- hoursBegin="07:00:00"
- hoursBeginMask="true,true,false"
- hoursBeginVisible="true"
- />
</tasks>
</plugin>
|
|
From: jerome <c2m...@c2...> - 2009-10-09 12:04:32
|
Author: jerome
Date: 2009-10-09 14:04:19 +0200 (Fri, 09 Oct 2009)
New Revision: 5626
Modified:
software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/src/TwitterPlugin.java
Log:
* where was my mind ...
Modified: software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/src/TwitterPlugin.java
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/src/TwitterPlugin.java 2009-10-09 11:59:28 UTC (rev 5625)
+++ software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/src/TwitterPlugin.java 2009-10-09 12:04:19 UTC (rev 5626)
@@ -68,7 +68,7 @@
}
else
{
- return true;
+ return false;
}
}
catch(TwitterException notConnected)
|
|
From: jerome <c2m...@c2...> - 2009-10-09 11:59:45
|
Author: jerome
Date: 2009-10-09 13:59:28 +0200 (Fri, 09 Oct 2009)
New Revision: 5625
Modified:
software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/src/TwitterPlugin.java
Log:
* Added update Tweet option.
* Improved Tweets add by a tts sentense for result.
Modified: software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/src/TwitterPlugin.java
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/src/TwitterPlugin.java 2009-10-09 11:34:42 UTC (rev 5624)
+++ software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/src/TwitterPlugin.java 2009-10-09 11:59:28 UTC (rev 5625)
@@ -61,7 +61,15 @@
try
{
twitter.updateStatus(this.configuration().getMyStatus());
- return true;
+
+ if ( twitter.getStatus().getText().equalsIgnoreCase(this.configuration().getMyStatus()) )
+ {
+ return true;
+ }
+ else
+ {
+ return true;
+ }
}
catch(TwitterException notConnected)
{
@@ -226,66 +234,85 @@
{
if (! this.configuration().getUpdateStatus())
{
- //Getting new friend statuses count.
- int updateCount = getNewFriendStatusesCount(twitter);
-
- if ( updateCount == 1 )
+ /**
+ * Getting new friend statuses count if option is enabled.
+ */
+ if(this.configuration().getCheckFriends())
{
- throwRes();
- throwMessage("You have a new friend update");
- }
- else if ( updateCount > 1 )
- {
- throwRes();
- throwMessage("You have {0} friend updates", String.valueOf(updateCount));
- }
- else
- {
- if ( ! this.getCommand().equalsIgnoreCase("check") )
+ int updateCount = getNewFriendStatusesCount(twitter);
+
+ if ( updateCount == 1 )
{
- throwMessage("You don't have any friend updates.");
+ throwRes();
+ throwMessage("You have a new friend update");
}
+ else if ( updateCount > 1 )
+ {
+ throwRes();
+ throwMessage("You have {0} friend updates", String.valueOf(updateCount));
+ }
+ else
+ {
+ if ( ! this.getCommand().equalsIgnoreCase("check") )
+ {
+ throwMessage("You don't have any friend updates.");
+ }
+ }
}
- //Getting and sorting new user private messages.
- if ( getPrivateMessagesCount(twitter) > 0 )
- {
-
- this.sort(this.messagesList);
- //Counting by name and throwing messages.
- this.getByNames(this.messagesList, MESSAGE);
- }
- else
- {
- if ( ! this.getCommand().equalsIgnoreCase("check") )
- {
- throwMessage("You don't have any messages");
- }
- }
-
- //Getting and sorting new user replies.
- if ( getPublicMessagesCount(twitter) > 0 )
- {
- this.sort(this.repliesList);
- //Counting by name and throwing messages.
- this.getByNames(this.repliesList, REPLY);
- }
- else
- {
- if ( ! this.getCommand().equalsIgnoreCase("check") )
- {
- throwMessage("You don't have any replies");
- }
- }
-
- //Registering couted messages.
- savedStruct.registerStruct();
-
+
+ /**
+ * Getting, sorting new user private / public ( replies ) messages.
+ * if option is enabled.
+ */
+ if (this.configuration().getCheckMessages())
+ {
+ if ( getPrivateMessagesCount(twitter) > 0 )
+ {
+
+ this.sort(this.messagesList);
+ //Counting by name and throwing messages.
+ this.getByNames(this.messagesList, MESSAGE);
+ }
+ else
+ {
+ if ( ! this.getCommand().equalsIgnoreCase("check") )
+ {
+ throwMessage("You don't have any messages");
+ }
+ }
+
+ //Getting and sorting new user replies.
+ if ( getPublicMessagesCount(twitter) > 0 )
+ {
+ this.sort(this.repliesList);
+ //Counting by name and throwing messages.
+ this.getByNames(this.repliesList, REPLY);
+ }
+ else
+ {
+ if ( ! this.getCommand().equalsIgnoreCase("check") )
+ {
+ throwMessage("You don't have any replies");
+ }
+ }
+
+ //Registering couted messages.
+ savedStruct.registerStruct();
+
+ }
}
else
{
//Updating user status.
- this.setUserStatus(twitter);
+ if( ! this.setUserStatus(twitter) )
+ {
+ this.throwMessage("Your new Tweet was not set, please, try again later");
+ }
+ else
+ {
+ this.throwMessage("Your Tweet was added");
+ }
}
}
catch(TwitterException badRequest)
|
|
From: remi <c2m...@c2...> - 2009-10-09 11:35:03
|
Author: remi Date: 2009-10-09 13:34:42 +0200 (Fri, 09 Oct 2009) New Revision: 5624 Modified: software_suite_v3/software/gadget/default/trunk/gadget_84628d00-1e17-62dd-eaa4-7b11436f3211/de.wiki software_suite_v3/software/gadget/default/trunk/gadget_84628d00-1e17-62dd-eaa4-7b11436f3211/en.wiki software_suite_v3/software/gadget/default/trunk/gadget_84628d00-1e17-62dd-eaa4-7b11436f3211/fr.wiki software_suite_v3/software/gadget/default/trunk/gadget_84628d00-1e17-62dd-eaa4-7b11436f3211/help.wiki software_suite_v3/software/gadget/default/trunk/gadget_84628d00-1e17-62dd-eaa4-7b11436f3211/nl.wiki Log: * Updated gadget help according to the configuration Modified: software_suite_v3/software/gadget/default/trunk/gadget_84628d00-1e17-62dd-eaa4-7b11436f3211/de.wiki =================================================================== --- software_suite_v3/software/gadget/default/trunk/gadget_84628d00-1e17-62dd-eaa4-7b11436f3211/de.wiki 2009-10-09 11:01:32 UTC (rev 5623) +++ software_suite_v3/software/gadget/default/trunk/gadget_84628d00-1e17-62dd-eaa4-7b11436f3211/de.wiki 2009-10-09 11:34:42 UTC (rev 5624) @@ -3,11 +3,7 @@ Mehrere Einstellungen können in der Konfiguration geändert werden: * Adresse Ihres E-Mail-Servers -* Wählen Sie das Protokoll des Mailservers * Login Ihres E-Mail-Kontos * Kennwort Ihres E-Mail-Kontos -* Geben Sie Ihren IMAP-Ordner an (wenn Sie einen E-Mail-Server mit IMAP-Protokoll verwenden) -* Filter für die Sender von E-Mails aktivieren und definieren -* Filter für die Gegenstände von E-Mails aktivieren und definieren * Geben Sie einen Jingle für die automatische E-Mail-Prüfung durch Ihren Tux Droid an * Geben Sie an, dass Ihre Mailbox automatisch geprüft werden soll und an welchen Tagen Modified: software_suite_v3/software/gadget/default/trunk/gadget_84628d00-1e17-62dd-eaa4-7b11436f3211/en.wiki =================================================================== --- software_suite_v3/software/gadget/default/trunk/gadget_84628d00-1e17-62dd-eaa4-7b11436f3211/en.wiki 2009-10-09 11:01:32 UTC (rev 5623) +++ software_suite_v3/software/gadget/default/trunk/gadget_84628d00-1e17-62dd-eaa4-7b11436f3211/en.wiki 2009-10-09 11:34:42 UTC (rev 5624) @@ -3,11 +3,7 @@ Several settings can be changed in the configuration : * The address of your E-mail server -* Select the mail server protocol * Your E-mail account login * Your E-mail account password -* Specify your IMAP folder (if using an E-mail server with IMAP protocol) -* Activate and specify a filter for the senders of your E-mails -* Activate and specify a filter for the subjects of your E-mails * Specify an introduction attitune for when Tux Droid is checking your E-mail automatically * Specify to check your mail box automaticaly and on which days \ No newline at end of file Modified: software_suite_v3/software/gadget/default/trunk/gadget_84628d00-1e17-62dd-eaa4-7b11436f3211/fr.wiki =================================================================== --- software_suite_v3/software/gadget/default/trunk/gadget_84628d00-1e17-62dd-eaa4-7b11436f3211/fr.wiki 2009-10-09 11:01:32 UTC (rev 5623) +++ software_suite_v3/software/gadget/default/trunk/gadget_84628d00-1e17-62dd-eaa4-7b11436f3211/fr.wiki 2009-10-09 11:34:42 UTC (rev 5624) @@ -3,11 +3,7 @@ Voici les options que vous pouvez configurer : * L'adresse de votre serveur E-mail -* Le protocole utilisé par votre serveur E-mail * Votre login de connexion * Votre mot de passe de connexion -* Votre dossier IMAP de réception (si vous utilisez le protocole IMAP) -* L'activation d'un filtre sur les expéditeurs d'E-mails -* L'activation d'un filtre sur les sujets d'E-mails * Une vérification automatique de vos E-mails * Une attitune d'introduction lorsque Tux Droid vérifie automatiquement vos E-mails Modified: software_suite_v3/software/gadget/default/trunk/gadget_84628d00-1e17-62dd-eaa4-7b11436f3211/help.wiki =================================================================== --- software_suite_v3/software/gadget/default/trunk/gadget_84628d00-1e17-62dd-eaa4-7b11436f3211/help.wiki 2009-10-09 11:01:32 UTC (rev 5623) +++ software_suite_v3/software/gadget/default/trunk/gadget_84628d00-1e17-62dd-eaa4-7b11436f3211/help.wiki 2009-10-09 11:34:42 UTC (rev 5624) @@ -3,11 +3,7 @@ Several settings can be changed in the configuration : * The address of your E-mail server -* Select the mail server protocol * Your E-mail account login * Your E-mail account password -* Specify your IMAP folder (if using an E-mail server with IMAP protocol) -* Activate and specify a filter for the senders of your E-mails -* Activate and specify a filter for the subjects of your E-mails * Specify an introduction attitune for when Tux Droid is checking your E-mail automatically * Specify to check your mail box automaticaly and on which days \ No newline at end of file Modified: software_suite_v3/software/gadget/default/trunk/gadget_84628d00-1e17-62dd-eaa4-7b11436f3211/nl.wiki =================================================================== --- software_suite_v3/software/gadget/default/trunk/gadget_84628d00-1e17-62dd-eaa4-7b11436f3211/nl.wiki 2009-10-09 11:01:32 UTC (rev 5623) +++ software_suite_v3/software/gadget/default/trunk/gadget_84628d00-1e17-62dd-eaa4-7b11436f3211/nl.wiki 2009-10-09 11:34:42 UTC (rev 5624) @@ -3,11 +3,7 @@ Verschillende instellingen kunnen aangepast worden in de configuratie : * Het adres van jouw E-mail server -* Selecteer het protocol van jouw E-mail server * Jouw E-mail account login * Jouw E-mail account wachtwoord -* Geef jouw IMAP foldr in (indien je een mail server hebt met het IMAP protocol) -* Activeer en stel een filter in voor de afzenders van jouw mails -* Activeer en stel een filter in voor de onderwerpen van jouw mails * Kies een introductie attitune voor wanneer Tux Droid je mail automatisch checkt * Kies of je jouw E-mail automatisch wil laten checken en op welke dagen \ No newline at end of file |
|
From: jerome <c2m...@c2...> - 2009-10-09 11:01:38
|
Author: jerome
Date: 2009-10-09 13:01:32 +0200 (Fri, 09 Oct 2009)
New Revision: 5623
Modified:
software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/pom.xml
software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/plugin.xml
Log:
* Bumped to version 4.0.
Modified: software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/pom.xml
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/pom.xml 2009-10-09 10:57:58 UTC (rev 5622)
+++ software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/pom.xml 2009-10-09 11:01:32 UTC (rev 5623)
@@ -4,7 +4,7 @@
<groupId>com.kysoh</groupId>
<artifactId>plugin-twitter</artifactId>
<packaging>jar</packaging>
- <version>3.0</version>
+ <version>4.0</version>
<name>Twitter plugin for Tux Droid</name>
<url>http://www.tuxisalive.com</url>
Modified: software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/plugin.xml
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/plugin.xml 2009-10-09 10:57:58 UTC (rev 5622)
+++ software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/plugin.xml 2009-10-09 11:01:32 UTC (rev 5623)
@@ -9,7 +9,7 @@
<ttsName>Twitter</ttsName>
<description>The Twitter plugin will make Tux Droid check your Twitter account.</description>
<author>Jérôme Conan</author>
- <version>3.0</version>
+ <version>4.0</version>
<iconFile>resources/plugin.png</iconFile>
<executionMode>command</executionMode>
<uuid>623afa3f-7ae3-43f9-b89b-bc5a8185b0cf</uuid>
|
|
From: jerome <c2m...@c2...> - 2009-10-09 10:58:12
|
Author: jerome
Date: 2009-10-09 12:57:58 +0200 (Fri, 09 Oct 2009)
New Revision: 5622
Modified:
software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/pom.xml
software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/src/TwitterDatasStruct.java
software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/src/TwitterPlugin.java
Log:
* Reverted save directory ( user session only ).
* Fixed a bug when user has only one message in alert mode.
* Improved the tts sentenses.
Modified: software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/pom.xml
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/pom.xml 2009-10-09 10:57:45 UTC (rev 5621)
+++ software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/pom.xml 2009-10-09 10:57:58 UTC (rev 5622)
@@ -14,11 +14,6 @@
<groupId>com.kysoh</groupId>
<artifactId>tuxdroid-plugin-java-kit</artifactId>
<version>0.0.3</version>
- </dependency>
- <dependency>
- <groupId>com.kysoh</groupId>
- <artifactId>smart-core-paths</artifactId>
- <version>0.0.1</version>
</dependency>
<dependency>
<groupId>jtwitter</groupId>
Modified: software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/src/TwitterDatasStruct.java
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/src/TwitterDatasStruct.java 2009-10-09 10:57:45 UTC (rev 5621)
+++ software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/src/TwitterDatasStruct.java 2009-10-09 10:57:58 UTC (rev 5622)
@@ -27,14 +27,10 @@
import java.io.Serializable;
import java.util.Vector;
-import com.kysoh.SmartCorePaths;
-
public class TwitterDatasStruct extends Object implements Serializable{
private static final long serialVersionUID = 8395814134877723558L;
- private static String linuxDatasSav = "";
- private static String windowsDatasSav = "";
public static final byte FRIENDS_STATUSES = 0;
public static final byte REPLIES = 1;
@@ -45,51 +41,13 @@
private boolean firstCycle;
- /**
- * Path initialization.
- */
- static
- {
- if ( SmartCorePaths.isLinux() )
- {
- TwitterDatasStruct.linuxDatasSav = System.getenv("HOME") + "/.tuxdroid/plugins_conf/Twitter";
-
- if (! ( new File(linuxDatasSav)).exists())
- {
- if ( ! ( new File(linuxDatasSav) ).mkdirs() )
- {
- ( new File(linuxDatasSav) ).mkdir();
- }
- }
- }
- else
- {
- TwitterDatasStruct.windowsDatasSav = System.getenv("ALLUSERSDIR") + "/tuxdroid/plugins_conf/Twitter";
-
- if (! ( new File(windowsDatasSav)).exists())
- {
- if ( ! ( new File(windowsDatasSav) ).mkdirs() )
- {
- ( new File(windowsDatasSav) ).mkdir();
- }
- }
- }
- }
-
-
public TwitterDatasStruct(String username)
{
//tds = tuxdroid datas saved.
- if (SmartCorePaths.isLinux())
- {
- structFile = new File(linuxDatasSav + File.separator + username + "@twitter.sav");
- }
- else
- {
- structFile = new File(windowsDatasSav + File.separator + username + "@twitter.sav");
- }
+ File path = new File("");
+ structFile = new File( path.getAbsolutePath() + File.separator + username + "@twitter.sav");
if(structFile.exists())
{
Modified: software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/src/TwitterPlugin.java
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/src/TwitterPlugin.java 2009-10-09 10:57:45 UTC (rev 5621)
+++ software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/src/TwitterPlugin.java 2009-10-09 10:57:58 UTC (rev 5622)
@@ -24,6 +24,8 @@
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.List;
+import java.util.Vector;
+
import com.kysoh.tuxdroid.plugin.framework.plugin.SimplePlugin;
import winterwell.jtwitter.Twitter;
import winterwell.jtwitter.TwitterException;
@@ -41,6 +43,7 @@
private List<String> messagesList = new ArrayList<String>();
private List<String> repliesList = new ArrayList<String>();
+ private boolean throwed = false;
/***
This function set the new user status.
@@ -62,7 +65,10 @@
}
catch(TwitterException notConnected)
{
- throwMessage("You do not seem to be connected. Please, verify you username and password, then try again.");
+ if (!this.getCommand().equalsIgnoreCase("check"))
+ {
+ throwMessage("You do not seem to be connected. Please, verify you username and password, then try again.");
+ }
this.quitGadget();
}
}
@@ -191,7 +197,17 @@
}
+ private void throwRes()
+ {
+ if ( ( !throwed ) && ( this.getCommand().equalsIgnoreCase("check") ))
+ {
+ this.throwed = true;
+ this.throwResult(true);
+ }
+ this.throwMessage("Twitter");
+ }
+
@Override
protected void start() throws Throwable
{
@@ -212,13 +228,16 @@
{
//Getting new friend statuses count.
int updateCount = getNewFriendStatusesCount(twitter);
+
if ( updateCount == 1 )
{
+ throwRes();
throwMessage("You have a new friend update");
}
else if ( updateCount > 1 )
{
- throwMessage("Yo have {0} friend updates", String.valueOf(updateCount));
+ throwRes();
+ throwMessage("You have {0} friend updates", String.valueOf(updateCount));
}
else
{
@@ -227,34 +246,35 @@
throwMessage("You don't have any friend updates.");
}
}
-
- //Getting and sorting new user replies.
- if ( getPublicMessagesCount(twitter) > 0 )
+
+ //Getting and sorting new user private messages.
+ if ( getPrivateMessagesCount(twitter) > 0 )
{
- this.sort(this.repliesList);
- //Counting by name and throwing messages.
- this.getByNames(this.repliesList, REPLY);
+
+ this.sort(this.messagesList);
+ //Counting by name and throwing messages.
+ this.getByNames(this.messagesList, MESSAGE);
}
else
{
if ( ! this.getCommand().equalsIgnoreCase("check") )
{
- throwMessage("You don't have any replies");
+ throwMessage("You don't have any messages");
}
}
- //Getting and sorting new user private messages.
- if ( getPrivateMessagesCount(twitter) > 0 )
+ //Getting and sorting new user replies.
+ if ( getPublicMessagesCount(twitter) > 0 )
{
- this.sort(this.messagesList);
- //Counting by name and throwing messages.
- this.getByNames(this.messagesList, MESSAGE);
+ this.sort(this.repliesList);
+ //Counting by name and throwing messages.
+ this.getByNames(this.repliesList, REPLY);
}
else
{
if ( ! this.getCommand().equalsIgnoreCase("check") )
{
- throwMessage("You don't have any messages");
+ throwMessage("You don't have any replies");
}
}
@@ -297,7 +317,8 @@
*/
private void getByNames(List<String> list, byte type)
{
- Hashtable<String, Integer> dtUsers = new Hashtable<String, Integer>();
+ Vector<String> dtUsers = new Vector<String>();
+ Vector<Integer> dtCount = new Vector<Integer>();
int count = 1;
//Handling no replies / no messages.
@@ -305,31 +326,31 @@
{
return;
}
- else
- {
- throwMessage("You have");
- }
-
//Counting by names.
- for( int i = 0 ; i != list.size() - 1 ; i ++)
+ for( int i = 0 ; i != list.size() ; i ++)
{
- if ( list.get( i ).equals(list.get( i + 1 )))
+
+ if (dtUsers.contains(list.get(i)))
{
- count += 1;
+ dtCount.set(dtUsers.indexOf(list.get(i)), dtCount.get(dtUsers.indexOf(list.get(i))) + 1);
}
else
{
- dtUsers.put(list.get(i), Integer.valueOf(count));
- count = 1;
+ dtUsers.add(list.get(i));
+ dtCount.add(1);
}
+
}
- Enumeration<String> enu = dtUsers.keys();
- while( enu.hasMoreElements())
+ if (dtUsers.size() > 0)
{
- String it = enu.nextElement();
- count = dtUsers.get(it).intValue();
+ throwRes();
+ }
+
+ for(String it : dtUsers)
+ {
+ count = dtCount.get(dtUsers.indexOf(it));
if ( type == REPLY )
{
@@ -439,10 +460,10 @@
*/
public void quitGadget()
{
- //if(this.getCommand().equalsIgnoreCase("check") && this.throwed)
- //{
- //this.throwResult(false);
- //}
+ if(this.getCommand().equalsIgnoreCase("check") && this.throwed)
+ {
+ this.throwResult(false);
+ }
System.exit(0);
}
|
|
From: remi <c2m...@c2...> - 2009-10-09 10:57:57
|
Author: remi
Date: 2009-10-09 12:57:45 +0200 (Fri, 09 Oct 2009)
New Revision: 5621
Modified:
software_suite_v3/software/gadget/default/trunk/gadget_06d0b3ba-7781-4d2d-bd48-520cfa18e0c9/gadget.xml
software_suite_v3/software/gadget/default/trunk/gadget_84628d00-1e17-62dd-eaa4-7b11436f3211/gadget.xml
Log:
* Updated email and gmail gadgets according to the plugins modifications
Modified: software_suite_v3/software/gadget/default/trunk/gadget_06d0b3ba-7781-4d2d-bd48-520cfa18e0c9/gadget.xml
===================================================================
--- software_suite_v3/software/gadget/default/trunk/gadget_06d0b3ba-7781-4d2d-bd48-520cfa18e0c9/gadget.xml 2009-10-09 10:20:37 UTC (rev 5620)
+++ software_suite_v3/software/gadget/default/trunk/gadget_06d0b3ba-7781-4d2d-bd48-520cfa18e0c9/gadget.xml 2009-10-09 10:57:45 UTC (rev 5621)
@@ -10,64 +10,34 @@
<platform>all</platform>
<ttsName>GMail.</ttsName>
<uuid>06d0b3ba-7781-4d2d-bd48-520cfa18e0c9</uuid>
- <version>3.0</version>
+ <version>4.0</version>
</description>
<parameters>
<param_00>
- <defaultValue>Re:important document</defaultValue>
- <name>subjectFilter</name>
- <visible>false</visible>
- </param_00>
- <param_01>
- <defaultValue>pop3</defaultValue>
- <name>protocol</name>
- <visible>false</visible>
- </param_01>
- <param_02>
<defaultValue> </defaultValue>
<name>locutor</name>
<visible>false</visible>
- </param_02>
- <param_03>
- <defaultValue>false</defaultValue>
- <name>filerSubject</name>
- <visible>false</visible>
- </param_03>
- <param_04>
- <defaultValue>false</defaultValue>
- <name>filterSender</name>
- <visible>false</visible>
- </param_04>
- <param_05>
+ </param_00>
+ <param_01>
<defaultValue>your.server.com</defaultValue>
<name>host</name>
<visible>false</visible>
- </param_05>
- <param_06>
+ </param_01>
+ <param_02>
<defaultValue>your_user</defaultValue>
<name>user</name>
<visible>true</visible>
- </param_06>
- <param_07>
- <defaultValue>INBOX</defaultValue>
- <name>folder</name>
- <visible>false</visible>
- </param_07>
- <param_08>
+ </param_02>
+ <param_03>
<defaultValue>password</defaultValue>
<name>password</name>
<visible>true</visible>
- </param_08>
- <param_09>
- <defaultValue>bo...@my...,myg...@ho...</defaultValue>
- <name>senderFilter</name>
- <visible>false</visible>
- </param_09>
+ </param_03>
</parameters>
<parentPlugin>
<url>http://ftp.kysoh.com/</url>
<uuid>2a04c20d-6418-4b62-a006-9d9991fe1d1e</uuid>
- <version>3.0</version>
+ <version>4.0</version>
</parentPlugin>
<tasks>
<task_00>
@@ -79,14 +49,5 @@
<name>Start every x</name>
<weekMask>true,true,true,true,true,true,true</weekMask>
</task_00>
- <task_01>
- <activated>false</activated>
- <date>0000/00/00</date>
- <delay>00:15:00</delay>
- <hoursBegin>00:00:00</hoursBegin>
- <hoursEnd>23:59:00</hoursEnd>
- <name>Start every x from full hour</name>
- <weekMask>true,true,true,true,true,true,true</weekMask>
- </task_01>
</tasks>
</gadget>
Modified: software_suite_v3/software/gadget/default/trunk/gadget_84628d00-1e17-62dd-eaa4-7b11436f3211/gadget.xml
===================================================================
--- software_suite_v3/software/gadget/default/trunk/gadget_84628d00-1e17-62dd-eaa4-7b11436f3211/gadget.xml 2009-10-09 10:20:37 UTC (rev 5620)
+++ software_suite_v3/software/gadget/default/trunk/gadget_84628d00-1e17-62dd-eaa4-7b11436f3211/gadget.xml 2009-10-09 10:57:45 UTC (rev 5621)
@@ -10,64 +10,34 @@
<platform>all</platform>
<ttsName>E-Mail.</ttsName>
<uuid>84628d00-1e17-62dd-eaa4-7b11436f3211</uuid>
- <version>3.0</version>
+ <version>4.0</version>
</description>
<parameters>
<param_00>
- <defaultValue>Re:important document</defaultValue>
- <name>subjectFilter</name>
- <visible>true</visible>
- </param_00>
- <param_01>
- <defaultValue>pop3</defaultValue>
- <name>protocol</name>
- <visible>true</visible>
- </param_01>
- <param_02>
<defaultValue> </defaultValue>
<name>locutor</name>
<visible>false</visible>
- </param_02>
- <param_03>
- <defaultValue>false</defaultValue>
- <name>filerSubject</name>
- <visible>true</visible>
- </param_03>
- <param_04>
- <defaultValue>false</defaultValue>
- <name>filterSender</name>
- <visible>true</visible>
- </param_04>
- <param_05>
+ </param_00>
+ <param_01>
<defaultValue>your.server.com</defaultValue>
<name>host</name>
<visible>true</visible>
- </param_05>
- <param_06>
+ </param_01>
+ <param_02>
<defaultValue>your_user</defaultValue>
<name>user</name>
<visible>true</visible>
- </param_06>
- <param_07>
- <defaultValue>INBOX</defaultValue>
- <name>folder</name>
- <visible>true</visible>
- </param_07>
- <param_08>
+ </param_02>
+ <param_03>
<defaultValue>_secret_</defaultValue>
<name>password</name>
<visible>true</visible>
- </param_08>
- <param_09>
- <defaultValue>bo...@my...,myg...@ho...</defaultValue>
- <name>senderFilter</name>
- <visible>true</visible>
- </param_09>
+ </param_03>
</parameters>
<parentPlugin>
<url>http://ftp.kysoh.com/</url>
<uuid>f63af23e-7ae0-4389-b89b-bc5a8185b0c8</uuid>
- <version>3.0</version>
+ <version>4.0</version>
</parentPlugin>
<tasks>
<task_00>
@@ -79,14 +49,5 @@
<name>Start every x</name>
<weekMask>true,true,true,true,true,true,true</weekMask>
</task_00>
- <task_01>
- <activated>false</activated>
- <date>0000/00/00</date>
- <delay>00:15:00</delay>
- <hoursBegin>00:00:00</hoursBegin>
- <hoursEnd>23:59:00</hoursEnd>
- <name>Start every x from full hour</name>
- <weekMask>true,true,true,true,true,true,true</weekMask>
- </task_01>
</tasks>
</gadget>
|
|
From: remi <c2m...@c2...> - 2009-10-09 10:20:49
|
Author: remi
Date: 2009-10-09 12:20:37 +0200 (Fri, 09 Oct 2009)
New Revision: 5620
Modified:
software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/pom.xml
software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/plugin.xml
Log:
* Updated version to 4.0
Modified: software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/pom.xml
===================================================================
--- software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/pom.xml 2009-10-09 10:19:39 UTC (rev 5619)
+++ software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/pom.xml 2009-10-09 10:20:37 UTC (rev 5620)
@@ -4,7 +4,7 @@
<groupId>com.kysoh</groupId>
<artifactId>plugin-gmail</artifactId>
<packaging>jar</packaging>
- <version>3.0</version>
+ <version>4.0</version>
<name>GMail plugin for Tux Droid</name>
<url>http://www.tuxisalive.com</url>
Modified: software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/plugin.xml
===================================================================
--- software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/plugin.xml 2009-10-09 10:19:39 UTC (rev 5619)
+++ software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/plugin.xml 2009-10-09 10:20:37 UTC (rev 5620)
@@ -8,7 +8,7 @@
<name>GMail plugin</name>
<description>GMail plugin</description>
<author>Yoran Brault</author>
- <version>3.0</version>
+ <version>4.0</version>
<iconFile>resources/plugin.png</iconFile>
<executionMode>service</executionMode>
<uuid>2a04c20d-6418-4b62-a006-9d9991fe1d1e</uuid>
|
|
From: remi <c2m...@c2...> - 2009-10-09 10:19:47
|
Author: remi
Date: 2009-10-09 12:19:39 +0200 (Fri, 09 Oct 2009)
New Revision: 5619
Removed:
software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/src/net/karmaLab/tuxDroid/plugins/ServerProtocol.java
Modified:
software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/plugin.xml
software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/src/net/karmaLab/tuxDroid/plugins/Configuration.java
software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/src/net/karmaLab/tuxDroid/plugins/MailPlugin.java
Log:
* Applied same changes than email plugin
Modified: software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/plugin.xml
===================================================================
--- software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/plugin.xml 2009-10-09 10:11:12 UTC (rev 5618)
+++ software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/plugin.xml 2009-10-09 10:19:39 UTC (rev 5619)
@@ -26,47 +26,6 @@
description="Password"
type="password"
defaultValue="password" />
- <!-- <parameter
- category="Advances Server parameters"
- name="port"
- description="Server port"
- type="integer"
- defaultValue="-1" /> -->
- <parameter
- name="folder"
- category="Advanced Server parameters"
- description="IMAP folder to retreive"
- type="string"
- defaultValue="INBOX"
- visible="false" />
- <parameter
- name="filterSender"
- category= "User parameters"
- description="Use sender filter"
- type="boolean"
- defaultValue="false"
- visible="false" />
- <parameter
- name="senderFilter"
- category= "User parameters"
- description="Sender filter to apply"
- type="string"
- defaultValue="bo...@my...,myg...@ho..."
- visible="false" />
- <parameter
- name="filerSubject"
- category= "User parameters"
- description="Use subject filter"
- type="boolean"
- defaultValue="false"
- visible="false" />
- <parameter
- name="subjectFilter"
- category= "User parameters"
- description="Subject filter to apply"
- type="string"
- defaultValue="Re:important document"
- visible="false" />
</parameters>
<tasks>
<task
@@ -75,41 +34,11 @@
command="check"
type="every x"
activated="false"
-
- weekMask="true,true,true,true,true,true,true"
- weekMaskType="weekpart"
- weekMaskVisible="true"
delay="00:01:00"
delayMask="true,true,true"
delayVisible="false"
/>
- <task
- name="Start every x from full hour"
- description="Start me every x (From full hour)"
- command="run"
- type="every x from full hour"
- activated="false"
-
- weekMask="true,true,true,true,true,true,true"
- weekMaskType="weekpart"
- weekMaskVisible="true"
-
- date="0000/00/00"
- dateVisible="false"
-
- hoursBegin="00:00:00"
- hoursBeginMask="true,true,true"
- hoursBeginVisible="false"
-
- hoursEnd="23:59:00"
- hoursEndMask="true,true,true"
- hoursEndVisible="false"
-
- delay="00:15:00"
- delayMask="true,true,false"
- delayVisible="true"
- />
</tasks>
<commands>
<command
Modified: software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/src/net/karmaLab/tuxDroid/plugins/Configuration.java
===================================================================
--- software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/src/net/karmaLab/tuxDroid/plugins/Configuration.java 2009-10-09 10:11:12 UTC (rev 5618)
+++ software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/src/net/karmaLab/tuxDroid/plugins/Configuration.java 2009-10-09 10:19:39 UTC (rev 5619)
@@ -29,37 +29,10 @@
public class Configuration extends SimplePluginConfiguration
{
- private String host;
- private int port;
- private ServerProtocol protocol;
private String password;
private String user;
- private String folder;
-
- private boolean filerSubject;
- private boolean filterSender;
-
- private String subjectFilter;
- private String senderFilter;
/**
- * @return the folder
- */
- public String getFolder()
- {
- return folder;
- }
-
- /**
- * @param folder
- * the folder to set
- */
- public void setFolder(String folder)
- {
- this.folder = folder;
- }
-
- /**
* @return the password
*/
public String getPassword()
@@ -92,112 +65,4 @@
{
this.user = user;
}
-
- /**
- * @return the port
- */
- public int getPort()
- {
- return port;
- }
-
- /**
- * @param port
- * the port to set
- */
- public void setPort(int port)
- {
- this.port = port;
- }
-
- /**
- * @return the kind
- */
- public ServerProtocol getProtocol()
- {
- return protocol;
- }
-
- /**
- * @param kind
- * the kind to set
- */
- public void setProtocol(ServerProtocol kind)
- {
- this.protocol = kind;
- }
-
- /**
- *
- * @return
- */
- public String getHost()
- {
- return host;
- }
-
- /**
- *
- * @param host
- */
- public void setHost(String host)
- {
- this.host = host;
- }
-
-
- /**
- * Return true if sender is filtered.
- * @return
- */
- public boolean isSenderFiltered()
- {
- return this.filterSender;
- }
-
-
- /**
- * Return true if Subject is filtered.
- * @return
- */
- public boolean isSubjectFiltered()
- {
- return this.filerSubject;
- }
-
-
- /**
- * Return a list of allowed sender.
- * @return
- */
- public Vector<String> getSenderFilter()
- {
- Vector<String> ret = new Vector<String>();
- String value = this.senderFilter;
- while(value.contains(","))
- {
- ret.add(value.substring(0, value.indexOf(",")));
- value = value.substring(value.indexOf(",") + 1);
- }
- ret.add(value);
- return ret;
- }
-
-
- /**
- * Return a list of allowed words.
- * @return
- */
- public Vector<String> getSubjectFilter()
- {
- Vector<String> ret = new Vector<String>();
- String value = this.subjectFilter;
- while(value.contains(","))
- {
- ret.add(value.substring(0, value.indexOf(",")));
- value = value.substring(value.indexOf(",") + 1);
- }
- ret.add(value);
- return ret;
- }
}
\ No newline at end of file
Modified: software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/src/net/karmaLab/tuxDroid/plugins/MailPlugin.java
===================================================================
--- software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/src/net/karmaLab/tuxDroid/plugins/MailPlugin.java 2009-10-09 10:11:12 UTC (rev 5618)
+++ software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/src/net/karmaLab/tuxDroid/plugins/MailPlugin.java 2009-10-09 10:19:39 UTC (rev 5619)
@@ -57,9 +57,6 @@
@Override
public void start()
{
- this.configuration().setHost("pop.gmail.com");
- this.configuration().setProtocol(ServerProtocol.pop3s);
-
try
{
if (getCommand().equals("run"))
@@ -86,7 +83,6 @@
*/
public void check() throws MessagingException, IOException, ClassNotFoundException, Exception
{
- boolean notify = false;
Message messages[] = connectToMailBox();
if (messages == null)
@@ -94,7 +90,7 @@
throwResult(false);
return;
}
- String sessionId = configuration().getHost() + "_" + configuration().getPort() + "_" + configuration().getUser();
+ String sessionId = "pop.gmail.com_" + configuration().getUser();
State stateAlert = readState(State.class, sessionId + "ALERT");
/* Is first check ? */
boolean firstCheck;
@@ -119,57 +115,12 @@
if (!stateAlert.getLastMessages().contains(subject))
{
newMessageAlert = true;
- break;
+ stateAlert.getLastMessages().add(subject);
}
}
}
}
- /* If new message */
- if (newMessageAlert)
- {
- /* Check for allowed messages. */
- for(int i = messages.length - 1; i >= 0; i--)
- {
- String subject;
- String mail;
- boolean seen;
-
- try
- {
- /* Get mail data */
- subject = messages[i].getSubject();
- mail = ((InternetAddress)messages[i].getFrom()[0]).getAddress();
- seen = messages[i].getFlags().contains(Flag.SEEN);
- /* Pass if mail is already seen */
- if (seen)
- {
- continue;
- }
- /* Pass if empty subject */
- if (subject == null)
- {
- continue;
- }
- /* Check if the mail already read */
- for (int j = 0; j < stateAlert.getLastMessages().size(); j++)
- {
- if (!subject.equals(stateAlert.getLastMessages().get(j)))
- {
- notify = true;
- break;
- }
- }
- /* Referencing the current mail */
- stateAlert.getLastMessages().add(subject);
- }
- catch (Exception e)
- {
- /* Prevent unhandled errors */
- ;
- }
- }
- }
- if((notify) && (!firstCheck))
+ if((newMessageAlert) && (!firstCheck))
{
throwResult(true);
throwMessage("You have a new message.");
@@ -195,7 +146,7 @@
{
return;
}
- String sessionId = configuration().getHost() + "_" + configuration().getPort() + "_" + configuration().getUser();
+ String sessionId = "pop.gmail.com_" + configuration().getUser();
State stateRun = readState(State.class, sessionId + "RUN");
/* Check for new message */
boolean newMessageRun = false;
@@ -320,37 +271,40 @@
*/
private Message[] connectToMailBox() throws MessagingException, IOException, ClassNotFoundException
{
- this.configuration().setPort(-1);
+ String user;
+ String host;
+ String password;
+ Session session;
+ Properties props;
+ int port;
+ String protocol;
+ Store store;
+ Folder folder;
+ Message messages[];
+
+ /* Get user data */
+ user = configuration().getUser();
+ password = configuration().getPassword();
+ host = "pop.gmail.com";
+ /* Set ssl socket */
Security.setProperty("ssl.SocketFactory.provider", "net.karmaLab.tuxDroid.plugins.DummySSLSocketFactory");
- /* Connect to the mail box */
+ /* Set text decoder */
System.setProperty("mail.mime.decodetext.strict", "false");
- Properties props = new Properties();
- Session session = Session.getDefaultInstance(props, null);
- Store store = session.getStore(configuration().getProtocol().toString());
- int port = configuration().getPort();
- if (port == -1)
- {
- switch (configuration().getProtocol())
- {
- case imap:
- port = 143;
- break;
- case pop3:
- port = 110;
- break;
- case imaps:
- port = 993;
- break;
- case pop3s:
- port = 995;
- break;
- }
- }
+ /* Configure seesion */
+ props = new Properties();
+ session = Session.getDefaultInstance(props, null);
+ /* Find server port */
+ port = 995;
+ /* Get mail protocol */
+ protocol = "pop3s";
+ /* Create mail store */
+ store = session.getStore(protocol);
+ /* Connect to the mailbox */
try
{
- store.connect(configuration().getHost(), port, configuration().getUser(), configuration().getPassword());
+ store.connect(host, port, user, password);
}
- // Authentification exception (login / password / protocol / etc)
+ /* Authentification exception (login / password / protocol / etc) */
catch (javax.mail.AuthenticationFailedException e)
{
if (!getCommand().equals("check"))
@@ -367,7 +321,7 @@
}
return null;
}
- // Connection failed exception (timeout / network unreachable)
+ /* Connection failed exception (timeout / network unreachable) */
catch (javax.mail.MessagingException e)
{
if (!getCommand().equals("check"))
@@ -376,62 +330,14 @@
}
return null;
}
- Folder folder = store.getFolder(configuration().getFolder());
+ /* Connect and open inbox folder */
+ folder = store.getFolder("INBOX");
folder.open(Folder.READ_ONLY);
- Message messages[] = folder.getMessages();
+ /* Get messages */
+ messages = folder.getMessages();
return messages;
}
- /**
- * Return true if the sender is not allowed.
- * @param mail
- * @return
- */
- private boolean filterSender(String mail)
- {
- Vector<Boolean> ver = new Vector<Boolean>();
- for(String allowedSender : this.configuration().getSenderFilter())
- {
- if(!mail.equals(allowedSender))
- {
- ver.add(new Boolean(false));
- }
- }
- for(Boolean bool : ver)
- {
- if(!bool.booleanValue())
- {
- return true;
- }
- }
- return false;
- }
-
- /**
- * Return true if subject is not allowed.
- * @param subject
- * @return
- */
- private boolean filterSubject(String subject)
- {
- Vector<Boolean> ver = new Vector<Boolean>();
- for(String allowedContent : this.configuration().getSubjectFilter())
- {
- if(!subject.contains(allowedContent))
- {
- ver.add(new Boolean(false));
- }
- }
- for(Boolean bool : ver)
- {
- if(!bool.booleanValue())
- {
- return true;
- }
- }
- return false;
- }
-
@Override
protected void onPluginEvent(String arg0, String[] arg1) throws Throwable
{
Deleted: software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/src/net/karmaLab/tuxDroid/plugins/ServerProtocol.java
===================================================================
--- software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/src/net/karmaLab/tuxDroid/plugins/ServerProtocol.java 2009-10-09 10:11:12 UTC (rev 5618)
+++ software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/src/net/karmaLab/tuxDroid/plugins/ServerProtocol.java 2009-10-09 10:19:39 UTC (rev 5619)
@@ -1,27 +0,0 @@
-/* This file is part of "TuxDroid Gadget GMail".
- * Copyright 2008, kysoh
- * Author : Yoran Brault
- * eMail : software@_bad_karma-lab.net (remove _bad_ before sending an email)
- * Site : http://www.kysoh.com/
- *
- * "TuxDroid Gadget GMail" is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * "TuxDroid Gadget GMail" is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with "TuxDroid Gadget GMail"; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package net.karmaLab.tuxDroid.plugins;
-
-public enum ServerProtocol {
- pop3, imap, imaps, pop3s;
-}
\ No newline at end of file
|
|
From: remi <c2m...@c2...> - 2009-10-09 10:11:26
|
Author: remi
Date: 2009-10-09 12:11:12 +0200 (Fri, 09 Oct 2009)
New Revision: 5618
Modified:
software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/plugin.xml
Log:
* Removed week configuration from alert
Modified: software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/plugin.xml
===================================================================
--- software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/plugin.xml 2009-10-09 10:10:43 UTC (rev 5617)
+++ software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/plugin.xml 2009-10-09 10:11:12 UTC (rev 5618)
@@ -48,11 +48,7 @@
command="check"
type="every x"
activated="false"
-
- weekMask="true,true,true,true,true,true,true"
- weekMaskType="weekpart"
- weekMaskVisible="true"
-
+
delay="00:01:00"
delayMask="true,true,true"
delayVisible="false"
|
|
From: remi <c2m...@c2...> - 2009-10-09 10:10:58
|
Author: remi
Date: 2009-10-09 12:10:43 +0200 (Fri, 09 Oct 2009)
New Revision: 5617
Modified:
software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/src/net/karmaLab/tuxDroid/plugins/MailPlugin.java
Log:
* Simplified code of "check" mode
Modified: software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/src/net/karmaLab/tuxDroid/plugins/MailPlugin.java
===================================================================
--- software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/src/net/karmaLab/tuxDroid/plugins/MailPlugin.java 2009-10-09 09:15:09 UTC (rev 5616)
+++ software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/src/net/karmaLab/tuxDroid/plugins/MailPlugin.java 2009-10-09 10:10:43 UTC (rev 5617)
@@ -83,7 +83,6 @@
*/
public void check() throws MessagingException, IOException, ClassNotFoundException, Exception
{
- boolean notify = false;
Message messages[] = connectToMailBox();
if (messages == null)
@@ -116,57 +115,12 @@
if (!stateAlert.getLastMessages().contains(subject))
{
newMessageAlert = true;
- break;
+ stateAlert.getLastMessages().add(subject);
}
}
}
}
- /* If new message */
- if (newMessageAlert)
- {
- /* Check for allowed messages. */
- for(int i = messages.length - 1; i >= 0; i--)
- {
- String subject;
- String mail;
- boolean seen;
-
- try
- {
- /* Get mail data */
- subject = messages[i].getSubject();
- mail = ((InternetAddress)messages[i].getFrom()[0]).getAddress();
- seen = messages[i].getFlags().contains(Flag.SEEN);
- /* Pass if mail is already seen */
- if (seen)
- {
- continue;
- }
- /* Pass if empty subject */
- if (subject == null)
- {
- continue;
- }
- /* Check if the mail already read */
- for (int j = 0; j < stateAlert.getLastMessages().size(); j++)
- {
- if (!subject.equals(stateAlert.getLastMessages().get(j)))
- {
- notify = true;
- break;
- }
- }
- /* Referencing the current mail */
- stateAlert.getLastMessages().add(subject);
- }
- catch (Exception e)
- {
- /* Prevent unhandled errors */
- ;
- }
- }
- }
- if((notify) && (!firstCheck))
+ if((newMessageAlert) && (!firstCheck))
{
throwResult(true);
throwMessage("You have a new message.");
|
|
From: remi <c2m...@c2...> - 2009-10-09 09:15:19
|
Author: remi
Date: 2009-10-09 11:15:09 +0200 (Fri, 09 Oct 2009)
New Revision: 5616
Modified:
software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/src/net/karmaLab/tuxDroid/plugins/MailPlugin.java
Log:
* Ignore first check from notifications
Modified: software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/src/net/karmaLab/tuxDroid/plugins/MailPlugin.java
===================================================================
--- software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/src/net/karmaLab/tuxDroid/plugins/MailPlugin.java 2009-10-09 09:01:40 UTC (rev 5615)
+++ software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/src/net/karmaLab/tuxDroid/plugins/MailPlugin.java 2009-10-09 09:15:09 UTC (rev 5616)
@@ -96,6 +96,17 @@
}
String sessionId = configuration().getHost() + "_" + configuration().getPort() + "_" + configuration().getUser();
State stateAlert = readState(State.class, sessionId + "ALERT");
+ /* Is first check ? */
+ boolean firstCheck;
+ if (stateAlert.getLastMessages().size() == 0)
+ {
+ firstCheck = true;
+ stateAlert.getLastMessages().add("FIRST_CHECK_HACK");
+ }
+ else
+ {
+ firstCheck = false;
+ }
/* Check if you have a new message */
boolean newMessageAlert = false;
for (int i = messages.length - 1; i >= 0; i--)
@@ -158,7 +169,7 @@
}
}
}
- if(notify)
+ if((notify) && (!firstCheck))
{
throwResult(true);
throwMessage("You have a new message.");
|
|
From: remi <c2m...@c2...> - 2009-10-09 09:01:49
|
Author: remi Date: 2009-10-09 11:01:40 +0200 (Fri, 09 Oct 2009) New Revision: 5615 Removed: software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/src/net/karmaLab/tuxDroid/plugins/ServerProtocol.java Modified: software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/plugin.xml software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/src/net/karmaLab/tuxDroid/plugins/Configuration.java software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/src/net/karmaLab/tuxDroid/plugins/MailPlugin.java Log: * Cleaned code and plugin.xml file Modified: software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/plugin.xml =================================================================== --- software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/plugin.xml 2009-10-09 08:54:25 UTC (rev 5614) +++ software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/plugin.xml 2009-10-09 09:01:40 UTC (rev 5615) @@ -21,12 +21,6 @@ type="string" defaultValue="your.server.com" /> <parameter - category="Server parameters" - name="protocol" - description="Protocol" - type="enum(pop3,pop3s,imap,imaps)" - defaultValue="pop3" /> - <parameter category="User parameters" name="user" description="Username" @@ -38,36 +32,6 @@ description="Password" type="password" defaultValue="_secret_" /> - <parameter - name="folder" - category="Advanced Server parameters" - description="IMAP folder to retreive" - type="string" - defaultValue="INBOX" /> - <parameter - name="filterSender" - category= "User parameters" - description="Use sender filter" - type="boolean" - defaultValue="false" /> - <parameter - name="senderFilter" - category= "User parameters" - description="Sender filter to apply" - type="string" - defaultValue="bo...@my...,myg...@ho..." /> - <parameter - name="filerSubject" - category= "User parameters" - description="Use subject filter" - type="boolean" - defaultValue="false" /> - <parameter - name="subjectFilter" - category= "User parameters" - description="Subject filter to apply" - type="string" - defaultValue="Re:important document" /> </parameters> <commands> <command @@ -93,32 +57,5 @@ delayMask="true,true,true" delayVisible="false" /> - <task - name="Start every x from full hour" - description="Start me every x (From full hour)" - command="run" - type="every x from full hour" - activated="false" - - weekMask="true,true,true,true,true,true,true" - weekMaskType="weekpart" - weekMaskVisible="true" - - date="0000/00/00" - dateVisible="false" - - hoursBegin="00:00:00" - hoursBeginMask="true,true,true" - hoursBeginVisible="false" - - hoursEnd="23:59:00" - hoursEndMask="true,true,true" - hoursEndVisible="false" - - delay="00:15:00" - delayType="quarters" - delayMask="true,true,false" - delayVisible="true" - /> </tasks> </plugin> Modified: software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/src/net/karmaLab/tuxDroid/plugins/Configuration.java =================================================================== --- software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/src/net/karmaLab/tuxDroid/plugins/Configuration.java 2009-10-09 08:54:25 UTC (rev 5614) +++ software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/src/net/karmaLab/tuxDroid/plugins/Configuration.java 2009-10-09 09:01:40 UTC (rev 5615) @@ -23,43 +23,15 @@ package net.karmaLab.tuxDroid.plugins; -import java.util.Vector; - import com.kysoh.tuxdroid.plugin.framework.plugin.SimplePluginConfiguration; public class Configuration extends SimplePluginConfiguration { private String host; - private int port; - private ServerProtocol protocol; private String password; private String user; - private String folder; - - private boolean filerSubject; - private boolean filterSender; - - private String subjectFilter; - private String senderFilter; /** - * @return the folder - */ - public String getFolder() - { - return folder; - } - - /** - * @param folder - * the folder to set - */ - public void setFolder(String folder) - { - this.folder = folder; - } - - /** * @return the password */ public String getPassword() @@ -94,40 +66,6 @@ } /** - * @return the port - */ - public int getPort() - { - return port; - } - - /** - * @param port - * the port to set - */ - public void setPort(int port) - { - this.port = port; - } - - /** - * @return the kind - */ - public ServerProtocol getProtocol() - { - return protocol; - } - - /** - * @param kind - * the kind to set - */ - public void setProtocol(ServerProtocol kind) - { - this.protocol = kind; - } - - /** * * @return */ @@ -144,60 +82,4 @@ { this.host = host; } - - - /** - * Return true if sender is filtered. - * @return - */ - public boolean isSenderFiltered() - { - return this.filterSender; - } - - - /** - * Return true if Subject is filtered. - * @return - */ - public boolean isSubjectFiltered() - { - return this.filerSubject; - } - - - /** - * Return a list of allowed sender. - * @return - */ - public Vector<String> getSenderFilter() - { - Vector<String> ret = new Vector<String>(); - String value = this.senderFilter; - while(value.contains(",")) - { - ret.add(value.substring(0, value.indexOf(","))); - value = value.substring(value.indexOf(",") + 1); - } - ret.add(value); - return ret; - } - - - /** - * Return a list of allowed words. - * @return - */ - public Vector<String> getSubjectFilter() - { - Vector<String> ret = new Vector<String>(); - String value = this.subjectFilter; - while(value.contains(",")) - { - ret.add(value.substring(0, value.indexOf(","))); - value = value.substring(value.indexOf(",") + 1); - } - ret.add(value); - return ret; - } } \ No newline at end of file Modified: software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/src/net/karmaLab/tuxDroid/plugins/MailPlugin.java =================================================================== --- software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/src/net/karmaLab/tuxDroid/plugins/MailPlugin.java 2009-10-09 08:54:25 UTC (rev 5614) +++ software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/src/net/karmaLab/tuxDroid/plugins/MailPlugin.java 2009-10-09 09:01:40 UTC (rev 5615) @@ -91,7 +91,7 @@ throwResult(false); return; } - String sessionId = configuration().getHost() + "_" + configuration().getPort() + "_" + configuration().getUser(); + String sessionId = configuration().getHost() + "_" + configuration().getUser(); State stateAlert = readState(State.class, sessionId + "ALERT"); /* Is first check ? */ boolean firstCheck; @@ -192,7 +192,7 @@ { return; } - String sessionId = configuration().getHost() + "_" + configuration().getPort() + "_" + configuration().getUser(); + String sessionId = configuration().getHost() + "_" + configuration().getUser(); State stateRun = readState(State.class, sessionId + "RUN"); /* Check for new message */ boolean newMessageRun = false; @@ -478,56 +478,6 @@ return messages; } - /** - * Return true if the sender is not allowed. - * @param mail - * @return - */ - private boolean filterSender(String mail) - { - Vector<Boolean> ver = new Vector<Boolean>(); - for(String allowedSender : this.configuration().getSenderFilter()) - { - if(!mail.equals(allowedSender)) - { - ver.add(new Boolean(false)); - } - } - for(Boolean bool : ver) - { - if(!bool.booleanValue()) - { - return true; - } - } - return false; - } - - /** - * Return true if subject is not allowed. - * @param subject - * @return - */ - private boolean filterSubject(String subject) - { - Vector<Boolean> ver = new Vector<Boolean>(); - for(String allowedContent : this.configuration().getSubjectFilter()) - { - if(!subject.contains(allowedContent)) - { - ver.add(new Boolean(false)); - } - } - for(Boolean bool : ver) - { - if(!bool.booleanValue()) - { - return true; - } - } - return false; - } - @Override protected void onPluginEvent(String arg0, String[] arg1) throws Throwable { Deleted: software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/src/net/karmaLab/tuxDroid/plugins/ServerProtocol.java =================================================================== --- software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/src/net/karmaLab/tuxDroid/plugins/ServerProtocol.java 2009-10-09 08:54:25 UTC (rev 5614) +++ software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/src/net/karmaLab/tuxDroid/plugins/ServerProtocol.java 2009-10-09 09:01:40 UTC (rev 5615) @@ -1,27 +0,0 @@ -/* This file is part of "TuxDroid Plugin Mail". - * Copyright 2009, kysoh - * Author : Yoran Brault - * eMail : software@_bad_karma-lab.net (remove _bad_ before sending an email) - * Site : http://www.kysoh.com/ - * - * "TuxDroid Plugin Mail" is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * "TuxDroid Plugin Mail" is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with "TuxDroid Plugin Mail"; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -package net.karmaLab.tuxDroid.plugins; - -public enum ServerProtocol { - pop3, imap, imaps, pop3s; -} \ No newline at end of file |
|
From: remi <c2m...@c2...> - 2009-10-09 08:54:46
|
Author: remi
Date: 2009-10-09 10:54:25 +0200 (Fri, 09 Oct 2009)
New Revision: 5614
Modified:
software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/src/net/karmaLab/tuxDroid/plugins/MailPlugin.java
Log:
* Added automatic detection of mail server protocol/port
Modified: software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/src/net/karmaLab/tuxDroid/plugins/MailPlugin.java
===================================================================
--- software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/src/net/karmaLab/tuxDroid/plugins/MailPlugin.java 2009-10-09 07:10:26 UTC (rev 5613)
+++ software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/src/net/karmaLab/tuxDroid/plugins/MailPlugin.java 2009-10-09 08:54:25 UTC (rev 5614)
@@ -35,6 +35,10 @@
import javax.mail.Flags.Flag;
import javax.mail.internet.InternetAddress;
+import java.net.Socket;
+import java.net.UnknownHostException;
+import java.net.InetSocketAddress;
+
import com.kysoh.tuxdroid.plugin.framework.plugin.SimplePlugin;
/**
@@ -304,6 +308,103 @@
writeState(stateRun, sessionId + "RUN");
}
+ /**
+ * Check if the mail server is responding to the x port.
+ * @param host Server host
+ * @param port Server port
+ * @return true or false
+ */
+ private boolean checkMailServer(String host, Integer port)
+ {
+ Socket socket = new Socket();
+ try
+ {
+ socket.connect(new InetSocketAddress(host, port), 1000);
+ }
+ catch (UnknownHostException e)
+ {
+ socket = null;
+ return false;
+ }
+ catch (IOException e)
+ {
+ socket = null;
+ return false;
+ }
+ socket = null;
+ return true;
+ }
+
+ /**
+ * Find the server mail port.
+ * @param host Server host
+ * @return Server port or -1.
+ */
+ private int findMailServerPort(String host)
+ {
+ int port1;
+ int port2;
+ int port3;
+ int port4;
+
+ if ((host.startsWith("pop")) || (host.startsWith("POP")))
+ {
+ port1 = 110;
+ port2 = 995;
+ port3 = 143;
+ port4 = 993;
+ }
+ else
+ {
+ port1 = 143;
+ port2 = 993;
+ port3 = 110;
+ port4 = 995;
+ }
+ if (checkMailServer(host, port1))
+ {
+ return port1;
+ }
+ else if (checkMailServer(host, port2))
+ {
+ return port2;
+ }
+ else if (checkMailServer(host, port3))
+ {
+ return port3;
+ }
+ else if (checkMailServer(host, port4))
+ {
+ return port4;
+ }
+ else
+ {
+ return -1;
+ }
+ }
+
+ /**
+ * Get the mail server protocol from a port.
+ * @param port Mail server port.
+ * @return The mail server protocol.
+ */
+ private String portToProtocol(int port)
+ {
+ switch (port)
+ {
+ case 110:
+ return "pop3";
+ case 995:
+ return "pop3s";
+ case 143:
+ return "imap";
+ case 993:
+ return "imaps";
+ default:
+ return "pop3";
+ }
+ }
+
/**
*
* @return
@@ -313,37 +414,45 @@
*/
private Message[] connectToMailBox() throws MessagingException, IOException, ClassNotFoundException
{
- this.configuration().setPort(-1);
+ String user;
+ String host;
+ String password;
+ Session session;
+ Properties props;
+ int port;
+ String protocol;
+ Store store;
+ Folder folder;
+ Message messages[];
+
+ /* Get user data */
+ user = configuration().getUser();
+ password = configuration().getPassword();
+ host = configuration().getHost();
+ /* Set ssl socket */
Security.setProperty("ssl.SocketFactory.provider", "net.karmaLab.tuxDroid.plugins.DummySSLSocketFactory");
- /* Connect to the mail box */
+ /* Set text decoder */
System.setProperty("mail.mime.decodetext.strict", "false");
- Properties props = new Properties();
- Session session = Session.getDefaultInstance(props, null);
- Store store = session.getStore(configuration().getProtocol().toString());
- int port = configuration().getPort();
- if (port == -1)
- {
- switch (configuration().getProtocol())
- {
- case imap:
- port = 143;
- break;
- case pop3:
- port = 110;
- break;
- case imaps:
- port = 993;
- break;
- case pop3s:
- port = 995;
- break;
- }
- }
+ /* Configure seesion */
+ props = new Properties();
+ session = Session.getDefaultInstance(props, null);
+ /* Find server port */
+ port = findMailServerPort(host);
+ if (port == -1)
+ {
+ throwMessage("Sorry, there was an error when connecting to the mail server. Please check your email configuration.");
+ return null;
+ }
+ /* Get mail protocol */
+ protocol = portToProtocol(port);
+ /* Create mail store */
+ store = session.getStore(protocol);
+ /* Connect to the mailbox */
try
{
- store.connect(configuration().getHost(), port, configuration().getUser(), configuration().getPassword());
+ store.connect(host, port, user, password);
}
- // Authentification exception (login / password / protocol / etc)
+ /* Authentification exception (login / password / protocol / etc) */
catch (javax.mail.AuthenticationFailedException e)
{
if (!getCommand().equals("check"))
@@ -352,7 +461,7 @@
}
return null;
}
- // Connection failed exception (timeout / network unreachable)
+ /* Connection failed exception (timeout / network unreachable) */
catch (javax.mail.MessagingException e)
{
if (!getCommand().equals("check"))
@@ -361,9 +470,11 @@
}
return null;
}
- Folder folder = store.getFolder(configuration().getFolder());
+ /* Connect and open inbox folder */
+ folder = store.getFolder("INBOX");
folder.open(Folder.READ_ONLY);
- Message messages[] = folder.getMessages();
+ /* Get messages */
+ messages = folder.getMessages();
return messages;
}
|
|
From: remi <c2m...@c2...> - 2009-10-09 07:10:44
|
Author: remi
Date: 2009-10-09 09:10:26 +0200 (Fri, 09 Oct 2009)
New Revision: 5613
Modified:
software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/src/net/karmaLab/tuxDroid/plugins/MailPlugin.java
Log:
* Ignore first check from notifications
Modified: software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/src/net/karmaLab/tuxDroid/plugins/MailPlugin.java
===================================================================
--- software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/src/net/karmaLab/tuxDroid/plugins/MailPlugin.java 2009-10-08 14:52:16 UTC (rev 5612)
+++ software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/src/net/karmaLab/tuxDroid/plugins/MailPlugin.java 2009-10-09 07:10:26 UTC (rev 5613)
@@ -89,6 +89,17 @@
}
String sessionId = configuration().getHost() + "_" + configuration().getPort() + "_" + configuration().getUser();
State stateAlert = readState(State.class, sessionId + "ALERT");
+ /* Is first check ? */
+ boolean firstCheck;
+ if (stateAlert.getLastMessages().size() == 0)
+ {
+ firstCheck = true;
+ stateAlert.getLastMessages().add("FIRST_CHECK_HACK");
+ }
+ else
+ {
+ firstCheck = false;
+ }
/* Check if you have a new message */
boolean newMessageAlert = false;
for (int i = messages.length - 1; i >= 0; i--)
@@ -151,7 +162,7 @@
}
}
}
- if(notify)
+ if((notify) && (!firstCheck))
{
throwResult(true);
throwMessage("You have a new message.");
|
|
From: ks156 <c2m...@c2...> - 2009-10-08 14:52:40
|
Author: ks156 Date: 2009-10-08 16:52:16 +0200 (Thu, 08 Oct 2009) New Revision: 5612 Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/util/osl/libtuxosl.so software_suite_v3/smart-core/smart-server/trunk/util/osl/libtuxosl.so Log: * Recompiled with svnwcrev to show the revision number. Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/util/osl/libtuxosl.so =================================================================== (Binary files differ) Modified: software_suite_v3/smart-core/smart-server/trunk/util/osl/libtuxosl.so =================================================================== (Binary files differ) |
|
From: ks156 <c2m...@c2...> - 2009-10-08 09:08:53
|
Author: ks156 Date: 2009-10-08 11:08:37 +0200 (Thu, 08 Oct 2009) New Revision: 5611 Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/util/osl/libtuxosl.so software_suite_v3/smart-core/smart-server/trunk/util/osl/libtuxosl.so Log: * Updated tuxosl compiled to use libstdc++6 iso libstdc++5 Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/util/osl/libtuxosl.so =================================================================== (Binary files differ) Modified: software_suite_v3/smart-core/smart-server/trunk/util/osl/libtuxosl.so =================================================================== (Binary files differ) |
|
From: jerome <c2m...@c2...> - 2009-10-08 08:49:25
|
Author: jerome
Date: 2009-10-08 10:49:09 +0200 (Thu, 08 Oct 2009)
New Revision: 5610
Modified:
software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/src/TwitterDatasStruct.java
Log:
* Moved the save file directory ( do not depends on the user session anymore ).
Modified: software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/src/TwitterDatasStruct.java
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/src/TwitterDatasStruct.java 2009-10-08 08:39:55 UTC (rev 5609)
+++ software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/src/TwitterDatasStruct.java 2009-10-08 08:49:09 UTC (rev 5610)
@@ -27,10 +27,14 @@
import java.io.Serializable;
import java.util.Vector;
+import com.kysoh.SmartCorePaths;
+
public class TwitterDatasStruct extends Object implements Serializable{
private static final long serialVersionUID = 8395814134877723558L;
+ private static String linuxDatasSav = "";
+ private static String windowsDatasSav = "";
public static final byte FRIENDS_STATUSES = 0;
public static final byte REPLIES = 1;
@@ -38,21 +42,64 @@
public SerializedVector vktStruct;
private File structFile;
+ private boolean firstCycle;
+ /**
+ * Path initialization.
+ */
+ static
+ {
+ if ( SmartCorePaths.isLinux() )
+ {
+ TwitterDatasStruct.linuxDatasSav = System.getenv("HOME") + "/.tuxdroid/plugins_conf/Twitter";
+
+ if (! ( new File(linuxDatasSav)).exists())
+ {
+ if ( ! ( new File(linuxDatasSav) ).mkdirs() )
+ {
+ ( new File(linuxDatasSav) ).mkdir();
+ }
+ }
+ }
+ else
+ {
+ TwitterDatasStruct.windowsDatasSav = System.getenv("ALLUSERSDIR") + "/tuxdroid/plugins_conf/Twitter";
+
+ if (! ( new File(windowsDatasSav)).exists())
+ {
+ if ( ! ( new File(windowsDatasSav) ).mkdirs() )
+ {
+ ( new File(windowsDatasSav) ).mkdir();
+ }
+ }
+ }
+ }
+
+
+
public TwitterDatasStruct(String username)
{
- //Getting file where was registered serialized vector.
- File path = new File("");
//tds = tuxdroid datas saved.
- structFile = new File(path.getAbsolutePath() + File.separator + username + "@twitter.sav");
+
+ if (SmartCorePaths.isLinux())
+ {
+ structFile = new File(linuxDatasSav + File.separator + username + "@twitter.sav");
+ }
+ else
+ {
+ structFile = new File(windowsDatasSav + File.separator + username + "@twitter.sav");
+ }
+
if(structFile.exists())
{
//Getting serialized object struct.
+ this.firstCycle = false;
vktStruct = this.loadStruct();
}
else
{
+ this.firstCycle = true;
//Create struct.
vktStruct = new SerializedVector();
if(vktStruct == null)
@@ -145,7 +192,17 @@
}
+
/**
+ * This function return the state of cycle ( first start or not for the current user ).
+ * @return
+ */
+ public boolean isFirstCycle()
+ {
+ return this.firstCycle;
+ }
+
+ /**
* Return true if the target is registered.
* @param list
* @param sender
|
|
From: jerome <c2m...@c2...> - 2009-10-08 08:40:15
|
Author: jerome Date: 2009-10-08 10:39:55 +0200 (Thu, 08 Oct 2009) New Revision: 5609 Modified: software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/pom.xml Log: * Added a dependency. Modified: software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/pom.xml =================================================================== --- software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/pom.xml 2009-10-07 13:19:28 UTC (rev 5608) +++ software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/pom.xml 2009-10-08 08:39:55 UTC (rev 5609) @@ -14,6 +14,11 @@ <groupId>com.kysoh</groupId> <artifactId>tuxdroid-plugin-java-kit</artifactId> <version>0.0.3</version> + </dependency> + <dependency> + <groupId>com.kysoh</groupId> + <artifactId>smart-core-paths</artifactId> + <version>0.0.1</version> </dependency> <dependency> <groupId>jtwitter</groupId> |
|
From: jerome <c2m...@c2...> - 2009-10-07 13:19:39
|
Author: jerome
Date: 2009-10-07 15:19:28 +0200 (Wed, 07 Oct 2009)
New Revision: 5608
Modified:
software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/src/Configuration.java
software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/src/TwitterPlugin.java
Log:
* Modified the way to advice user something changed on his Twitter account.
* Exclusive update status function.
* Refactored project.
* Removed / replaced some functions.
*...
Modified: software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/src/Configuration.java
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/src/Configuration.java 2009-10-07 12:04:00 UTC (rev 5607)
+++ software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/src/Configuration.java 2009-10-07 13:19:28 UTC (rev 5608)
@@ -27,10 +27,14 @@
private String username = "";
private String password = "";
+
private String myStatus = "Hello all from my tuxdroid Twitter gadget";
- private boolean updateStatus = true;
+ private boolean updateStatus = false;
+ private boolean checkFriends = true;
+ private boolean checkMessages = true;
+
/**
* Sets the username.
* @param username
@@ -108,5 +112,45 @@
{
return this.updateStatus;
}
+
+
+ /**
+ * Set or not the checkf friends updates check.
+ * @param updateStatus
+ */
+ public void setCheckFriends(boolean aCheckFriends)
+ {
+ this.checkFriends = aCheckFriends;
+ }
+
+
+ /**
+ * Return true if user want to check his new friends statuses.
+ * @return
+ */
+ public boolean getCheckFriends()
+ {
+ return this.checkFriends;
+ }
+
+
+ /**
+ * Set or not the check messages option.
+ * @param updateStatus
+ */
+ public void setCheckMessages(boolean aCheckMessages)
+ {
+ this.checkMessages = aCheckMessages;
+ }
+
+
+ /**
+ * Return true if user want to check his replies / messages.
+ * @return
+ */
+ public boolean getCheckMessages()
+ {
+ return this.checkMessages;
+ }
}
Modified: software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/src/TwitterPlugin.java
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/src/TwitterPlugin.java 2009-10-07 12:04:00 UTC (rev 5607)
+++ software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/src/TwitterPlugin.java 2009-10-07 13:19:28 UTC (rev 5608)
@@ -19,6 +19,10 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.Hashtable;
import java.util.List;
import com.kysoh.tuxdroid.plugin.framework.plugin.SimplePlugin;
import winterwell.jtwitter.Twitter;
@@ -31,15 +35,19 @@
public class TwitterPlugin extends SimplePlugin<Configuration>{
private static TwitterDatasStruct savedStruct;
+ private static byte REPLY = 0;
+ private static byte MESSAGE = 1;
+ private List<String> messagesList = new ArrayList<String>();
+ private List<String> repliesList = new ArrayList<String>();
+
/***
This function set the new user status.
Préconditions :
- To be in run mode
- Activate targeted option.
***/
- @SuppressWarnings("unused")
private boolean setUserStatus(Twitter twitter)
{
if(this.getCommand().equalsIgnoreCase("run"))
@@ -70,7 +78,6 @@
***/
private int getNewFriendStatusesCount(Twitter twitter)
{
-
int statusesCount = 0;
List<User> friend = twitter.getFriends();
@@ -82,6 +89,7 @@
String statusText = status.getText();
String username = status.getUser().getName();
+
//if a new status was set for this user text.
boolean said = savedStruct.isRegistered(TwitterDatasStruct.FRIENDS_STATUSES, username, statusText);
@@ -118,7 +126,6 @@
***/
private int getPrivateMessagesCount(Twitter twitter)
{
- int messagesCount = 0;
List<Message> messages = twitter.getDirectMessages();
if(messages.size() > 0)
{
@@ -133,7 +140,7 @@
if((message.getText() != "null") && !said)
{
- messagesCount += 1;
+ messagesList.add(username);
savedStruct.addMessage(username, message.getText());
}
}
@@ -144,7 +151,7 @@
}
}
- return messagesCount;
+ return messagesList.size();
}
@@ -155,7 +162,6 @@
***/
private int getPublicMessagesCount(Twitter twitter)
{
- int repliesCount = 0;
List<Message> replies = twitter.getReplies();
if(replies.size() > 0)
@@ -170,7 +176,7 @@
if((reply.getText() != "null") && !said)
{
- repliesCount += 1;
+ repliesList.add(username);
savedStruct.addReply(username, reply.getText());
}
@@ -181,7 +187,7 @@
;
}
}
- return repliesCount;
+ return repliesList.size();
}
@@ -202,9 +208,65 @@
//Getting Twitter informations.
try
{
- throwMessage("New Friend updates: " + String.valueOf(getNewFriendStatusesCount(twitter)));
- throwMessage("New Replies: " + String.valueOf(getPublicMessagesCount(twitter)));
- throwMessage("New Messages: " + String.valueOf(getPrivateMessagesCount(twitter)));
+ if (! this.configuration().getUpdateStatus())
+ {
+ //Getting new friend statuses count.
+ int updateCount = getNewFriendStatusesCount(twitter);
+ if ( updateCount == 1 )
+ {
+ throwMessage("You have a new friend update");
+ }
+ else if ( updateCount > 1 )
+ {
+ throwMessage("Yo have {0} friend updates", String.valueOf(updateCount));
+ }
+ else
+ {
+ if ( ! this.getCommand().equalsIgnoreCase("check") )
+ {
+ throwMessage("You don't have any friend updates.");
+ }
+ }
+
+ //Getting and sorting new user replies.
+ if ( getPublicMessagesCount(twitter) > 0 )
+ {
+ this.sort(this.repliesList);
+ //Counting by name and throwing messages.
+ this.getByNames(this.repliesList, REPLY);
+ }
+ else
+ {
+ if ( ! this.getCommand().equalsIgnoreCase("check") )
+ {
+ throwMessage("You don't have any replies");
+ }
+ }
+
+ //Getting and sorting new user private messages.
+ if ( getPrivateMessagesCount(twitter) > 0 )
+ {
+ this.sort(this.messagesList);
+ //Counting by name and throwing messages.
+ this.getByNames(this.messagesList, MESSAGE);
+ }
+ else
+ {
+ if ( ! this.getCommand().equalsIgnoreCase("check") )
+ {
+ throwMessage("You don't have any messages");
+ }
+ }
+
+ //Registering couted messages.
+ savedStruct.registerStruct();
+
+ }
+ else
+ {
+ //Updating user status.
+ this.setUserStatus(twitter);
+ }
}
catch(TwitterException badRequest)
{
@@ -212,12 +274,86 @@
{
throwMessage("Twitter is busy for now, please, try later.");
}
-
+
this.quitGadget();
}
+
+ }
+
+
+ /***
+ * Sort a typ string list.
+ * @param list
+ */
+ private void sort(List<String> list)
+ {
+ Collections.sort(list);
+ }
+
+
+ /***
+ * Throw messages by user names.
+ * @param list
+ */
+ private void getByNames(List<String> list, byte type)
+ {
+ Hashtable<String, Integer> dtUsers = new Hashtable<String, Integer>();
+ int count = 1;
- //Registering couted messages.
- //savedStruct.registerStruct();
+ //Handling no replies / no messages.
+ if (list.size() == 0)
+ {
+ return;
+ }
+ else
+ {
+ throwMessage("You have");
+ }
+
+
+ //Counting by names.
+ for( int i = 0 ; i != list.size() - 1 ; i ++)
+ {
+ if ( list.get( i ).equals(list.get( i + 1 )))
+ {
+ count += 1;
+ }
+ else
+ {
+ dtUsers.put(list.get(i), Integer.valueOf(count));
+ count = 1;
+ }
+ }
+
+ Enumeration<String> enu = dtUsers.keys();
+ while( enu.hasMoreElements())
+ {
+ String it = enu.nextElement();
+ count = dtUsers.get(it).intValue();
+
+ if ( type == REPLY )
+ {
+ if ( count == 1 )
+ {
+ throwMessage("One reply from {0}", it);
+ }
+ else
+ {
+ throwMessage ("{0} replies from {1}", count, it);
+ }
+ }
+ else
+ {
+ if ( count == 1 )
+ {
+ throwMessage("One message from {0}", it);
+ }
+ else
+ {
+ throwMessage("{0} messages from {1}", count, it);
+ }
+ }
+ }
}
@@ -303,10 +439,10 @@
*/
public void quitGadget()
{
- if(this.getCommand().equalsIgnoreCase("check") && this.throwed)
- {
- this.throwResult(false);
- }
+ //if(this.getCommand().equalsIgnoreCase("check") && this.throwed)
+ //{
+ //this.throwResult(false);
+ //}
System.exit(0);
}
|
|
From: jerome <c2m...@c2...> - 2009-10-07 12:04:16
|
Author: jerome
Date: 2009-10-07 14:04:00 +0200 (Wed, 07 Oct 2009)
New Revision: 5607
Modified:
software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/plugin.xml
Log:
* Fixed doubled 'your' in the description part ( tanks Paul ).
Modified: software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/plugin.xml
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/plugin.xml 2009-10-07 11:53:39 UTC (rev 5606)
+++ software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/plugin.xml 2009-10-07 12:04:00 UTC (rev 5607)
@@ -7,7 +7,7 @@
<description>
<name>Twitter Plugin</name>
<ttsName>Twitter</ttsName>
- <description>The Twitter plugin will make Tux Droid check your your Twitter account.</description>
+ <description>The Twitter plugin will make Tux Droid check your Twitter account.</description>
<author>Jérôme Conan</author>
<version>3.0</version>
<iconFile>resources/plugin.png</iconFile>
|
|
From: jerome <c2m...@c2...> - 2009-10-07 11:53:52
|
Author: jerome
Date: 2009-10-07 13:53:39 +0200 (Wed, 07 Oct 2009)
New Revision: 5606
Modified:
software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/plugin.xml
Log:
* Updated two parameters names. ( consitancy with description ).
Modified: software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/plugin.xml
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/plugin.xml 2009-10-07 11:46:12 UTC (rev 5605)
+++ software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/plugin.xml 2009-10-07 11:53:39 UTC (rev 5606)
@@ -42,13 +42,13 @@
defaultValue="Hello all from my Tux Droid twitter gadget" />
<parameter
category="User parameters"
- name="giveOtherReplies"
+ name="checkFriends"
description="Check Friends updates"
type="boolean"
defaultValue="true" />
<parameter
category="User parameters"
- name="giveMessages"
+ name="checkMessages"
description="Check my messages/replies"
type="boolean"
defaultValue="true" />
|
1 message has been excluded from this view by a project administrator.
