upstream-mirrors/OpenTracks
1
0
Fork 1
mirror of https://codeberg.org/OpenTracksApp/OpenTracks.git synced 2026-10-02 09:33:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup.

Browse Source
This commit is contained in:
Dennis Guse
2019-09-04 22:09:22 +02:00
parent c0a9958b5b
commit 8a56c262cb
12 changed files with 25 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/TrackEditActivity.java
+1 -2
View File
@@ -36,7 +36,6 @@ import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
import de.dennisguse.opentracks.util.TrackIconUtils;
import de.dennisguse.opentracks.util.TrackRecordingServiceConnectionUtils;
import de.dennisguse.opentracks.util.TrackUtils;
import de.dennisguse.opentracks.R;
/**
* An activity that let's the user see and edit the user editable track meta
@@ -67,7 +66,7 @@ public class TrackEditActivity extends AbstractActivity implements ChooseActivit
super.onCreate(bundle);
trackRecordingServiceConnection = new TrackRecordingServiceConnection(this, null);
Long trackId = getIntent().getLongExtra(EXTRA_TRACK_ID, -1L);
long trackId = getIntent().getLongExtra(EXTRA_TRACK_ID, -1L);
if (trackId == -1L) {
Log.e(TAG, "invalid trackId");
finish();
src/main/java/de/dennisguse/opentracks/io/file/exporter/KmzTrackExporter.java
+1 -4
View File
@@ -80,10 +80,7 @@ public class KmzTrackExporter implements TrackExporter {
// Add photos
addImages(zipOutputStream);
return true;
} catch (InterruptedException e) {
Log.e(TAG, "Unable to write track", e);
return false;
} catch (IOException e) {
} catch (InterruptedException | IOException e) {
Log.e(TAG, "Unable to write track", e);
return false;
} finally {
src/main/java/de/dennisguse/opentracks/io/file/importer/AbstractFileTrackImporter.java
+17 -25
View File
@@ -22,6 +22,22 @@ import android.location.LocationManager;
import android.net.Uri;
import android.util.Log;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
import de.dennisguse.opentracks.R;
import de.dennisguse.opentracks.content.ContentProviderUtils;
import de.dennisguse.opentracks.content.ContentProviderUtils.LocationIterator;
import de.dennisguse.opentracks.content.DescriptionGeneratorImpl;
@@ -37,22 +53,6 @@ import de.dennisguse.opentracks.util.PreferencesUtils;
import de.dennisguse.opentracks.util.StringUtils;
import de.dennisguse.opentracks.util.TrackIconUtils;
import de.dennisguse.opentracks.util.UnitConversions;
import de.dennisguse.opentracks.R;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
/**
* Abstract class for various file track importers like {@link GpxFileTrackImporter} and
@@ -139,15 +139,7 @@ abstract class AbstractFileTrackImporter extends DefaultHandler implements Track
return -1L;
}
return trackIds.get(0);
} catch (IOException e) {
Log.e(TAG, "Unable to import file", e);
cleanImport();
return -1L;
} catch (ParserConfigurationException e) {
Log.e(TAG, "Unable to import file", e);
cleanImport();
return -1L;
} catch (SAXException e) {
} catch (IOException | SAXException | ParserConfigurationException e) {
Log.e(TAG, "Unable to import file", e);
cleanImport();
return -1L;
src/main/java/de/dennisguse/opentracks/widgets/TrackWidgetProvider.java
+3 -3
View File
@@ -31,6 +31,7 @@ import android.widget.RemoteViews;
import androidx.core.app.TaskStackBuilder;
import de.dennisguse.opentracks.R;
import de.dennisguse.opentracks.TrackDetailActivity;
import de.dennisguse.opentracks.TrackListActivity;
import de.dennisguse.opentracks.content.ContentProviderUtils;
@@ -40,7 +41,6 @@ import de.dennisguse.opentracks.stats.TripStatistics;
import de.dennisguse.opentracks.util.IntentUtils;
import de.dennisguse.opentracks.util.PreferencesUtils;
import de.dennisguse.opentracks.util.StringUtils;
import de.dennisguse.opentracks.R;
/**
* A track widget to start/stop/pause/resume recording, launch the main activity, and
@@ -318,7 +318,7 @@ public class TrackWidgetProvider extends AppWidgetProvider {
reportSpeed ? R.string.stats_average_speed : R.string.stats_average_pace);
remoteViews.setTextViewText(ids[0], averageSpeedLabel);
Double speed = tripStatistics == null ? Double.NaN : tripStatistics.getAverageSpeed();
double speed = tripStatistics == null ? Double.NaN : tripStatistics.getAverageSpeed();
String[] speedParts = StringUtils.getSpeedParts(context, speed, metricUnits, reportSpeed);
if (speedParts[0] == null) {
@@ -362,7 +362,7 @@ public class TrackWidgetProvider extends AppWidgetProvider {
reportSpeed ? R.string.stats_average_moving_speed : R.string.stats_average_moving_pace);
remoteViews.setTextViewText(ids[0], averageMovingSpeedLabel);
Double speed = tripStatistics == null ? Double.NaN : tripStatistics.getAverageMovingSpeed();
double speed = tripStatistics == null ? Double.NaN : tripStatistics.getAverageMovingSpeed();
String[] speedParts = StringUtils.getSpeedParts(context, speed, metricUnits, reportSpeed);
if (speedParts[0] == null) {
src/main/res/drawable-hdpi/ic_menu_export.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.3 KiB

src/main/res/drawable-hdpi/ic_menu_import.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.3 KiB

src/main/res/drawable-mdpi/ic_menu_export.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

src/main/res/drawable-mdpi/ic_menu_import.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

src/main/res/drawable-xhdpi/ic_menu_export.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

src/main/res/drawable-xhdpi/ic_menu_import.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

src/main/res/values-pt-rPT/strings.xml
+3 -3
View File
@@ -362,7 +362,7 @@
<string name="voice_minutes_other">%1$d minutos</string>
<string name="voice_minutes_two">2 minutos</string>
<string name="voice_minutes_zero">0 minutos</string>
<string name="voice_pace_per_kilometer">%1$s por quilómetro</string>
<string name="voice_pace_per_kilometer">%1$s por quilômetro</string>
<string name="voice_pace_per_mile">%1$s por milha</string>
<string name="voice_seconds_few">%1$d segundos</string>
<string name="voice_seconds_many">%1$d segundos</string>
@@ -372,7 +372,7 @@
<string name="voice_seconds_zero">0 segundos</string>
<string name="voice_speed_kilometers_per_hour_few">%1$.1f quilómetros por hora</string>
<string name="voice_speed_kilometers_per_hour_many">%1$.1f quilómetros por hora</string>
<string name="voice_speed_kilometers_per_hour_one">1 quilómetro por hora</string>
<string name="voice_speed_kilometers_per_hour_one">1 quilômetro por hora</string>
<string name="voice_speed_kilometers_per_hour_other">%1$.1f quilómetros por hora</string>
<string name="voice_speed_kilometers_per_hour_two">2 quilómetros por hora</string>
<string name="voice_speed_kilometers_per_hour_zero">0 quilómetros por hora</string>
@@ -385,7 +385,7 @@
<string name="voice_template">Os Meus Percursos %1$s em %2$s a %3$s</string>
<string name="voice_total_distance_kilometers_few">distância total de %1$.2f quilómetros</string>
<string name="voice_total_distance_kilometers_many">distância total de %1$.2f quilómetros</string>
<string name="voice_total_distance_kilometers_one">distância total 1 quilómetro</string>
<string name="voice_total_distance_kilometers_one">distância total 1 quilômetro</string>
<string name="voice_total_distance_kilometers_other">distância total de %1$.2f quilómetros</string>
<string name="voice_total_distance_kilometers_two">distância total de 2 quilómetros</string>
<string name="voice_total_distance_kilometers_zero">distância total de 0 quilómetros</string>
src/main/res/values/preference_keys.xml
-3
View File
@@ -46,11 +46,8 @@ limitations under the License.
<string name="recording_track_id_key" translatable="false">recordingTrackId</string>
<string name="recording_track_paused_key" translatable="false">recordingTrackPaused</string>
<!-- Keys for non-persisted preferences. Sorted alphabetically. DO NOT TRANSLATE. -->
<string name="settings_advanced_key" translatable="false">settingsAdvanced</string>
<string name="settings_chart_key" translatable="false">settingsChart</string>
<string name="settings_recording_key" translatable="false">settingsRecording</string>
<string name="settings_reset_key" translatable="false">settingsReset</string>
<string name="settings_sensor_key" translatable="false">settingsSensor</string>
<string name="settings_sensor_bluetooth_key" translatable="false">settingsSensorBluetooth</string>
<string name="settings_sensor_bluetooth_pairing_key" translatable="false">settingsSensorBluetoothPairing</string>
<string name="settings_sensor_root_key" translatable="false">settingsSensorRoot</string>