Release: v4.26.1

Currently translated at 48.8% (266 of 545 strings)

Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main
Translate-URL: https://translate.codeberg.org/projects/opentracks/opentracks-src-main-res-values-strings-xml-main/ja/

build.gradle

@@ -47,8 +47,8 @@ android {
 
     defaultConfig {
         applicationId 'de.dennisguse.opentracks'
-        versionCode 6603
-        versionName "v4.26.0"
+        versionCode 6609
+        versionName "v4.26.1"
 
         buildConfigField "String", "VERSION_NAME_FULL", "\"${getVersionName()}\""
 

fastlane/metadata/android/en-US/changelogs/6609.txt

@@ -0,0 +1,6 @@
+v4.26.1: OpenTracks
+
+Bugfix:
+- Crash when deleting a UI layout
+- Crash when heartrate sensor data could not be decoded
+- Crash when exporting zero tracks

src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportActivity.java

@@ -167,8 +167,11 @@ public class ExportActivity extends AbstractActivity {
             new Thread(() -> {
                 directoryFiles = ExportUtils.getAllFiles(ExportActivity.this, documentFile.getUri());
                 runOnUiThread(() -> {
-                    createExportTasks(allInOneFile);
-                    nextExport(null);
+                    if (createExportTasks(allInOneFile)) {
+                        nextExport(null);
+                    } else {
+                        onExportEnded();
+                    }
                 });
             }).start();
         } else {
@@ -217,8 +220,12 @@ public class ExportActivity extends AbstractActivity {
         exportTasks.clear();
     }
 
-    private void createExportTasks(boolean allInOneFile) {
+    private boolean createExportTasks(boolean allInOneFile) {
         List<Track> tracks = contentProviderUtils.getTracks();
+        if (tracks.isEmpty()) {
+            return false;
+        }
+
         exportTasks = new ArrayList<>();
         if (allInOneFile) {
             String filename = "OpenTracks-Backup";
@@ -227,6 +234,7 @@ public class ExportActivity extends AbstractActivity {
             exportTasks.addAll(tracks.stream().map(it -> new ExportTask(null, trackFileFormat, List.of(it.id()))).toList());
         }
         trackExportTotalCount = exportTasks.size();
+        return true;
     }
 
     /**
@@ -391,7 +399,7 @@ public class ExportActivity extends AbstractActivity {
 
         /**
          * Try to resolve the conflict if user gave the info needed.
-         * Otherwise shows the buttons and views needed to gives the user the possibility of take a decision.
+         * Otherwise, shows the buttons and views needed to gives the user the possibility of take a decision.
          *
          * @return true if it could resolve the conflict or false otherwise.
          */

src/main/java/de/dennisguse/opentracks/sensors/SensorManager.java

@@ -14,7 +14,6 @@ import java.time.Instant;
 
 import de.dennisguse.opentracks.data.models.Cadence;
 import de.dennisguse.opentracks.data.models.Distance;
-import de.dennisguse.opentracks.data.models.HeartRate;
 import de.dennisguse.opentracks.data.models.Position;
 import de.dennisguse.opentracks.data.models.Speed;
 import de.dennisguse.opentracks.sensors.sensorData.AggregatorCyclingCadence;
@@ -186,17 +185,6 @@ public class SensorManager implements SharedPreferences.OnSharedPreferenceChange
         return handler;
     }
 
-    private SensorData<HeartRate> getHeartRate(Instant now) {
-        SensorData<HeartRate> value = heartRateHandler.getSensorData(now);
-        if (value != null) {
-
-            //TODO Move this check into HeartRateHandler
-            if (value.data().isValid()) return value;
-        }
-
-        return null;
-    }
-
     private SensorData<Cadence> getCadence(Instant now) {
         {
             SensorData<Cadence> value = cyclingCadenceHandler.getSensorData(now);
@@ -263,7 +251,7 @@ public class SensorManager implements SharedPreferences.OnSharedPreferenceChange
                 gpsSensorData,
                 getSpeed(now),
                 getDistance(now),
-                getHeartRate(now),
+                heartRateHandler.getSensorData(now),
                 temperatureHandler.getSensorData(now),
                 getCadence(now),
                 cyclingPowerHandler.getSensorData(now),

src/main/java/de/dennisguse/opentracks/sensors/sensorData/Aggregator.java

@@ -34,7 +34,7 @@ public abstract class Aggregator<InputType, OutputType> {
         previous = next;
     }
 
-    protected abstract void computeValue(Raw<InputType> current);
+    protected abstract void computeValue(@NonNull Raw<InputType> current);
 
     /**
      * @return did we process data from a sensor.

src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorBarometer.java

@@ -1,5 +1,7 @@
 package de.dennisguse.opentracks.sensors.sensorData;
 
+import androidx.annotation.NonNull;
+
 import de.dennisguse.opentracks.data.models.AltitudeGainLoss;
 import de.dennisguse.opentracks.data.models.AtmosphericPressure;
 import de.dennisguse.opentracks.sensors.PressureSensorUtils;
@@ -13,7 +15,7 @@ public class AggregatorBarometer extends Aggregator<AtmosphericPressure, Altitud
     }
 
     @Override
-    protected void computeValue(Raw<AtmosphericPressure> current) {
+    protected void computeValue(@NonNull Raw<AtmosphericPressure> current) {
         if (previous == null) {
             lastAcceptedSensorValue = current.value();
             output = new AltitudeGainLoss(0f, 0f);

src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorCyclingCadence.java

@@ -2,6 +2,8 @@ package de.dennisguse.opentracks.sensors.sensorData;
 
 import android.util.Log;
 
+import androidx.annotation.NonNull;
+
 import java.time.Duration;
 
 import de.dennisguse.opentracks.data.models.Cadence;
@@ -17,7 +19,7 @@ public class AggregatorCyclingCadence extends Aggregator<CyclingCadenceBluetooth
     }
 
     @Override
-    protected void computeValue(Raw<CyclingCadenceBluetooth.CrankData> current) {
+    protected void computeValue(@NonNull Raw<CyclingCadenceBluetooth.CrankData> current) {
         if (previous == null) {
             return;
         }

src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorCyclingDistanceSpeed.java

@@ -2,6 +2,8 @@ package de.dennisguse.opentracks.sensors.sensorData;
 
 import android.util.Log;
 
+import androidx.annotation.NonNull;
+
 import java.time.Duration;
 
 import de.dennisguse.opentracks.data.models.Distance;
@@ -20,7 +22,7 @@ public class AggregatorCyclingDistanceSpeed extends Aggregator<CyclingDistanceSp
     }
 
     @Override
-    protected void computeValue(Raw<CyclingDistanceSpeedBluetooth.WheelData> current) {
+    protected void computeValue(@NonNull Raw<CyclingDistanceSpeedBluetooth.WheelData> current) {
         if (previous == null) {
             return;
         }

src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorCyclingPower.java

@@ -1,5 +1,7 @@
 package de.dennisguse.opentracks.sensors.sensorData;
 
+import androidx.annotation.NonNull;
+
 import de.dennisguse.opentracks.data.models.Power;
 import de.dennisguse.opentracks.sensors.driver.CyclingPowerBluetooth;
 
@@ -10,7 +12,7 @@ public class AggregatorCyclingPower extends Aggregator<CyclingPowerBluetooth.Dat
     }
 
     @Override
-    public void computeValue(Raw<CyclingPowerBluetooth.Data> current) {
+    public void computeValue(@NonNull Raw<CyclingPowerBluetooth.Data> current) {
         this.output = current.value().power();
     }
 }

src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorGPS.java

@@ -2,6 +2,8 @@ package de.dennisguse.opentracks.sensors.sensorData;
 
 import android.location.Location;
 
+import androidx.annotation.NonNull;
+
 import de.dennisguse.opentracks.data.models.Position;
 
 public class AggregatorGPS extends Aggregator<Location, Position> {
@@ -11,7 +13,7 @@ public class AggregatorGPS extends Aggregator<Location, Position> {
     }
 
     @Override
-    protected void computeValue(Raw<Location> current) {
+    protected void computeValue(@NonNull Raw<Location> current) {
         output = Position.of(current.value(), current.time());
     }
 

src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorHeartRate.java

@@ -1,5 +1,7 @@
 package de.dennisguse.opentracks.sensors.sensorData;
 
+import androidx.annotation.NonNull;
+
 import de.dennisguse.opentracks.data.models.HeartRate;
 
 public class AggregatorHeartRate extends Aggregator<HeartRate, HeartRate> {
@@ -9,7 +11,7 @@ public class AggregatorHeartRate extends Aggregator<HeartRate, HeartRate> {
     }
 
     @Override
-    protected void computeValue(Raw<HeartRate> current) {
+    protected void computeValue(@NonNull Raw<HeartRate> current) {
         if (current.value().isValid()) {
             this.output = current.value();
         }

src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorRunning.java

@@ -19,7 +19,7 @@ public final class AggregatorRunning extends Aggregator<RunningSpeedAndCadenceBl
     }
 
     @Override
-    public void computeValue(Raw<RunningSpeedAndCadenceBluetooth.Data> current) {
+    public void computeValue(@NonNull Raw<RunningSpeedAndCadenceBluetooth.Data> current) {
         if (previous == null) {
             return;
         }

src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorTemperature.java

@@ -1,5 +1,7 @@
 package de.dennisguse.opentracks.sensors.sensorData;
 
+import androidx.annotation.NonNull;
+
 import java.time.Duration;
 
 import de.dennisguse.opentracks.data.models.Temperature;
@@ -10,7 +12,7 @@ public class AggregatorTemperature extends Aggregator<Temperature, Temperature>
         super(sensorAddress, sensorName);
     }
 
-    protected void computeValue(Raw<Temperature> current) {
+    protected void computeValue(@NonNull Raw<Temperature> current) {
         this.output = current.value();
     }
 

src/main/java/de/dennisguse/opentracks/ui/customRecordingLayout/RecordingLayoutIO.java

@@ -5,6 +5,7 @@ import android.util.Log;
 
 import androidx.annotation.NonNull;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -22,7 +23,7 @@ public class RecordingLayoutIO {
     public static List<RecordingLayout> fromCsv(@NonNull String csv, @NonNull Resources resources) {
         return CsvLayoutUtils.getCsvLines(csv).stream()
                 .map(line -> RecordingLayoutIO.fromCsvLine(line, resources))
-                .toList();
+                .collect(Collectors.toCollection(ArrayList::new));
     }
 
     public static RecordingLayout fromCsvLine(@NonNull String csvLine, @NonNull Resources resources) {

src/main/res/values-ja/strings.xml

@@ -304,4 +304,13 @@ limitations under the License.
     <string name="waypoint_type_waypoint">地点</string>
     <string name="help_feature_content">"* GPS トラックを作成します\n\n\n\n  * 心拍センサーを使用します (Bluetooth LE のみ)\n\n\n\n  * 音声アナウンス（時間または距離）\n\n\n\n  * マーカーの作成 (写真を含む)\n\n\n\n  * 完全にオフラインで動作します\n\n\n\n  * 地図上にトラックを表示します (下記を参照)"</string>
     <string name="help_data_google_play_services_content">いいえ</string>
-</resources>
+    <string name="about_history">OpenTracksは<a href="https://code.google.com/archive/p/mytracks/"><i>GoogleのMyTracks</i></a> (2016に開発停止)のフォークです。</string>
+    <string name="help_feature_title">OpenTracks には以下の機能があります:</string>
+    <string name="activity_type_escooter">電動スクーター</string>
+    <string name="activity_type_kickscooter">スクーター</string>
+    <string name="generic_overwrite">上書き</string>
+    <string name="generic_skip">スキップ</string>
+    <string name="import_progress_summary_ok_msg">インポート完了</string>
+    <string name="import_progress_summary_exists_msg">既に存在しています</string>
+    <string name="help_track_map_content">小さな地図のアイコンを使います.\n a) (live updates) <a href="https://codeberg.org/OpenTracksApp/OSMDashboard">OSMDashboard</a>をインストールして下さい。 <a href="https://www.openstreetmap.org">OpenStreetMap</a> を利用したオンラインまたはオフラインの地図を使用できるようになります。\n実際、OSMDashbordは (一時的に保存された) 表示するトラッキングデータにだけアクセスする独立したアプリケーションです。\n b) 一般的な地図アプリケーションを使用 (e.g., <a href="http://osmand.net/">OsmAnd</a> and <a href="https://maps.me/">MAPS.ME</a>) 。 KMZフォーマットをサポートしている必要があります (位置及びタイムスタンプのみを含む)。 加えて、 MIME <i>application/vnd.google-earth.kmz</i> の <i>ACTION_VIEW</i> をサポートしている必要もあります。</string>
+</resources>