Cleanup: GainManager now processes AggregatorBarometer directly (instead of SensorManager).

src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java

@@ -723,10 +723,9 @@ public class ExportImportTest {
 
     private void mockAltitudeChange(TrackPointCreator trackPointCreator, Float altitudeGain) {
         SensorManager sensorManager = trackPointCreator.getSensorManager();
-        sensorManager.reset();
 
         if (altitudeGain == null) {
-            sensorManager.add(new AggregatorBarometer("test", null));
+            sensorManager.getAltitudeSumManager().setAggregatorBarometer(new AggregatorBarometer("test", null));
             return;
         }
 
@@ -742,7 +741,7 @@ public class ExportImportTest {
                 return true;
             }
         };
-        sensorManager.add(aggregatorBarometer);
+        sensorManager.getAltitudeSumManager().setAggregatorBarometer(aggregatorBarometer);
     }
 
     private void sendLocation(TrackPointCreator trackPointCreator, String time, double latitude, double longitude, float accuracy, float verticalAccuracy, float speed, double altitude, Float altitudeGain) {

src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceRecordingTest.java

@@ -810,7 +810,6 @@ public class TrackRecordingServiceRecordingTest {
 
         SensorManager sensorManager = trackPointCreator.getSensorManager();
         sensorManager.add(new AggregatorRunning("", ""));
-        sensorManager.barometer = null;
 
         // when
         String sensor1 = "2020-02-02T02:02:03Z";
@@ -965,7 +964,7 @@ public class TrackRecordingServiceRecordingTest {
     }
 
     private void mockAltitudeChange(TrackPointCreator trackPointCreator, float altitudeGain) {
-        trackPointCreator.getSensorManager().barometer = new AggregatorBarometer("", "") {
+        trackPointCreator.getSensorManager().getAltitudeSumManager().setAggregatorBarometer(new AggregatorBarometer("", "") {
             @Override
             public boolean hasReceivedData() {
                 return true;
@@ -976,7 +975,7 @@ public class TrackRecordingServiceRecordingTest {
             public AltitudeGainLoss getAggregatedValue(Instant now) {
                 return new AltitudeGainLoss(altitudeGain, altitudeGain);
             }
-        };
+        });
     }
 
     private static void sendGPSLocation(TrackPointCreator trackPointCreator, String time, double latitude, double longitude, float accuracy, long speed) {