From d3f5080e7311d49386539bc820509546839f0aac Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Wed, 6 Nov 2019 07:42:15 +0100
Subject: [PATCH] Fixed issues introduced in
 353c958ae060d9306355921efae8cbb235c87bb5 and
 2a60aa8f59c5cf43d61ee36694180f894992bd1e.

---
 src/main/java/de/dennisguse/opentracks/TrackDetailActivity.java | 2 +-
 src/main/java/de/dennisguse/opentracks/TrackListActivity.java   | 2 +-
 .../opentracks/io/file/importer/KmzTrackImporter.java           | 2 +-
 src/main/res/values/preferences_internal.xml                    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/TrackDetailActivity.java b/src/main/java/de/dennisguse/opentracks/TrackDetailActivity.java
index 481be9c82..5018f85fe 100644
--- a/src/main/java/de/dennisguse/opentracks/TrackDetailActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/TrackDetailActivity.java
@@ -272,7 +272,7 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
     }
 
     @Override
-    protected void onSaveInstanceState(Bundle outState) {
+    protected void onSaveInstanceState(@NonNull Bundle outState) {
         super.onSaveInstanceState(outState);
         outState.putString(CURRENT_TAB_TAG_KEY, tabHost.getCurrentTabTag());
         if (photoUri != null) {
diff --git a/src/main/java/de/dennisguse/opentracks/TrackListActivity.java b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java
index e656158b4..3dffb4253 100644
--- a/src/main/java/de/dennisguse/opentracks/TrackListActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java
@@ -221,7 +221,7 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
 
     private final OnClickListener recordListener = new OnClickListener() {
         public void onClick(View v) {
-            if (PreferencesUtils.isRecording(recordingTrackId)) {
+            if (!PreferencesUtils.isRecording(recordingTrackId)) {
                 // Not recording -> Recording
                 updateMenuItems(false, true);
                 startRecording();
diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/KmzTrackImporter.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/KmzTrackImporter.java
index 9a0443770..3f69c4e7f 100644
--- a/src/main/java/de/dennisguse/opentracks/io/file/importer/KmzTrackImporter.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/KmzTrackImporter.java
@@ -101,7 +101,7 @@ public class KmzTrackImporter implements TrackImporter {
      * @param trackId the trackId
      */
     private void cleanImport(long trackId) {
-        if (!PreferencesUtils.isRecording(trackId)) {
+        if (PreferencesUtils.isRecording(trackId)) {
             ContentProviderUtils contentProviderUtils = ContentProviderUtils.Factory.get(context);
             contentProviderUtils.deleteTrack(context, trackId);
         }
diff --git a/src/main/res/values/preferences_internal.xml b/src/main/res/values/preferences_internal.xml
index e35cb515d..d1249f80d 100644
--- a/src/main/res/values/preferences_internal.xml
+++ b/src/main/res/values/preferences_internal.xml
@@ -20,5 +20,5 @@ limitations under the License.
     <string name="recording_track_id_key" translatable="false">recordingTrackId</string>
 
     <string name="recording_track_paused_key" translatable="false">recordingTrackPaused</string>
-    <bool name="recording_track_paused_default" translatable="false">false</bool>
+    <bool name="recording_track_paused_default" translatable="false">true</bool>
 </resources>
\ No newline at end of file