eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-28 23:07:11 +00:00
Code Activity

TRACKING APP: refactoring back to old message sending service

Browse Source
This commit is contained in:
Lukas Zielinski committed 2015-01-12 18:15:32 +01:00
1 parent 78a94b7efb
commit 2c64c27a18
5 files changed
+88 -27
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/services/TrackingService.java
+1
View File
@@ -185,6 +185,7 @@ public class TrackingService extends Service implements ConnectionCallbacks,
String postUrlStr = event.server + prefs.getServerGpsFixesPostPath();
ExLog.e(this, "DEBUG", "calling start service");
startService(MessageSendingService.createMessageIntent(this, postUrlStr,
null, UUID.randomUUID(), json.toString(), null));
mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/services/TransmittingService.java
+1 -2
View File
@@ -257,7 +257,7 @@ public class TransmittingService extends Service {
private void sendFixesToAPI(List<String> failedHosts) {
ExLog.e(this, "REFACTORING", "Not sending any fixes here anymore.");
if (true) {
if (2 == 1) {
return;
}
@@ -570,7 +570,6 @@ public class TransmittingService extends Service {
public interface APIConnectivityListener {
public void apiConnectivityUpdated(APIConnectivity apiConnectivity);
public void setUnsentGPSFixesCount(int count);
}
mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/TrackingActivity.java
+20 -21
View File
@@ -18,6 +18,10 @@ import android.support.v7.widget.Toolbar;
import android.widget.TextView;
import com.sap.sailing.android.shared.logging.ExLog;
import com.sap.sailing.android.shared.services.sending.MessageSendingService;
import com.sap.sailing.android.shared.services.sending.MessageSendingService.APIConnectivity;
import com.sap.sailing.android.shared.services.sending.MessageSendingService.APIConnectivityListener;
import com.sap.sailing.android.shared.services.sending.MessageSendingService.MessageSendingBinder;
import com.sap.sailing.android.tracking.app.BuildConfig;
import com.sap.sailing.android.tracking.app.R;
import com.sap.sailing.android.tracking.app.sensors.CompassManager;
@@ -26,10 +30,6 @@ import com.sap.sailing.android.tracking.app.services.TrackingService;
import com.sap.sailing.android.tracking.app.services.TrackingService.GPSQuality;
import com.sap.sailing.android.tracking.app.services.TrackingService.GPSQualityListener;
import com.sap.sailing.android.tracking.app.services.TrackingService.TrackingBinder;
import com.sap.sailing.android.tracking.app.services.TransmittingService;
import com.sap.sailing.android.tracking.app.services.TransmittingService.APIConnectivity;
import com.sap.sailing.android.tracking.app.services.TransmittingService.APIConnectivityListener;
import com.sap.sailing.android.tracking.app.services.TransmittingService.TransmittingBinder;
import com.sap.sailing.android.tracking.app.ui.fragments.CompassFragment;
import com.sap.sailing.android.tracking.app.ui.fragments.SpeedFragment;
import com.sap.sailing.android.tracking.app.ui.fragments.StopTrackingButtonFragment;
@@ -46,8 +46,8 @@ public class TrackingActivity extends BaseActivity implements GPSQualityListener
TrackingService trackingService;
boolean trackingServiceBound;
TransmittingService transmittingService;
boolean transmittingServiceBound;
MessageSendingService messageSendingService;
boolean messageSendingServiceBound;
private final static String TAG = TrackingActivity.class.getName();
private final static String SIS_TRACKING_FRAGMENT = "savedInstanceTrackingFragment";
@@ -61,7 +61,7 @@ public class TrackingActivity extends BaseActivity implements GPSQualityListener
private String checkinDigest;
private TrackingFragment trackingFragment;
private TrackingFragment trackingFragment;
private TimerRunnable timer;
private int lastViewPagerItem;
@@ -168,9 +168,8 @@ public class TrackingActivity extends BaseActivity implements GPSQualityListener
@Override
public void onStart() {
super.onStart();
Intent transmittingServiceIntent = new Intent(this, TransmittingService.class);
bindService(transmittingServiceIntent, transmittingServiceConnection,
Context.BIND_AUTO_CREATE);
Intent messageSendingServiceIntent = new Intent(this, MessageSendingService.class);
bindService(messageSendingServiceIntent, messageSendingServiceConnection, Context.BIND_AUTO_CREATE);
Intent trackingServiceIntent = new Intent(this, TrackingService.class);
bindService(trackingServiceIntent, trackingServiceConnection, Context.BIND_AUTO_CREATE);
}
@@ -188,11 +187,11 @@ public class TrackingActivity extends BaseActivity implements GPSQualityListener
}
}
if (transmittingServiceBound) {
transmittingService.unregisterAPIConnectivityListener();
unbindService(transmittingServiceConnection);
if (messageSendingServiceBound) {
messageSendingService.unregisterAPIConnectivityListener();
unbindService(messageSendingServiceConnection);
transmittingServiceBound = false;
messageSendingServiceBound = false;
if (BuildConfig.DEBUG) {
ExLog.i(this, TAG, "Unbound transmitting Service");
@@ -276,24 +275,24 @@ public class TrackingActivity extends BaseActivity implements GPSQualityListener
}
/** Defines callbacks for service binding, passed to bindService() */
private ServiceConnection transmittingServiceConnection = new ServiceConnection() {
private ServiceConnection messageSendingServiceConnection = new ServiceConnection() {
@Override
public void onServiceConnected(ComponentName className, IBinder service) {
// We've bound to LocalService, cast the IBinder and get
// LocalService instance
TransmittingBinder binder = (TransmittingBinder) service;
transmittingService = binder.getService();
transmittingServiceBound = true;
transmittingService.registerAPIConnectivityListener(TrackingActivity.this);
MessageSendingBinder binder = (MessageSendingBinder) service;
messageSendingService = binder.getService();
messageSendingServiceBound = true;
messageSendingService.registerAPIConnectivityListener(TrackingActivity.this);
if (BuildConfig.DEBUG) {
ExLog.i(TrackingActivity.this, TAG, "connected to transmitting service");
ExLog.i(TrackingActivity.this, TAG, "connected to message sending service");
}
}
@Override
public void onServiceDisconnected(ComponentName arg0) {
transmittingServiceBound = false;
messageSendingServiceBound = false;
}
};
mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/TrackingFragment.java
+3 -3
View File
@@ -15,11 +15,11 @@ import android.view.ViewGroup;
import android.widget.TextView;
import com.sap.sailing.android.shared.logging.ExLog;
import com.sap.sailing.android.shared.services.sending.MessageSendingService.APIConnectivity;
import com.sap.sailing.android.tracking.app.BuildConfig;
import com.sap.sailing.android.tracking.app.R;
import com.sap.sailing.android.tracking.app.customviews.SignalQualityIndicatorView;
import com.sap.sailing.android.tracking.app.services.TrackingService.GPSQuality;
import com.sap.sailing.android.tracking.app.services.TransmittingService.APIConnectivity;
import com.sap.sailing.android.tracking.app.ui.activities.TrackingActivity;
import com.sap.sailing.android.tracking.app.utils.AppPreferences;
@@ -143,7 +143,7 @@ public class TrackingFragment extends BaseFragment {
TextView textView = (TextView) getActivity().findViewById(
R.id.mode);
if (apiConnectivity == APIConnectivity.reachableTransmissionSuccess) {
if (apiConnectivity == APIConnectivity.transmissionSuccess) {
if (prefs.getEnergySavingEnabledByUser()) {
textView.setText(getString(R.string.tracking_mode_battery_saving));
textView.setTextColor(Color
@@ -158,7 +158,7 @@ public class TrackingFragment extends BaseFragment {
textView.setText(getString(R.string.tracking_mode_offline));
textView.setTextColor(Color
.parseColor(getString(R.color.sap_green)));
} else if (apiConnectivity == APIConnectivity.reachableTransmissionError) {
} else if (apiConnectivity == APIConnectivity.transmissionError) {
textView.setText(getString(R.string.tracking_mode_api_error));
textView.setTextColor(Color
.parseColor(getString(R.color.sap_red)));