forked from upstream-mirrors/OpenTracks
Fix SignalStrengthSampler.
Fix style comment on TrackRecordingService.
This commit is contained in:
@@ -1045,8 +1045,9 @@ public class TrackRecordingService extends Service {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void sendTrackBroadcast(int actionResId, long trackId) {
|
private void sendTrackBroadcast(int actionResId, long trackId) {
|
||||||
Intent broadcastIntent = new Intent().setAction(getString(actionResId)).putExtra(
|
Intent broadcastIntent = new Intent()
|
||||||
getString(R.string.track_id_broadcast_extra), trackId);
|
.setAction(getString(actionResId))
|
||||||
|
.putExtra(getString(R.string.track_id_broadcast_extra), trackId);
|
||||||
sendBroadcast(broadcastIntent, getString(R.string.mytracks_notifications_permission));
|
sendBroadcast(broadcastIntent, getString(R.string.mytracks_notifications_permission));
|
||||||
|
|
||||||
SharedPreferences sharedPreferences = getSharedPreferences(Constants.SETTINGS_NAME, 0);
|
SharedPreferences sharedPreferences = getSharedPreferences(Constants.SETTINGS_NAME, 0);
|
||||||
|
|||||||
+2
-4
@@ -34,8 +34,7 @@ public class RecordingStateReceiver extends BroadcastReceiver {
|
|||||||
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(ctx);
|
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(ctx);
|
||||||
|
|
||||||
String action = intent.getAction();
|
String action = intent.getAction();
|
||||||
if (ctx.getString(R.string.track_started_broadcast_action).equals(action) ||
|
if (ctx.getString(R.string.track_started_broadcast_action).equals(action)) {
|
||||||
ctx.getString(R.string.track_resumed_broadcast_action).equals(action)) {
|
|
||||||
boolean autoStart = preferences.getBoolean(
|
boolean autoStart = preferences.getBoolean(
|
||||||
ctx.getString(R.string.settings_auto_start_key), false);
|
ctx.getString(R.string.settings_auto_start_key), false);
|
||||||
if (!autoStart) {
|
if (!autoStart) {
|
||||||
@@ -44,8 +43,7 @@ public class RecordingStateReceiver extends BroadcastReceiver {
|
|||||||
}
|
}
|
||||||
|
|
||||||
startService(ctx);
|
startService(ctx);
|
||||||
} else if (ctx.getString(R.string.track_stopped_broadcast_action).equals(action) ||
|
} else if (ctx.getString(R.string.track_stopped_broadcast_action).equals(action)) {
|
||||||
ctx.getString(R.string.track_paused_broadcast_action).equals(action)) {
|
|
||||||
boolean autoStop = preferences.getBoolean(
|
boolean autoStop = preferences.getBoolean(
|
||||||
ctx.getString(R.string.settings_auto_stop_key), true);
|
ctx.getString(R.string.settings_auto_stop_key), true);
|
||||||
if (!autoStop) {
|
if (!autoStop) {
|
||||||
|
|||||||
-12
@@ -71,24 +71,12 @@ public class RecordingStateReceiverTest extends AndroidTestCase {
|
|||||||
assertServiceCalls(1, 0);
|
assertServiceCalls(1, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void testOnReceive_resume() {
|
|
||||||
receiver.onReceive(context,
|
|
||||||
new Intent(context.getString(R.string.track_resumed_broadcast_action)));
|
|
||||||
assertServiceCalls(1, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void testOnReceive_stop() {
|
public void testOnReceive_stop() {
|
||||||
receiver.onReceive(context,
|
receiver.onReceive(context,
|
||||||
new Intent(context.getString(R.string.track_stopped_broadcast_action)));
|
new Intent(context.getString(R.string.track_stopped_broadcast_action)));
|
||||||
assertServiceCalls(0, 1);
|
assertServiceCalls(0, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void testOnReceive_pause() {
|
|
||||||
receiver.onReceive(context,
|
|
||||||
new Intent(context.getString(R.string.track_paused_broadcast_action)));
|
|
||||||
assertServiceCalls(0, 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void testOnReceive_noAutoStart() {
|
public void testOnReceive_noAutoStart() {
|
||||||
preferences
|
preferences
|
||||||
.edit()
|
.edit()
|
||||||
|
|||||||
Reference in New Issue
Block a user