[Thaw-dev] r14267 - in trunk/apps/Thaw/src/thaw: fcp i18n plugins/miniFrost/frostKSK

[jfle...@freenetproject.org]

Author: jflesch
Date: 2007-07-22 21:56:28 +0000 (Sun, 22 Jul 2007)
New Revision: 14267

Modified:
   trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java
   trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties
   trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKMessage.java
Log:
Be sure that we don't follow the redirections while fetching the messages

Modified: trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java      2007-07-22 21:46:37 UTC 
(rev 14266)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java      2007-07-22 21:56:28 UTC 
(rev 14267)
@@ -54,6 +54,7 @@
        private boolean alreadySaved = false;

        private boolean noDDA = false;
+       private boolean noRedir = false;

        private FCPTestDDA testDDA = null;

@@ -221,7 +222,14 @@
                this.maxSize = maxSize;
        }

+       /**
+        * won't follow the redirections
+        */
+       public void setNoRedirectionFlag(boolean noRedir) {
+               this.noRedir = noRedir;
+       }

+
        public boolean start(final FCPQueueManager queueManager) {
                attempt++;
                running = true;
@@ -454,7 +462,7 @@
                if ("GetFailed".equals(message.getMessageName())) {
                        Logger.debug(this, "GetFailed !");

-                       if (message.getValue("RedirectURI") != null) {
+                       if (message.getValue("RedirectURI") != null && 
!noRedir) {
                                Logger.debug(this, "Redirected !");
                                key = message.getValue("RedirectURI");
                                status = "Redirected ...";

Modified: trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties
===================================================================
--- trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties     2007-07-22 
21:46:37 UTC (rev 14266)
+++ trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties     2007-07-22 
21:56:28 UTC (rev 14267)
@@ -535,8 +535,8 @@
 thaw.plugin.miniFrost.goBack=Retourner ? la liste des messages
 thaw.plugin.miniFrost.nextUnread=Prochain message non-lu sur cette board

-thaw.plugin.miniFrost.selectAll=Select all
-thaw.plugin.miniFrost.selectNone=Select none
+thaw.plugin.miniFrost.selectAll=Tout s?lectionner
+thaw.plugin.miniFrost.selectNone=Ne plus rien s?lectionner

 thaw.plugin.miniFrost.markAsRead=Marquer comme lu
 thaw.plugin.miniFrost.markAsNonRead=Marquer comme non-lu

Modified: trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKMessage.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKMessage.java 
2007-07-22 21:46:37 UTC (rev 14266)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKMessage.java 
2007-07-22 21:56:28 UTC (rev 14267)
@@ -88,6 +88,7 @@
                                                    
System.getProperty("java.io.tmpdir"),
                                                    FCP_MAX_SIZE,
                                                    true /* noDDA */);
+               get.setNoRedirectionFlag(true);
                get.addObserver(this);

                /* we override the queueManager */