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

Backing out changeset f35dbbe86d616e41561839a2316867b8e7e68d88 (broke gmail sharing).

Browse Source
This commit is contained in:
Rodrigo Damazio
2011-05-06 15:51:46 -03:00
parent d3791ea99b
commit 79bb9db3b9
3 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/Constants.java
-8
View File
@@ -187,14 +187,6 @@ public abstract class Constants {
public static final String RESUME_TRACK_EXTRA_NAME =
"com.google.android.apps.mytracks.RESUME_TRACK";
/**
* The name of the extra intent property that holds the track information
* when sharing with friends
*/
public static final String TRACK_EXTRA =
"com.google.android.apps.mytracks.TRACK";
public static int getActionFromMenuId(int menuId) {
switch (menuId) {
case Constants.MENU_SEND_TO_GOOGLE:
MyTracks/src/com/google/android/apps/mytracks/MyTracks.java
+1 -4
View File
@@ -16,7 +16,6 @@
package com.google.android.apps.mytracks;
import static com.google.android.apps.mytracks.Constants.TAG;
import static com.google.android.apps.mytracks.Constants.TRACK_EXTRA;
import static com.google.android.apps.mytracks.DialogManager.DIALOG_IMPORT_PROGRESS;
import static com.google.android.apps.mytracks.DialogManager.DIALOG_PROGRESS;
import static com.google.android.apps.mytracks.DialogManager.DIALOG_SEND_TO_GOOGLE;
@@ -1246,7 +1245,7 @@ public class MyTracks extends TabActivity implements OnTouchListener,
*
* @param trackId The id of the track to be sent
*/
public void sendTrack(final long trackId, final TrackFileFormat format) {
public void sendTrack(long trackId, final TrackFileFormat format) {
TrackWriter writer = TrackWriterFactory.newWriter(this, providerUtils, trackId, format);
FileUtils fileUtils = new FileUtils();
@@ -1274,8 +1273,6 @@ public class MyTracks extends TabActivity implements OnTouchListener,
shareIntent.setType(format.getMimeType());
Uri u = Uri.fromFile(new File(writer.getAbsolutePath()));
shareIntent.putExtra(Intent.EXTRA_STREAM, u);
Track track = providerUtils.getTrack(trackId);
shareIntent.putExtra(TRACK_EXTRA, track);
startActivity(Intent.createChooser(shareIntent,
getResources().getText(R.string.share_track).toString()));
}
MyTracksLib/src/com/google/android/apps/mytracks/content/Track.java
+7
View File
@@ -51,6 +51,10 @@ public class Track implements Parcelable {
track.stats = source.readParcelable(classLoader);
track.numberOfPoints = source.readInt();
for (int i = 0; i < track.numberOfPoints; ++i) {
Location loc = source.readParcelable(classLoader);
track.locations.add(loc);
}
track.tableId = source.readString();
return track;
@@ -99,6 +103,9 @@ public class Track implements Parcelable {
dest.writeParcelable(stats, 0);
dest.writeInt(numberOfPoints);
for (int i = 0; i < numberOfPoints; ++i) {
dest.writeParcelable(locations.get(i), 0);
}
dest.writeString(tableId);
}