forked from upstream-mirrors/OpenTracks
Fixed issues introduced in 353c958ae0 and 2a60aa8f59.
This commit is contained in:
@@ -272,7 +272,7 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onSaveInstanceState(Bundle outState) {
|
protected void onSaveInstanceState(@NonNull Bundle outState) {
|
||||||
super.onSaveInstanceState(outState);
|
super.onSaveInstanceState(outState);
|
||||||
outState.putString(CURRENT_TAB_TAG_KEY, tabHost.getCurrentTabTag());
|
outState.putString(CURRENT_TAB_TAG_KEY, tabHost.getCurrentTabTag());
|
||||||
if (photoUri != null) {
|
if (photoUri != null) {
|
||||||
|
|||||||
@@ -221,7 +221,7 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
|
|||||||
|
|
||||||
private final OnClickListener recordListener = new OnClickListener() {
|
private final OnClickListener recordListener = new OnClickListener() {
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
if (PreferencesUtils.isRecording(recordingTrackId)) {
|
if (!PreferencesUtils.isRecording(recordingTrackId)) {
|
||||||
// Not recording -> Recording
|
// Not recording -> Recording
|
||||||
updateMenuItems(false, true);
|
updateMenuItems(false, true);
|
||||||
startRecording();
|
startRecording();
|
||||||
|
|||||||
@@ -101,7 +101,7 @@ public class KmzTrackImporter implements TrackImporter {
|
|||||||
* @param trackId the trackId
|
* @param trackId the trackId
|
||||||
*/
|
*/
|
||||||
private void cleanImport(long trackId) {
|
private void cleanImport(long trackId) {
|
||||||
if (!PreferencesUtils.isRecording(trackId)) {
|
if (PreferencesUtils.isRecording(trackId)) {
|
||||||
ContentProviderUtils contentProviderUtils = ContentProviderUtils.Factory.get(context);
|
ContentProviderUtils contentProviderUtils = ContentProviderUtils.Factory.get(context);
|
||||||
contentProviderUtils.deleteTrack(context, trackId);
|
contentProviderUtils.deleteTrack(context, trackId);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,5 +20,5 @@ limitations under the License.
|
|||||||
<string name="recording_track_id_key" translatable="false">recordingTrackId</string>
|
<string name="recording_track_id_key" translatable="false">recordingTrackId</string>
|
||||||
|
|
||||||
<string name="recording_track_paused_key" translatable="false">recordingTrackPaused</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>
|
</resources>
|
||||||
Reference in New Issue
Block a user