karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Fixing leftovers from the merge

Browse Source
This commit is contained in:
Rodrigo Damazio
2011-06-14 20:48:00 -03:00
parent 9ee053e4f9
commit 51df795a8c
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java
+5
View File
@@ -83,6 +83,11 @@ public class SaveActivity extends Activity {
shareFile = intent.getBooleanExtra(EXTRA_SHARE_FILE, false);
writer = TrackWriterFactory.newWriter(this, providerUtils, trackId, format);
if (writer == null) {
Log.e(TAG, "Unable to build writer");
finish();
return;
}
if (shareFile) {
// If the file is for sending, save it to a temporary location instead.
MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendActivity.java
+12 -4
View File
@@ -223,8 +223,12 @@ public class SendActivity extends Activity implements ProgressIndicator {
// Update the map id for this track:
try {
Track track = providerUtils.getTrack(sendTrackId);
track.setMapId(mapId);
providerUtils.updateTrack(track);
if (track != null) {
track.setMapId(mapId);
providerUtils.updateTrack(track);
} else {
Log.w(TAG, "Updating map id failed.");
}
} catch (RuntimeException e) {
// If that fails whatever reasons we'll just log an error, but
// continue.
@@ -280,8 +284,12 @@ public class SendActivity extends Activity implements ProgressIndicator {
// Update the table id for this track:
try {
Track track = providerUtils.getTrack(sendTrackId);
track.setTableId(tableId);
providerUtils.updateTrack(track);
if (track != null) {
track.setTableId(tableId);
providerUtils.updateTrack(track);
} else {
Log.w(TAG, "Updating table id failed.");
}
} catch (RuntimeException e) {
// If that fails whatever reasons we'll just log an error, but
// continue.