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

Prepend MyTracks to photo folder

Browse Source
This commit is contained in:
Jimmy Shih
2013-11-22 16:09:57 -08:00
parent bb5d4069cd
commit 1e4451ce41
5 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
+1 -2
View File
@@ -404,8 +404,7 @@ public class TrackDetailActivity extends AbstractSendToGoogleActivity
return false;
}
File dir = new File(
FileUtils.getPath(FileUtils.PICTURES_DIR, Long.toString(trackId)));
File dir = FileUtils.getPhotoDir(trackId);
FileUtils.ensureDirectoryExists(dir);
String fileName = SimpleDateFormat.getDateTimeInstance().format(new Date());
MyTracks/src/com/google/android/apps/mytracks/io/file/importer/AbstractFileTrackImporter.java
+3 -3
View File
@@ -472,9 +472,9 @@ abstract class AbstractFileTrackImporter extends DefaultHandler implements Track
if (importTrackId == -1L) {
return null;
}
String path = FileUtils.getPath(
FileUtils.PICTURES_DIR, Long.toString(importTrackId), fileName);
return Uri.fromFile(new File(path)).toString();
File dir = FileUtils.getPhotoDir(importTrackId);
File file = new File(dir, fileName);
return Uri.fromFile(file).toString();
}
/**
MyTracks/src/com/google/android/apps/mytracks/io/file/importer/KmzTrackImporter.java
+2 -4
View File
@@ -115,8 +115,7 @@ public class KmzTrackImporter implements TrackImporter {
}
if (importTrackId != -1L) {
File dir = new File(
FileUtils.getPath(FileUtils.PICTURES_DIR, Long.toString(importTrackId)));
File dir = FileUtils.getPhotoDir(importTrackId);
if (FileUtils.isDirectory(dir)) {
for (File file : dir.listFiles()) {
file.delete();
@@ -182,8 +181,7 @@ public class KmzTrackImporter implements TrackImporter {
if (fileName.equals("")) {
return;
}
File dir = new File(
FileUtils.getPath(FileUtils.PICTURES_DIR, Long.toString(importTrackId)));
File dir = FileUtils.getPhotoDir(importTrackId);
FileUtils.ensureDirectoryExists(dir);
fileOutputStream = new FileOutputStream(new File(dir, fileName));