TRACKING APP: fixes for timer in TrackingActivity when already started

mobile/com.sap.sailing.android.tracking.app/res/values/strings_activity.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="tracking_activity_event_id_parameter">trackingActivityEventId</string> 
-    <string name="tracking_activity_started_by_start_activity_parameter">startedByStartActivity</string> 
 </resources>

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

@@ -77,7 +77,6 @@ public class StartActivity extends BaseActivity {
     private void startTrackingActivity(int eventId) {
 		Intent intent = new Intent(this, TrackingActivity.class);
 		intent.putExtra(getString(R.string.tracking_activity_event_id_parameter), eventId);
-		intent.putExtra(getString(R.string.tracking_activity_started_by_start_activity_parameter), true);
 		startActivity(intent);
 	}
 

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

@@ -37,7 +37,6 @@ public class TrackingActivity extends BaseActivity implements GPSQualityListener
 	
 	TransmittingService transmittingService;
 	boolean transmittingServiceBound;
-	boolean startedByStartActivity;
 	
 	private final static String TAG = TrackingActivity.class.getName();
 
@@ -48,8 +47,7 @@ public class TrackingActivity extends BaseActivity implements GPSQualityListener
         super.onCreate(savedInstanceState);
         
         Intent intent = getIntent();
-        eventId = intent.getExtras().getInt(getString(R.string.tracking_activity_event_id_parameter));
-        startedByStartActivity = intent.getExtras().getBoolean(getString(R.string.tracking_activity_started_by_start_activity_parameter)); 
+        eventId = intent.getExtras().getInt(getString(R.string.tracking_activity_event_id_parameter)); 
         		
         setContentView(R.layout.fragment_container);
         
@@ -207,13 +205,4 @@ public class TrackingActivity extends BaseActivity implements GPSQualityListener
             trackingServiceBound = false;
         }
     };
-    
-    /**
-     * the fragment can call this to know if tracking was running before, so it doesn't reset the timer.
-     * @return
-     */
-    public boolean getStartedByStartActivity()
-    {
-    	return startedByStartActivity;
-    }
 }

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

@@ -50,8 +50,7 @@ public class TrackingFragment extends BaseFragment implements OnClickListener {
 		stopTracking.setOnClickListener(this);
 	
 		prefs = new AppPreferences(getActivity());
-		
-		if (((TrackingActivity)getActivity()).getStartedByStartActivity() == false)
+		if (prefs.getTrackingTimerStarted() == 0)
 		{
 			prefs.setTrackingTimerStarted(System.currentTimeMillis());	
 		}
@@ -208,6 +207,8 @@ public class TrackingFragment extends BaseFragment implements OnClickListener {
 	}
 	
 	private void stopTracking() {
+		prefs.setTrackingTimerStarted(0);
+		
 		Intent intent = new Intent(getActivity(), TrackingService.class);
 		intent.setAction(getString(R.string.tracking_service_stop));
 		getActivity().startService(intent);