X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=src%2Fro%2Fieval%2Ffonbot%2FFonBotMainService.java;h=dd13affe715aef6f403d1fba71fc6c87e00bf8ac;hb=828b60f224e51edfb1840d03f7a6d745b44e01b7;hp=38e0a29d0cbb8b4fd8a850ba28474b3e5ea54ccb;hpb=079ea30606f31a88786a70feacff3184336a96b8;p=fonbot.git

diff --git a/src/ro/ieval/fonbot/FonBotMainService.java b/src/ro/ieval/fonbot/FonBotMainService.java
index 38e0a29..dd13aff 100644
--- a/src/ro/ieval/fonbot/FonBotMainService.java
+++ b/src/ro/ieval/fonbot/FonBotMainService.java
@@ -3,6 +3,7 @@ package ro.ieval.fonbot;
 import static ro.ieval.fonbot.R.string.*;
 import static ro.ieval.fonbot.Utils.toNonNull;
 
+import java.net.SocketTimeoutException;
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.Set;
@@ -77,9 +78,12 @@ public final class FonBotMainService extends Service {
 			Log.d("LongPollRunnable", "Long polling started");
 			while(man.getActiveNetworkInfo() != null && man.getActiveNetworkInfo().isConnected())
 				try {
-					runnable.run();
+					runnable.doRun();
+				} catch (final SocketTimeoutException e){
+					Log.d("LongPollRunnable", "Socket timeout, refreshing connection");
 				} catch (final Exception ex){
 					ex.printStackTrace();
+					break;
 				}
 			Log.d("LongPollRunnable", "Long polling stopped");
 		}
@@ -93,8 +97,7 @@ public final class FonBotMainService extends Service {
 	 * Broadcast action: remove an ongoing event
 	 */
 	public static final String ACTION_DELETE_ONGOING="ro.ieval.fonbot.FonBotMainService.ACTION_DELETE_ONGOING";
-	/** Broadcast action: trigger a server poll */
-	public static final String ACTION_TRIGGER_POLL="ro.ieval.fonbot.FonBotMainService.ACTION_TRIGGER_POLL";
+
 	/**
 	 * Extra: ongoing event id
 	 *
@@ -178,6 +181,8 @@ public final class FonBotMainService extends Service {
 			longPollThread.start();
 		}
 
+		ExecutableRunnable.retryTasks();
+
 		final boolean runForeground=PreferenceManager.getDefaultSharedPreferences(this).getBoolean("foreground", false);
 		if(!runForeground)
 			stopForeground(true);