diff --git a/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java b/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java index 9312aa2d8..b27c1441e 100644 --- a/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java +++ b/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java @@ -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(); diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmzTrackExporter.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmzTrackExporter.java index e395dba15..513adb849 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmzTrackExporter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmzTrackExporter.java @@ -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 { diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/AbstractFileTrackImporter.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/AbstractFileTrackImporter.java index f223ccb47..690ffcad9 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/importer/AbstractFileTrackImporter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/AbstractFileTrackImporter.java @@ -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; diff --git a/src/main/java/de/dennisguse/opentracks/widgets/TrackWidgetProvider.java b/src/main/java/de/dennisguse/opentracks/widgets/TrackWidgetProvider.java index 720554b0f..a6d079ed2 100644 --- a/src/main/java/de/dennisguse/opentracks/widgets/TrackWidgetProvider.java +++ b/src/main/java/de/dennisguse/opentracks/widgets/TrackWidgetProvider.java @@ -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) { diff --git a/src/main/res/drawable-hdpi/ic_menu_export.png b/src/main/res/drawable-hdpi/ic_menu_export.png deleted file mode 100644 index 0faf43b06..000000000 Binary files a/src/main/res/drawable-hdpi/ic_menu_export.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_menu_import.png b/src/main/res/drawable-hdpi/ic_menu_import.png deleted file mode 100644 index d5bfa457c..000000000 Binary files a/src/main/res/drawable-hdpi/ic_menu_import.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/ic_menu_export.png b/src/main/res/drawable-mdpi/ic_menu_export.png deleted file mode 100644 index 2d4ba56fa..000000000 Binary files a/src/main/res/drawable-mdpi/ic_menu_export.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/ic_menu_import.png b/src/main/res/drawable-mdpi/ic_menu_import.png deleted file mode 100644 index cc4d9576b..000000000 Binary files a/src/main/res/drawable-mdpi/ic_menu_import.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_menu_export.png b/src/main/res/drawable-xhdpi/ic_menu_export.png deleted file mode 100644 index 2369348c9..000000000 Binary files a/src/main/res/drawable-xhdpi/ic_menu_export.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_menu_import.png b/src/main/res/drawable-xhdpi/ic_menu_import.png deleted file mode 100644 index bc0ced50f..000000000 Binary files a/src/main/res/drawable-xhdpi/ic_menu_import.png and /dev/null differ diff --git a/src/main/res/values-pt-rPT/strings.xml b/src/main/res/values-pt-rPT/strings.xml index f89d5e63e..b8a8839f4 100644 --- a/src/main/res/values-pt-rPT/strings.xml +++ b/src/main/res/values-pt-rPT/strings.xml @@ -362,7 +362,7 @@ %1$d minutos 2 minutos 0 minutos - %1$s por quilómetro + %1$s por quilômetro %1$s por milha %1$d segundos %1$d segundos @@ -372,7 +372,7 @@ 0 segundos %1$.1f quilómetros por hora %1$.1f quilómetros por hora - 1 quilómetro por hora + 1 quilômetro por hora %1$.1f quilómetros por hora 2 quilómetros por hora 0 quilómetros por hora @@ -385,7 +385,7 @@ Os Meus Percursos %1$s em %2$s a %3$s distância total de %1$.2f quilómetros distância total de %1$.2f quilómetros - distância total 1 quilómetro + distância total 1 quilômetro distância total de %1$.2f quilómetros distância total de 2 quilómetros distância total de 0 quilómetros diff --git a/src/main/res/values/preference_keys.xml b/src/main/res/values/preference_keys.xml index 691ca81a8..4ae486dd7 100644 --- a/src/main/res/values/preference_keys.xml +++ b/src/main/res/values/preference_keys.xml @@ -46,11 +46,8 @@ limitations under the License. recordingTrackId recordingTrackPaused - settingsAdvanced - settingsChart settingsRecording settingsReset - settingsSensor settingsSensorBluetooth settingsSensorBluetoothPairing settingsSensorRoot