karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Cleanup: use lambda instead of runnable.

Browse Source
This commit is contained in:
Dennis Guse
2020-06-09 23:01:09 +02:00
parent accb30152f
commit a3ba1e1490
14 changed files with 89 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/MarkerDetailActivity.java
+1 -6
View File
@@ -109,12 +109,7 @@ public class MarkerDetailActivity extends AbstractActivity implements DeleteMark
@Override @Override
public void onDeleteMarkerDone() { public void onDeleteMarkerDone() {
runOnUiThread(new Runnable() { runOnUiThread(this::finish);
@Override
public void run() {
finish();
}
});
} }
/** /**
src/main/java/de/dennisguse/opentracks/MarkerListActivity.java
+1 -6
View File
@@ -82,12 +82,7 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
recordingTrackPaused = PreferencesUtils.isRecordingTrackPaused(MarkerListActivity.this); recordingTrackPaused = PreferencesUtils.isRecordingTrackPaused(MarkerListActivity.this);
} }
if (key != null) { if (key != null) {
runOnUiThread(new Runnable() { runOnUiThread(() -> MarkerListActivity.this.invalidateOptionsMenu());
@Override
public void run() {
MarkerListActivity.this.invalidateOptionsMenu();
}
});
} }
} }
}; };
src/main/java/de/dennisguse/opentracks/SearchListActivity.java
+6 -24
View File
@@ -153,12 +153,7 @@ public class SearchListActivity extends AbstractListActivity implements DeleteMa
recordingTrackPaused = PreferencesUtils.isRecordingTrackPaused(SearchListActivity.this); recordingTrackPaused = PreferencesUtils.isRecordingTrackPaused(SearchListActivity.this);
} }
if (key != null) { if (key != null) {
runOnUiThread(new Runnable() { runOnUiThread(() -> arrayAdapter.notifyDataSetChanged());
@Override
public void run() {
arrayAdapter.notifyDataSetChanged();
}
});
} }
} }
}; };
@@ -346,12 +341,9 @@ public class SearchListActivity extends AbstractListActivity implements DeleteMa
final List<Map<String, Object>> displayResults = prepareResultsforDisplay(scoredResults); final List<Map<String, Object>> displayResults = prepareResultsforDisplay(scoredResults);
// Use the UI thread to display the results // Use the UI thread to display the results
runOnUiThread(new Runnable() { runOnUiThread(() -> {
@Override arrayAdapter.clear();
public void run() { arrayAdapter.addAll(displayResults);
arrayAdapter.clear();
arrayAdapter.addAll(displayResults);
}
}); });
} }
@@ -448,12 +440,7 @@ public class SearchListActivity extends AbstractListActivity implements DeleteMa
@Override @Override
public void onDeleteMarkerDone() { public void onDeleteMarkerDone() {
runOnUiThread(new Runnable() { runOnUiThread(() -> handleIntent(getIntent()));
@Override
public void run() {
handleIntent(getIntent());
}
});
} }
@Override @Override
@@ -463,11 +450,6 @@ public class SearchListActivity extends AbstractListActivity implements DeleteMa
@Override @Override
protected void onDeleted() { protected void onDeleted() {
runOnUiThread(new Runnable() { runOnUiThread(() -> handleIntent(getIntent()));
@Override
public void run() {
handleIntent(getIntent());
}
});
} }
} }
src/main/java/de/dennisguse/opentracks/TrackListActivity.java
+6 -14
View File
@@ -143,14 +143,11 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
recordingTrackPaused = PreferencesUtils.isRecordingTrackPaused(TrackListActivity.this); recordingTrackPaused = PreferencesUtils.isRecordingTrackPaused(TrackListActivity.this);
} }
if (key != null) { if (key != null) {
runOnUiThread(new Runnable() { runOnUiThread(() -> {
@Override TrackListActivity.this.invalidateOptionsMenu();
public void run() { LoaderManager.getInstance(TrackListActivity.this).restartLoader(0, null, loaderCallbacks);
TrackListActivity.this.invalidateOptionsMenu(); boolean isRecording = PreferencesUtils.isRecording(recordingTrackId);
LoaderManager.getInstance(TrackListActivity.this).restartLoader(0, null, loaderCallbacks); trackController.update(isRecording, recordingTrackPaused);
boolean isRecording = PreferencesUtils.isRecording(recordingTrackId);
trackController.update(isRecording, recordingTrackPaused);
}
}); });
} }
} }
@@ -177,12 +174,7 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
/* /*
* After binding changes (e.g., becomes available), update the total time in trackController. * After binding changes (e.g., becomes available), update the total time in trackController.
*/ */
runOnUiThread(new Runnable() { runOnUiThread(() -> trackController.update(PreferencesUtils.isRecording(recordingTrackId), recordingTrackPaused));
@Override
public void run() {
trackController.update(PreferencesUtils.isRecording(recordingTrackId), recordingTrackPaused);
}
});
if (!startGps) { if (!startGps) {
return; return;
src/main/java/de/dennisguse/opentracks/TrackRecordedActivity.java
+1 -8
View File
@@ -16,7 +16,6 @@
package de.dennisguse.opentracks; package de.dennisguse.opentracks;
import android.app.ActivityOptions;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log; import android.util.Log;
@@ -226,12 +225,7 @@ public class TrackRecordedActivity extends AbstractListActivity implements Choos
@Override @Override
protected void onDeleted() { protected void onDeleted() {
runOnUiThread(new Runnable() { runOnUiThread(this::finish);
@Override
public void run() {
finish();
}
});
} }
/** /**
@@ -259,7 +253,6 @@ public class TrackRecordedActivity extends AbstractListActivity implements Choos
if (trackId == -1L) { if (trackId == -1L) {
Log.e(TAG, "TrackDetailActivity needs EXTRA_TRACK_ID."); Log.e(TAG, "TrackDetailActivity needs EXTRA_TRACK_ID.");
finish(); finish();
return;
} }
} }
src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java
+4 -13
View File
@@ -1,6 +1,5 @@
package de.dennisguse.opentracks; package de.dennisguse.opentracks;
import android.app.ActivityOptions;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.SharedPreferences.OnSharedPreferenceChangeListener; import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
@@ -68,12 +67,7 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc
@Override @Override
public void run() { public void run() {
// After binding changes (is available), update the total time in trackController. // After binding changes (is available), update the total time in trackController.
runOnUiThread(new Runnable() { runOnUiThread(() -> trackController.update(true, recordingTrackPaused));
@Override
public void run() {
trackController.update(true, recordingTrackPaused);
}
});
if (recordingTrackId == -1L) { if (recordingTrackId == -1L) {
TrackRecordingServiceInterface service = trackRecordingServiceConnection.getServiceIfBound(); TrackRecordingServiceInterface service = trackRecordingServiceConnection.getServiceIfBound();
@@ -130,12 +124,9 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc
if (key == null) return; if (key == null) return;
runOnUiThread(new Runnable() { runOnUiThread(() -> {
@Override TrackRecordingActivity.this.invalidateOptionsMenu();
public void run() { trackController.update(true, recordingTrackPaused);
TrackRecordingActivity.this.invalidateOptionsMenu();
trackController.update(true, recordingTrackPaused);
}
}); });
} }
}; };
src/main/java/de/dennisguse/opentracks/content/TrackDataHub.java
+21 -38
View File
@@ -144,12 +144,9 @@ public class TrackDataHub implements SharedPreferences.OnSharedPreferenceChangeL
PreferencesUtils.register(context, this); PreferencesUtils.register(context, this);
onSharedPreferenceChanged(null, null); onSharedPreferenceChanged(null, null);
runInHandlerThread(new Runnable() { runInHandlerThread(() -> {
@Override if (started) {
public void run() { loadDataForAll();
if (started) {
loadDataForAll();
}
} }
}); });
} }
@@ -178,16 +175,13 @@ public class TrackDataHub implements SharedPreferences.OnSharedPreferenceChangeL
} }
public void loadTrack(final long trackId) { public void loadTrack(final long trackId) {
runInHandlerThread(new Runnable() { runInHandlerThread(() -> {
@Override if (trackId == selectedTrackId) {
public void run() { Log.i(TAG, "Not reloading track " + trackId);
if (trackId == selectedTrackId) { return;
Log.i(TAG, "Not reloading track " + trackId);
return;
}
selectedTrackId = trackId;
loadDataForAll();
} }
selectedTrackId = trackId;
loadDataForAll();
}); });
} }
@@ -197,13 +191,10 @@ public class TrackDataHub implements SharedPreferences.OnSharedPreferenceChangeL
* @param trackDataListener the track data listener * @param trackDataListener the track data listener
*/ */
public void registerTrackDataListener(final TrackDataListener trackDataListener, final boolean tracksTable, final boolean waypointsTable, final boolean trackPointsTable_SampleIn, final boolean trackPointsTable_SampleOut) { public void registerTrackDataListener(final TrackDataListener trackDataListener, final boolean tracksTable, final boolean waypointsTable, final boolean trackPointsTable_SampleIn, final boolean trackPointsTable_SampleOut) {
runInHandlerThread(new Runnable() { runInHandlerThread(() -> {
@Override trackDataManager.registerTrackDataListener(trackDataListener, tracksTable, waypointsTable, trackPointsTable_SampleIn, trackPointsTable_SampleOut);
public void run() { if (started) {
trackDataManager.registerTrackDataListener(trackDataListener, tracksTable, waypointsTable, trackPointsTable_SampleIn, trackPointsTable_SampleOut); loadDataForListener(trackDataListener);
if (started) {
loadDataForListener(trackDataListener);
}
} }
}); });
} }
@@ -214,12 +205,7 @@ public class TrackDataHub implements SharedPreferences.OnSharedPreferenceChangeL
* @param trackDataListener the track data listener * @param trackDataListener the track data listener
*/ */
public void unregisterTrackDataListener(final TrackDataListener trackDataListener) { public void unregisterTrackDataListener(final TrackDataListener trackDataListener) {
runInHandlerThread(new Runnable() { runInHandlerThread(() -> trackDataManager.unregisterTrackDataListener(trackDataListener));
@Override
public void run() {
trackDataManager.unregisterTrackDataListener(trackDataListener);
}
});
} }
/** /**
@@ -238,15 +224,12 @@ public class TrackDataHub implements SharedPreferences.OnSharedPreferenceChangeL
@Override @Override
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, final String key) { public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, final String key) {
runInHandlerThread(new Runnable() { runInHandlerThread(() -> {
@Override if (PreferencesUtils.isKey(context, R.string.recording_track_id_key, key)) {
public void run() { recordingTrackId = PreferencesUtils.getRecordingTrackId(context);
if (PreferencesUtils.isKey(context, R.string.recording_track_id_key, key)) { }
recordingTrackId = PreferencesUtils.getRecordingTrackId(context); if (PreferencesUtils.isKey(context, R.string.recording_track_paused_key, key)) {
} recordingTrackPaused = PreferencesUtils.isRecordingTrackPaused(context);
if (PreferencesUtils.isKey(context, R.string.recording_track_paused_key, key)) {
recordingTrackPaused = PreferencesUtils.isRecordingTrackPaused(context);
}
} }
}); });
} }
@@ -289,7 +272,7 @@ public class TrackDataHub implements SharedPreferences.OnSharedPreferenceChangeL
if (isOnlyListener) { if (isOnlyListener) {
resetSamplingState(); resetSamplingState();
} }
Set<TrackDataListener> sampledOutListeners = hasSampledOut ? trackDataListeners : Collections.<TrackDataListener>emptySet(); Set<TrackDataListener> sampledOutListeners = hasSampledOut ? trackDataListeners : Collections.emptySet();
notifyTrackPointsTableUpdate(isOnlyListener, trackDataListeners, sampledOutListeners); notifyTrackPointsTableUpdate(isOnlyListener, trackDataListeners, sampledOutListeners);
} }
src/main/java/de/dennisguse/opentracks/fragments/ChartFragment.java
+9 -18
View File
@@ -90,12 +90,9 @@ public class ChartFragment extends Fragment implements TrackDataListener {
boolean metricUnits = PreferencesUtils.isMetricUnits(getContext()); boolean metricUnits = PreferencesUtils.isMetricUnits(getContext());
if (metricUnits != chartView.getMetricUnits()) { if (metricUnits != chartView.getMetricUnits()) {
chartView.setMetricUnits(metricUnits); chartView.setMetricUnits(metricUnits);
runOnUiThread(new Runnable() { runOnUiThread(() -> {
@Override if (isResumed()) {
public void run() { chartView.requestLayout();
if (isResumed()) {
chartView.requestLayout();
}
} }
}); });
} }
@@ -106,12 +103,9 @@ public class ChartFragment extends Fragment implements TrackDataListener {
chartView.setReportSpeed(reportSpeed); chartView.setReportSpeed(reportSpeed);
chartView.applyReportSpeed(); chartView.applyReportSpeed();
runOnUiThread(new Runnable() { runOnUiThread(() -> {
@Override if (isResumed()) {
public void run() { chartView.requestLayout();
if (isResumed()) {
chartView.requestLayout();
}
} }
}); });
} }
@@ -214,12 +208,9 @@ public class ChartFragment extends Fragment implements TrackDataListener {
trackStatisticsUpdater = startTime != -1L ? new TrackStatisticsUpdater(startTime) : null; trackStatisticsUpdater = startTime != -1L ? new TrackStatisticsUpdater(startTime) : null;
pendingPoints.clear(); pendingPoints.clear();
chartView.reset(); chartView.reset();
runOnUiThread(new Runnable() { runOnUiThread(() -> {
@Override if (isResumed()) {
public void run() { chartView.resetScroll();
if (isResumed()) {
chartView.resetScroll();
}
} }
}); });
} }
src/main/java/de/dennisguse/opentracks/fragments/DeleteMarkerDialogFragment.java
+5 -8
View File
@@ -80,15 +80,12 @@ public class DeleteMarkerDialogFragment extends DialogFragment {
fragmentActivity, titleId, getString(messageId), new DialogInterface.OnClickListener() { fragmentActivity, titleId, getString(messageId), new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
new Thread(new Runnable() { new Thread(() -> {
@Override ContentProviderUtils contentProviderUtils = new ContentProviderUtils(fragmentActivity);
public void run() { for (long markerId : markerIds) {
ContentProviderUtils contentProviderUtils = new ContentProviderUtils(fragmentActivity); contentProviderUtils.deleteWaypoint(getContext(), markerId);
for (long markerId : markerIds) {
contentProviderUtils.deleteWaypoint(getContext(), markerId);
}
caller.onDeleteMarkerDone();
} }
caller.onDeleteMarkerDone();
}).start(); }).start();
} }
}); });
src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordedFragment.java
+8 -14
View File
@@ -59,12 +59,9 @@ public class StatisticsRecordedFragment extends Fragment implements TrackDataLis
public void onSharedPreferenceChanged(SharedPreferences preferences, String key) { public void onSharedPreferenceChanged(SharedPreferences preferences, String key) {
if (PreferencesUtils.isKey(getContext(), R.string.stats_units_key, key) || PreferencesUtils.isKey(getContext(), R.string.stats_rate_key, key)) { if (PreferencesUtils.isKey(getContext(), R.string.stats_units_key, key) || PreferencesUtils.isKey(getContext(), R.string.stats_rate_key, key)) {
if (isResumed()) { if (isResumed()) {
getActivity().runOnUiThread(new Runnable() { getActivity().runOnUiThread(() -> {
@Override if (isResumed()) {
public void run() { updateUI();
if (isResumed()) {
updateUI();
}
} }
}); });
} }
@@ -195,14 +192,11 @@ public class StatisticsRecordedFragment extends Fragment implements TrackDataLis
@Override @Override
public void onTrackUpdated(final Track track) { public void onTrackUpdated(final Track track) {
if (isResumed()) { if (isResumed()) {
getActivity().runOnUiThread(new Runnable() { getActivity().runOnUiThread(() -> {
@Override if (isResumed()) {
public void run() { trackStatistics = track != null ? track.getTrackStatistics() : null;
if (isResumed()) { category = track != null ? track.getCategory() : "";
trackStatistics = track != null ? track.getTrackStatistics() : null; updateUI();
category = track != null ? track.getCategory() : "";
updateUI();
}
} }
}); });
} }
src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordingFragment.java
+20 -29
View File
@@ -68,12 +68,9 @@ public class StatisticsRecordingFragment extends Fragment implements TrackDataLi
public void onSharedPreferenceChanged(SharedPreferences preferences, String key) { public void onSharedPreferenceChanged(SharedPreferences preferences, String key) {
if (PreferencesUtils.isKey(getContext(), R.string.stats_units_key, key) || PreferencesUtils.isKey(getContext(), R.string.stats_rate_key, key)) { if (PreferencesUtils.isKey(getContext(), R.string.stats_units_key, key) || PreferencesUtils.isKey(getContext(), R.string.stats_rate_key, key)) {
if (isResumed()) { if (isResumed()) {
getActivity().runOnUiThread(new Runnable() { getActivity().runOnUiThread(() -> {
@Override if (isResumed()) {
public void run() { updateUI();
if (isResumed()) {
updateUI();
}
} }
}); });
} }
@@ -308,14 +305,11 @@ public class StatisticsRecordingFragment extends Fragment implements TrackDataLi
@Override @Override
public void onTrackUpdated(final Track track) { public void onTrackUpdated(final Track track) {
if (isResumed()) { if (isResumed()) {
getActivity().runOnUiThread(new Runnable() { getActivity().runOnUiThread(() -> {
@Override if (isResumed()) {
public void run() { lastTrackStatistics = track != null ? track.getTrackStatistics() : null;
if (isResumed()) { category = track != null ? track.getCategory() : "";
lastTrackStatistics = track != null ? track.getTrackStatistics() : null; updateUI();
category = track != null ? track.getCategory() : "";
updateUI();
}
} }
}); });
} }
@@ -339,24 +333,21 @@ public class StatisticsRecordingFragment extends Fragment implements TrackDataLi
@Override @Override
public void onNewTrackPointsDone() { public void onNewTrackPointsDone() {
if (isResumed()) { if (isResumed()) {
getActivity().runOnUiThread(new Runnable() { getActivity().runOnUiThread(() -> {
@Override if (isResumed()) {
public void run() { if (!isSelectedTrackRecording() || isSelectedTrackPaused()) {
if (isResumed()) { lastTrackPoint = null;
if (!isSelectedTrackRecording() || isSelectedTrackPaused()) { }
if (lastTrackPoint != null) {
boolean hasFix = !LocationUtils.isLocationOld(lastTrackPoint.getLocation());
boolean hasGoodFix = TrackPointUtils.fulfillsAccuracy(lastTrackPoint, recordingGpsAccuracy);
if (!hasFix || !hasGoodFix) {
lastTrackPoint = null; lastTrackPoint = null;
} }
if (lastTrackPoint != null) {
boolean hasFix = !LocationUtils.isLocationOld(lastTrackPoint.getLocation());
boolean hasGoodFix = TrackPointUtils.fulfillsAccuracy(lastTrackPoint, recordingGpsAccuracy);
if (!hasFix || !hasGoodFix) {
lastTrackPoint = null;
}
}
setLocationValues();
} }
setLocationValues();
} }
}); });
} }
src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java
+1 -6
View File
@@ -150,12 +150,7 @@ public class TrackRecordingService extends Service {
if (locationExecutorService == null || locationExecutorService.isShutdown() || locationExecutorService.isTerminated()) { if (locationExecutorService == null || locationExecutorService.isShutdown() || locationExecutorService.isTerminated()) {
return; return;
} }
locationExecutorService.submit(new Runnable() { locationExecutorService.submit(() -> onLocationChangedAsync(location));
@Override
public void run() {
onLocationChangedAsync(location);
}
});
} }
@Override @Override
src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java
+2 -12
View File
@@ -60,20 +60,10 @@ public class SettingsActivity extends AppCompatActivity implements ChooseActivit
@Override @Override
public void onSharedPreferenceChanged(SharedPreferences preferences, String key) { public void onSharedPreferenceChanged(SharedPreferences preferences, String key) {
if (PreferencesUtils.isKey(getActivity(), R.string.recording_track_id_key, key)) { if (PreferencesUtils.isKey(getActivity(), R.string.recording_track_id_key, key)) {
getActivity().runOnUiThread(new Runnable() { getActivity().runOnUiThread(() -> updateReset());
@Override
public void run() {
updateReset();
}
});
} }
if (PreferencesUtils.isKey(getActivity(), R.string.stats_units_key, key)) { if (PreferencesUtils.isKey(getActivity(), R.string.stats_units_key, key)) {
getActivity().runOnUiThread(new Runnable() { getActivity().runOnUiThread(() -> updateUnits());
@Override
public void run() {
updateUnits();
}
});
} }
} }
}; };
src/main/java/de/dennisguse/opentracks/util/BluetoothUtils.java
+4 -7
View File
@@ -61,13 +61,10 @@ public class BluetoothUtils {
final Object mutex = new Object(); final Object mutex = new Object();
Handler handler = new Handler(Looper.getMainLooper()); Handler handler = new Handler(Looper.getMainLooper());
handler.post(new Runnable() { handler.post(() -> {
@Override adapters.add(BluetoothAdapter.getDefaultAdapter());
public void run() { synchronized (mutex) {
adapters.add(BluetoothAdapter.getDefaultAdapter()); mutex.notify();
synchronized (mutex) {
mutex.notify();
}
} }
}); });