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

Revert "Cleanup: use stream.toList()."

Browse Source 
This reverts commit 8c8a7d9496.
This commit is contained in:
Dennis Guse
2023-10-17 20:28:35 +02:00
parent 8f9ba046ce
commit 1eedd78466
10 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/androidTest/java/de/dennisguse/opentracks/data/CustomContentProviderUtilsTest.java
+3 -2
View File
@@ -47,6 +47,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import java.util.UUID;
import java.util.stream.Collectors;
import de.dennisguse.opentracks.content.data.TestDataUtil;
import de.dennisguse.opentracks.content.data.TestSensorDataUtil;
@@ -859,7 +860,7 @@ public class CustomContentProviderUtilsTest {
List<TrackPoint.Id> trackpointIds = track.second.stream()
.map(it -> ContentUris.parseId(contentProviderUtils.insertTrackPoint(it, track.first.getId())))
.map(TrackPoint.Id::new).toList();
.map(TrackPoint.Id::new).collect(Collectors.toList());
// when
try (Cursor cursor = contentProviderUtils.getTrackPointCursor(trackId, trackpointIds.get(8))) {
@@ -877,7 +878,7 @@ public class CustomContentProviderUtilsTest {
List<TrackPoint.Id> trackpointIds = track.second.stream()
.map(it -> ContentUris.parseId(contentProviderUtils.insertTrackPoint(it, track.first.getId())))
.map(TrackPoint.Id::new).toList();
.map(TrackPoint.Id::new).collect(Collectors.toList());
TrackPoint.Id startTrackPointId = trackpointIds.get(0);
src/main/java/de/dennisguse/opentracks/data/models/ActivityType.java
+2 -1
View File
@@ -7,6 +7,7 @@ import androidx.annotation.NonNull;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
import de.dennisguse.opentracks.R;
@@ -117,7 +118,7 @@ public enum ActivityType {
return Arrays.stream(values())
.map(ActivityType::getLocalizedStringId)
.map(context::getString)
.toList();
.collect(Collectors.toList());
}
@NonNull
src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportActivity.java
+3 -2
View File
@@ -32,6 +32,7 @@ import androidx.documentfile.provider.DocumentFile;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.stream.Collectors;
import de.dennisguse.opentracks.R;
import de.dennisguse.opentracks.data.ContentProviderUtils;
@@ -231,9 +232,9 @@ public class ExportActivity extends AppCompatActivity implements ExportService.E
exportTasks = new ArrayList<>();
if (allInOneFile) {
String filename = "OpenTracks-Backup";
exportTasks.add(new ExportTask(filename, trackFileFormat, tracks.stream().map(Track::getId).toList()));
exportTasks.add(new ExportTask(filename, trackFileFormat, tracks.stream().map(Track::getId).collect(Collectors.toList())));
} else {
exportTasks.addAll(tracks.stream().map(it -> new ExportTask(null, trackFileFormat, List.of(it.getId()))).toList());
exportTasks.addAll(tracks.stream().map(it -> new ExportTask(null, trackFileFormat, List.of(it.getId()))).collect(Collectors.toList()));
}
trackExportTotalCount = exportTasks.size();
}
src/main/java/de/dennisguse/opentracks/io/file/importer/ImportActivity.java
+2 -1
View File
@@ -32,6 +32,7 @@ import androidx.lifecycle.ViewModelProvider;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import de.dennisguse.opentracks.R;
import de.dennisguse.opentracks.TrackRecordedActivity;
@@ -99,7 +100,7 @@ public class ImportActivity extends FragmentActivity {
documentFiles = new ArrayList<>();
documentFiles.add(DocumentFile.fromTreeUri(this, documentUris.get(0)));
} else {
documentFiles = documentUris.stream().map(it -> DocumentFile.fromSingleUri(this, it)).toList();
documentFiles = documentUris.stream().map(it -> DocumentFile.fromSingleUri(this, it)).collect(Collectors.toList());
}
initViews();
src/main/java/de/dennisguse/opentracks/io/file/importer/ImportViewModel.java
+2 -1
View File
@@ -12,6 +12,7 @@ import androidx.lifecycle.MutableLiveData;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import de.dennisguse.opentracks.R;
import de.dennisguse.opentracks.data.models.Track;
@@ -49,7 +50,7 @@ public class ImportViewModel extends AndroidViewModel implements ImportServiceRe
List<ArrayList<DocumentFile>> nestedFileList = documentFiles.stream()
.map(FileUtils::getFiles)
// TODO flatMap(Collection::stream) fails with ClassCastException; try in the future again
.toList();
.collect(Collectors.toList());
List<DocumentFile> fileList = new ArrayList<>();
nestedFileList.forEach(fileList::addAll);
src/main/java/de/dennisguse/opentracks/io/file/importer/TrackImporter.java
+3 -2
View File
@@ -16,6 +16,7 @@ import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import java.util.UUID;
import java.util.stream.Collectors;
import de.dennisguse.opentracks.R;
import de.dennisguse.opentracks.data.ContentProviderUtils;
@@ -221,7 +222,7 @@ public class TrackImporter {
private void matchMarkers2TrackPoints(Track.Id trackId) {
List<TrackPoint> trackPointsWithLocation = trackPoints.stream()
.filter(TrackPoint::hasLocation)
.toList();
.collect(Collectors.toList());
List<Marker> todoMarkers = new LinkedList<>(markers);
List<Marker> doneMarkers = new LinkedList<>();
@@ -239,7 +240,7 @@ public class TrackImporter {
&& trackPoint.getLongitude() == it.getLongitude()
&& trackPoint.getTime().equals(it.getTime())
)
.toList();
.collect(Collectors.toList());
TrackStatistics statistics = updater.getTrackStatistics();
for (Marker marker : matchedMarkers) {
src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java
+2 -2
View File
@@ -729,7 +729,7 @@ public class PreferencesUtils {
R.array.stats_custom_layout_fields_default_value_16,
R.array.stats_custom_layout_fields_default_value_17,
R.array.stats_custom_layout_fields_default_value_18
).map(id -> resources.obtainTypedArray(id)).toList();
).map(id -> resources.obtainTypedArray(id)).collect(Collectors.toList());
}
@SuppressLint("ResourceType")
@@ -804,7 +804,7 @@ public class PreferencesUtils {
}
public static List<String> getAllCustomLayoutNames() {
return getAllCustomLayouts().stream().map(RecordingLayout::getName).toList();
return getAllCustomLayouts().stream().map(RecordingLayout::getName).collect(Collectors.toList());
}
public static void resetCustomLayoutPreferences() {
src/main/java/de/dennisguse/opentracks/settings/bluetooth/BluetoothLeSensorPreference.java
+3 -2
View File
@@ -23,6 +23,7 @@ import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
import de.dennisguse.opentracks.R;
import de.dennisguse.opentracks.sensors.BluetoothUtils;
@@ -135,7 +136,7 @@ public abstract class BluetoothLeSensorPreference extends DialogPreference {
b.putParcelableArrayList(ARG_BLE_SERVICE_UUIDS, new ArrayList<>(sensorUUIDs.stream()
.map(ServiceMeasurementUUID::serviceUUID)
.map(ParcelUuid::new)
.toList()));
.collect(Collectors.toList())));
fragment.setArguments(b);
return fragment;
}
@@ -201,7 +202,7 @@ public abstract class BluetoothLeSensorPreference extends DialogPreference {
if (PreferencesUtils.getBluetoothFilterEnabled()) {
scanFilter = serviceUUIDs.stream()
.map(it -> new ScanFilter.Builder().setServiceUuid(it).build())
.toList();
.collect(Collectors.toList());
}
ScanSettings.Builder scanSettingsBuilder = new ScanSettings.Builder();
src/main/java/de/dennisguse/opentracks/ui/customRecordingLayout/RecordingLayout.java
+1 -1
View File
@@ -68,7 +68,7 @@ public class RecordingLayout implements Parcelable {
public RecordingLayout toRecordingLayout(boolean visibility) {
RecordingLayout result = new RecordingLayout(this.getName());
result.addFields(dataFields.stream().filter(f -> f.isVisible() == visibility).toList());
result.addFields(dataFields.stream().filter(f -> f.isVisible() == visibility).collect(Collectors.toList()));
return result;
}
src/main/java/de/dennisguse/opentracks/util/ExportUtils.java
+2 -1
View File
@@ -16,6 +16,7 @@ import java.io.IOException;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import de.dennisguse.opentracks.data.ContentProviderUtils;
import de.dennisguse.opentracks.data.models.Track;
@@ -53,7 +54,7 @@ public class ExportUtils {
public static void exportTrack(Context context, DocumentFile directory, ExportTask exportTask) {
ContentProviderUtils contentProviderUtils = new ContentProviderUtils(context);
List<Track> tracks = exportTask.getTrackIds().stream().map(contentProviderUtils::getTrack).toList();
List<Track> tracks = exportTask.getTrackIds().stream().map(contentProviderUtils::getTrack).collect(Collectors.toList());
Uri exportDocumentFileUri;
if (tracks.size() == 1) {
exportDocumentFileUri = getExportDocumentFileUri(context, tracks.get(0), exportTask.getTrackFileFormat(), directory);