TRACKING APP: Thank you screen

mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/RegattaActivity.java

@@ -66,6 +66,7 @@ public class RegattaActivity extends BaseActivity {
     private int eventRowId;
     private String eventImageUrl;
     private long eventStartMillis;
+    private long eventEndMillis;
     
     private String leaderboardName;
     private int leaderboardRowId;
@@ -151,6 +152,7 @@ public class RegattaActivity extends BaseActivity {
 			eventName = ec.getString(ec.getColumnIndex(Event.EVENT_NAME));
 			eventImageUrl = ec.getString(ec.getColumnIndex(Event.EVENT_IMAGE_URL));
 			eventStartMillis = ec.getLong(ec.getColumnIndex(Event.EVENT_DATE_START));
+			eventEndMillis = ec.getLong(ec.getColumnIndex(Event.EVENT_DATE_END));
 			eventRowId = ec.getInt(ec.getColumnIndex(BaseColumns._ID));
         }
 		
@@ -393,6 +395,15 @@ public class RegattaActivity extends BaseActivity {
 		return eventStartMillis;
 	}
 	
+	/**
+	 * So the fragment can get the value to decide if thank you note should be shown.
+	 * @return
+	 */
+	public long getEventEndMillis()
+	{
+		return eventEndMillis;
+	}
+	
 	/**
 	 * Delete Event, Competitor and Leaderboard
 	 */

mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/RegattaFragment.java

@@ -65,6 +65,17 @@ public class RegattaFragment extends BaseFragment implements OnClickListener {
 
 		return view;
 	}
+	
+	private void checkAndSwitchToThankYouScreenIfRegattaOver()
+	{
+		RegattaActivity regattaActivity = (RegattaActivity) getActivity();
+		long regattaEnd = regattaActivity.getEventEndMillis();
+		
+		if (System.currentTimeMillis() > regattaEnd)
+		{
+			switchToThankYouScreen();
+		}
+	}
 
 	private void switchToThankYouScreen() {
 		showingThankYouNote = true;
@@ -91,30 +102,7 @@ public class RegattaFragment extends BaseFragment implements OnClickListener {
 		super.onResume();
 		timer = new TimerRunnable();
 		timer.start();
-
-		// TODO delete test
-
-		new Thread(new Runnable() {
-
-			@Override
-			public void run() {
-				try {
-					Thread.sleep(5000);
-				} catch (InterruptedException e) {
-					e.printStackTrace();
-				}
-
-				getActivity().runOnUiThread(new Runnable() {
-
-					@Override
-					public void run() {
-						switchToThankYouScreen();
-
-					}
-				});
-
-			}
-		}).start();
+		checkAndSwitchToThankYouScreenIfRegattaOver();
 	}
 
 	@Override